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
@@ -44,7 +44,18 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern char *_DtCatgetsCached(nl_catd catd, int set, int num, char *dflt);
|
||||
#define CATOPEN(name,oflag) catopen(name,oflag)
|
||||
#define CATCLOSE(catd) _DtCatclose(catd)
|
||||
#define CATGETS(catd,set,num,dflt) _DtCatgets(catd,set,num,dflt)
|
||||
extern char *_DtCatgets(nl_catd catd, int set, int num, const char *dflt);
|
||||
extern int _DtCatclose(nl_catd catd);
|
||||
|
||||
#if 0 /* TODO: Decide between !I18N_MSG and NO_MESSAGE_CATALOG */
|
||||
typedef int nl_catd;
|
||||
#define CATOPEN(name,oflag) 0
|
||||
#define CATCLOSE(catd) 0
|
||||
#define CATGETS(catd,set,num,dflt) dflt
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user