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
@@ -61,7 +61,7 @@
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# define TRUE 1
|
||||
# define FALSE 0
|
||||
# include <nl_types.h>
|
||||
# include <Dt/MsgCatP.h>
|
||||
#endif
|
||||
|
||||
extern Editor *pPadList; /* declared in main.c */
|
||||
|
||||
@@ -745,7 +745,7 @@ extern void RestoreInitialServerResources(
|
||||
extern char * _DtpadGetMessage(
|
||||
int set,
|
||||
int number,
|
||||
char *string);
|
||||
const char *string);
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# define TRUE 1
|
||||
# define FALSE 0
|
||||
# include <nl_types.h>
|
||||
# include <Dt/MsgCatP.h>
|
||||
# if !defined(NL_CAT_LOCALE)
|
||||
# define NL_CAT_LOCALE 0
|
||||
# endif
|
||||
@@ -1703,27 +1703,19 @@ char *
|
||||
_DtpadGetMessage(
|
||||
int set,
|
||||
int number,
|
||||
char *string )
|
||||
const char *string)
|
||||
{
|
||||
char *msg;
|
||||
nl_catd catopen();
|
||||
char *catgets();
|
||||
static int first = 1;
|
||||
static nl_catd nlmsg_fd;
|
||||
static nl_catd nlmsg_fd = (nl_catd) -1;
|
||||
|
||||
if ( first ) {
|
||||
first = 0;
|
||||
nlmsg_fd = catopen(_DTPAD_CAT_NAME, NL_CAT_LOCALE);
|
||||
nlmsg_fd = CATOPEN(_DTPAD_CAT_NAME, NL_CAT_LOCALE);
|
||||
|
||||
if (nlmsg_fd == -1)
|
||||
if (nlmsg_fd == (nl_catd) -1)
|
||||
perror("catopen");
|
||||
}
|
||||
#if defined(hpV4)
|
||||
msg = _DtCatgetsCached(nlmsg_fd, set, number, string);
|
||||
#else
|
||||
msg = catgets(nlmsg_fd, set, number, string);
|
||||
#endif
|
||||
return (msg);
|
||||
return CATGETS(nlmsg_fd, set, number, string);
|
||||
}
|
||||
|
||||
#endif /* NO_MESSAGE_CATALOG */
|
||||
|
||||
Reference in New Issue
Block a user