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
8278e0eae3
commit
7010b2c11b
@@ -42,7 +42,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <nl_types.h>
|
||||
#include <Dt/MsgCatP.h>
|
||||
#include "DtSvcLock.h"
|
||||
|
||||
/*****************************************************************************
|
||||
@@ -79,7 +79,7 @@ Dt11GetMessage(
|
||||
_DtSvcProcessLock();
|
||||
if ( NULL == nlmsg_filename || 0 != strcmp(nlmsg_filename, filename) )
|
||||
{
|
||||
nlmsg_fd = catopen(filename, NL_CAT_LOCALE);
|
||||
nlmsg_fd = CATOPEN(filename, NL_CAT_LOCALE);
|
||||
if (nlmsg_filename)
|
||||
{
|
||||
free(nlmsg_filename);
|
||||
@@ -87,7 +87,7 @@ Dt11GetMessage(
|
||||
}
|
||||
nlmsg_filename = strdup(filename);
|
||||
}
|
||||
msg=catgets(nlmsg_fd,set,n,s);
|
||||
msg=CATGETS(nlmsg_fd,set,n,s);
|
||||
_DtSvcProcessUnlock();
|
||||
return (msg);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user