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:
Lev Kujawski
committed by
Jon Trulson
Jon Trulson
parent
3379999106
commit
a6ea2a2d52
@@ -34,13 +34,12 @@ SRCS = dispatch.c dtpdmd.c mailbox.c \
|
||||
|
||||
OBJS = dispatch.o dtpdmd.o mailbox.o \
|
||||
manager.o records.o setup.o \
|
||||
util.o nlmsg.o
|
||||
util.o nlmsg.o \
|
||||
$(CDELIBSRC)/DtSvc/DtUtil2/MsgCat.o
|
||||
|
||||
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
|
||||
/* On Linux, just use the system provided Xau */
|
||||
DEPXAUTHLIB =
|
||||
#endif
|
||||
|
||||
|
||||
ComplexProgramTarget(dtpdmd)
|
||||
|
||||
|
||||
@@ -34,18 +34,12 @@
|
||||
* (c) Copyright 1996 Hitachi.
|
||||
*/
|
||||
|
||||
#ifdef I18N_MSG
|
||||
|
||||
#include <nl_types.h>
|
||||
#include "nlmsg.h"
|
||||
|
||||
#if !defined(NL_CAT_LOCALE)
|
||||
#define NL_CAT_LOCALE 0
|
||||
#endif
|
||||
|
||||
#define DTPDMD_CAT_NAME "dtpdmd"
|
||||
|
||||
#endif /* I18N_MSG */
|
||||
|
||||
/*
|
||||
* ------------------------------------------------------------------------
|
||||
* Default message values
|
||||
@@ -108,8 +102,6 @@ const char DtPdmdMsg_0015[] = "\
|
||||
|
||||
const char DtPdmdMsg_0016[] = "%1$s: error, cannot open log file \"%2$s\". Turning off stderr message logging\n";
|
||||
|
||||
#ifdef I18N_MSG
|
||||
|
||||
/*
|
||||
* ------------------------------------------------------------------------
|
||||
* Name: DtPdmdGetMessage
|
||||
@@ -126,26 +118,17 @@ const char DtPdmdMsg_0016[] = "%1$s: error, cannot open log file \"%2$s\". Turni
|
||||
* Returns: the string for set 'set' and number 'n'.
|
||||
*/
|
||||
const char *
|
||||
DtPdmdGetMessage(
|
||||
int set,
|
||||
int n,
|
||||
char * s)
|
||||
DtPdmdGetMessage(int set,
|
||||
int n,
|
||||
const char *s)
|
||||
{
|
||||
char *msg;
|
||||
nl_catd catopen();
|
||||
char *catgets();
|
||||
static int first = 1;
|
||||
static nl_catd nlmsg_fd;
|
||||
|
||||
if(set == -1 || n == -1)
|
||||
return s;
|
||||
|
||||
if(first)
|
||||
static nl_catd nlmsg_fd = (nl_catd) -1;
|
||||
|
||||
if (first)
|
||||
{
|
||||
first = 0;
|
||||
nlmsg_fd = catopen(DTPDMD_CAT_NAME, NL_CAT_LOCALE);
|
||||
nlmsg_fd = CATOPEN("dtpdmd", NL_CAT_LOCALE);
|
||||
}
|
||||
msg=catgets(nlmsg_fd,set,n,s);
|
||||
return (msg);
|
||||
return CATGETS(nlmsg_fd, set, n, s);
|
||||
}
|
||||
#endif /* I18N_MSG */
|
||||
|
||||
@@ -36,65 +36,46 @@
|
||||
#ifndef _PdmdMsgs_h
|
||||
#define _PdmdMsgs_h
|
||||
|
||||
#ifdef I18N_MSG
|
||||
#include <nl_types.h>
|
||||
#define DTPDMD_GETMESSAGE(set, number, string) \
|
||||
DtPdmdGetMessage(set, number, string)
|
||||
#include <Dt/MsgCatP.h>
|
||||
|
||||
#else /* I18N_MSG */
|
||||
#define DTPDMD_GETMESSAGE(set, number, string) (string)
|
||||
#endif /* I18N_MSG */
|
||||
#define PDMD_MSG_1 DtPdmdGetMessage(1, 1, DtPdmdMsg_0001)
|
||||
#define PDMD_MSG_2 DtPdmdGetMessage(1, 2, DtPdmdMsg_0002)
|
||||
#define PDMD_MSG_3 DtPdmdGetMessage(1, 3, DtPdmdMsg_0003)
|
||||
#define PDMD_MSG_4 DtPdmdGetMessage(1, 4, DtPdmdMsg_0004)
|
||||
#define PDMD_MSG_5 DtPdmdGetMessage(1, 5, DtPdmdMsg_0005)
|
||||
#define PDMD_MSG_6 DtPdmdGetMessage(1, 6, DtPdmdMsg_0006)
|
||||
#define PDMD_MSG_7 DtPdmdGetMessage(1, 7, DtPdmdMsg_0007)
|
||||
#define PDMD_MSG_8 DtPdmdGetMessage(1, 8, DtPdmdMsg_0008)
|
||||
#define PDMD_MSG_9 DtPdmdGetMessage(1, 9, DtPdmdMsg_0009)
|
||||
#define PDMD_MSG_10 DtPdmdGetMessage(1, 10, DtPdmdMsg_0010)
|
||||
#define PDMD_MSG_11 DtPdmdGetMessage(1, 11, DtPdmdMsg_0011)
|
||||
#define PDMD_MSG_12 DtPdmdGetMessage(1, 12, DtPdmdMsg_0012)
|
||||
#define PDMD_MSG_13 DtPdmdGetMessage(1, 13, DtPdmdMsg_0013)
|
||||
#define PDMD_MSG_14 DtPdmdGetMessage(1, 14, DtPdmdMsg_0014)
|
||||
#define PDMD_MSG_15 DtPdmdGetMessage(1, 15, DtPdmdMsg_0015)
|
||||
#define PDMD_MSG_16 DtPdmdGetMessage(1, 16, DtPdmdMsg_0016)
|
||||
|
||||
/*** const causes the HP compiler to complain. Remove reference until ***
|
||||
*** the build and integration people can figure out how to get this to ***
|
||||
*** work. ***/
|
||||
|
||||
/* #define CONST const */
|
||||
#define CONST
|
||||
|
||||
#define PDMD_MSG_1 DTPDMD_GETMESSAGE(1, 1, DtPdmdMsg_0001)
|
||||
#define PDMD_MSG_2 DTPDMD_GETMESSAGE(1, 2, DtPdmdMsg_0002)
|
||||
#define PDMD_MSG_3 DTPDMD_GETMESSAGE(1, 3, DtPdmdMsg_0003)
|
||||
#define PDMD_MSG_4 DTPDMD_GETMESSAGE(1, 4, DtPdmdMsg_0004)
|
||||
#define PDMD_MSG_5 DTPDMD_GETMESSAGE(1, 5, DtPdmdMsg_0005)
|
||||
#define PDMD_MSG_6 DTPDMD_GETMESSAGE(1, 6, DtPdmdMsg_0006)
|
||||
#define PDMD_MSG_7 DTPDMD_GETMESSAGE(1, 7, DtPdmdMsg_0007)
|
||||
#define PDMD_MSG_8 DTPDMD_GETMESSAGE(1, 8, DtPdmdMsg_0008)
|
||||
#define PDMD_MSG_9 DTPDMD_GETMESSAGE(1, 9, DtPdmdMsg_0009)
|
||||
#define PDMD_MSG_10 DTPDMD_GETMESSAGE(1, 10, DtPdmdMsg_0010)
|
||||
#define PDMD_MSG_11 DTPDMD_GETMESSAGE(1, 11, DtPdmdMsg_0011)
|
||||
#define PDMD_MSG_12 DTPDMD_GETMESSAGE(1, 12, DtPdmdMsg_0012)
|
||||
#define PDMD_MSG_13 DTPDMD_GETMESSAGE(1, 13, DtPdmdMsg_0013)
|
||||
#define PDMD_MSG_14 DTPDMD_GETMESSAGE(1, 14, DtPdmdMsg_0014)
|
||||
#define PDMD_MSG_15 DTPDMD_GETMESSAGE(1, 15, DtPdmdMsg_0015)
|
||||
#define PDMD_MSG_16 DTPDMD_GETMESSAGE(1, 16, DtPdmdMsg_0016)
|
||||
|
||||
extern CONST char DtPdmdMsg_0001[];
|
||||
extern CONST char DtPdmdMsg_0002[];
|
||||
extern CONST char DtPdmdMsg_0003[];
|
||||
extern CONST char DtPdmdMsg_0004[];
|
||||
extern CONST char DtPdmdMsg_0005[];
|
||||
extern CONST char DtPdmdMsg_0006[];
|
||||
extern CONST char DtPdmdMsg_0007[];
|
||||
extern CONST char DtPdmdMsg_0008[];
|
||||
extern CONST char DtPdmdMsg_0009[];
|
||||
extern CONST char DtPdmdMsg_0010[];
|
||||
extern CONST char DtPdmdMsg_0011[];
|
||||
extern CONST char DtPdmdMsg_0012[];
|
||||
extern CONST char DtPdmdMsg_0013[];
|
||||
extern CONST char DtPdmdMsg_0014[];
|
||||
extern CONST char DtPdmdMsg_0015[];
|
||||
extern CONST char DtPdmdMsg_0016[];
|
||||
|
||||
#ifdef I18N_MSG
|
||||
extern const char DtPdmdMsg_0001[];
|
||||
extern const char DtPdmdMsg_0002[];
|
||||
extern const char DtPdmdMsg_0003[];
|
||||
extern const char DtPdmdMsg_0004[];
|
||||
extern const char DtPdmdMsg_0005[];
|
||||
extern const char DtPdmdMsg_0006[];
|
||||
extern const char DtPdmdMsg_0007[];
|
||||
extern const char DtPdmdMsg_0008[];
|
||||
extern const char DtPdmdMsg_0009[];
|
||||
extern const char DtPdmdMsg_0010[];
|
||||
extern const char DtPdmdMsg_0011[];
|
||||
extern const char DtPdmdMsg_0012[];
|
||||
extern const char DtPdmdMsg_0013[];
|
||||
extern const char DtPdmdMsg_0014[];
|
||||
extern const char DtPdmdMsg_0015[];
|
||||
extern const char DtPdmdMsg_0016[];
|
||||
|
||||
/* Message IDs */
|
||||
|
||||
extern const char * DtPdmGetMessage(
|
||||
int set,
|
||||
int n,
|
||||
const char * s);
|
||||
|
||||
#endif /* I18N_MSG */
|
||||
const char *DtPdmdGetMessage(int set,
|
||||
int n,
|
||||
const char *s);
|
||||
|
||||
#endif /* _PdmdMsgs_h */
|
||||
|
||||
Reference in New Issue
Block a user