Centralize catgets() calls through MsgCat
CDE has relied upon catgets() implementations following a relaxed interpretation of the XPG internationalization standard that ignored -1, the standard error value returned by catopen, as the catalog argument. However, this same behavior causes segmentation faults with the musl C library. This patch: - Centralizes (with the exception of ToolTalk) all calls to catopen(), catgets(), and catclose() through MsgCat within the DtSvc library. - Prevents calls to catgets() and catclose() that rely upon undefined behavior. - Eliminates a number of bespoke catgets() wrappers, including multiple redundant caching implementations designed to work around a design peculiarity in HP/UX. - Eases building CDE without XPG internationalization support by providing the appropriate macros.
This commit is contained in:
committed by
Jon Trulson
parent
3379999106
commit
a6ea2a2d52
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)props.c 1.13 94/11/07 Copyr 1991 Sun Microsystems, I
|
||||
|
||||
#include <EUSCompat.h>
|
||||
#include <sys/param.h>
|
||||
#include <nl_types.h>
|
||||
#include <Dt/MsgCatP.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -339,15 +339,15 @@ init_props(void)
|
||||
|
||||
is_inited = 1;
|
||||
|
||||
libdtcm_catd = catopen(LIBDTCM_CAT, NL_CAT_LOCALE);
|
||||
libdtcm_catd = CATOPEN(LIBDTCM_CAT, NL_CAT_LOCALE);
|
||||
if ((nl_catd) -1 == libdtcm_catd) return;
|
||||
|
||||
dflt = def_props[CP_DATEORDERING];
|
||||
str = catgets(libdtcm_catd, 1, 1, dflt);
|
||||
str = CATGETS(libdtcm_catd, 1, 1, dflt);
|
||||
def_props[CP_DATEORDERING] = strdup(str);
|
||||
|
||||
dflt = def_props[CP_DEFAULTDISP];
|
||||
str = catgets(libdtcm_catd, 1, 2, dflt);
|
||||
str = CATGETS(libdtcm_catd, 1, 2, dflt);
|
||||
def_props[CP_DEFAULTDISP] = strdup(str);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user