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
@@ -75,7 +75,7 @@ extern int errno;
|
||||
#include "FormatUtilI.h"
|
||||
|
||||
#if defined(NLS16) || !defined(NO_MESSAGE_CATALOG)
|
||||
#include <nl_types.h>
|
||||
#include <Dt/MsgCatP.h>
|
||||
#endif
|
||||
|
||||
#ifndef NL_CAT_LOCALE
|
||||
@@ -789,13 +789,13 @@ _DtHelpLoadMultiInfo (
|
||||
char *ptr;
|
||||
nl_catd cat_fd;
|
||||
|
||||
cat_fd = catopen ("fmt_tbl", NL_CAT_LOCALE);
|
||||
cat_fd = CATOPEN("fmt_tbl", NL_CAT_LOCALE);
|
||||
if (cat_fd != ((nl_catd) -1))
|
||||
{
|
||||
/*
|
||||
* Get the list of characters that can't begin a line.
|
||||
*/
|
||||
ptr = catgets (cat_fd, 1, 1, "");
|
||||
ptr = CATGETS(cat_fd, 1, 1, "");
|
||||
len = strlen (ptr) + 1;
|
||||
*cant_begin_chars = (wchar_t *) malloc (len * sizeof (wchar_t));
|
||||
if (NULL != *cant_begin_chars &&
|
||||
@@ -808,7 +808,7 @@ _DtHelpLoadMultiInfo (
|
||||
/*
|
||||
* Get the list of characters that can't end a line.
|
||||
*/
|
||||
ptr = catgets (cat_fd, 1, 2, "");
|
||||
ptr = CATGETS(cat_fd, 1, 2, "");
|
||||
len = strlen (ptr) + 1;
|
||||
*cant_end_chars = (wchar_t *) malloc (len * sizeof (wchar_t));
|
||||
if (*cant_end_chars != NULL &&
|
||||
@@ -825,10 +825,10 @@ _DtHelpLoadMultiInfo (
|
||||
* 0 means only between a multibyte string and
|
||||
* a singlebyte string.
|
||||
*/
|
||||
ptr = catgets (cat_fd, 1, 3, "1");
|
||||
ptr = CATGETS(cat_fd, 1, 3, "1");
|
||||
*nl_to_space = atoi(ptr);
|
||||
|
||||
catclose (cat_fd);
|
||||
CATCLOSE(cat_fd);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user