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
2021-01-30 20:05:13 -07:00
committed by Jon Trulson
parent 3379999106
commit a6ea2a2d52
241 changed files with 3154 additions and 3498 deletions

View File

@@ -89,7 +89,7 @@ static int file_has_changed (char *fname, time_t origtime)
char sprintbuf[1024];
if (stat (fname, &statbuf) == -1) {
sprintf (sprintbuf, catgets (dtsearch_catd, 10, 1300,
sprintf (sprintbuf, CATGETS(dtsearch_catd, 10, 1300,
"%s Unable to comply with request; cannot access status\n"
" of database file '%s': %s"),
PROGNAME "1300", fname, strerror (errno));
@@ -107,7 +107,7 @@ static int file_has_changed (char *fname, time_t origtime)
PROGNAME "1312", aa_argv0, fname,
sprintbuf, nowstring (&statbuf.st_mtime));
if (!(usrblk.flags & USR_NO_INFOMSGS)) {
sprintf (sprintbuf, catgets (dtsearch_catd, 10, 1313,
sprintf (sprintbuf, CATGETS(dtsearch_catd, 10, 1313,
"%s *** REQUEST CANCELED *** %s Engine reinitialized\n"
" due to modification of file %s, probably caused by\n"
" update to one or more databases."),