debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Centralize catgets() calls through MsgCat

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dtdspmsg/Imakefile
View File

@@ -1,5 +1,6 @@
XCOMM $XConsortium: Imakefile /main/8 1996/10/09 14:04:16 drk $
DEFINES = -DNO_XLIB
SYS_LIBRARIES = -lm $(DYNLIBSYSLIB) $(REGEXSYSLIB)
#ifdef HPArchitecture
@@ -9,6 +10,7 @@ EXTRA_DEFINES = +e
PROGRAMS=dtdspmsg
SRCS = dtdspmsg.c
OBJS = dtdspmsg.o
OBJS = dtdspmsg.o MsgCat.o
ComplexProgramTarget($(PROGRAMS))
LinkSourceFile(MsgCat.c,$(DTSVCSRC)/DtUtil2)

23
cde/programs/dtdspmsg/dtdspmsg.c
View File

@@ -58,6 +58,7 @@
#include <stdio.h>
#include <string.h>
#include <locale.h>
#include <Dt/MsgCatP.h>
#include "msgfac_msg.h"
#define die(s) puts(s), exit(1)
@@ -82,8 +83,6 @@ void parse_args(int argc, char *argv[], struct arguments *args);
nl_catd catderr; /* error message catalog descriptor */
/*
* NAME: main
*
@@ -112,9 +111,9 @@ int main(int argc,char *argv[])
int n; /* # bytes in a character */
setlocale (LC_ALL,"");
catderr = catopen(MF_MSGFAC, 0);
catderr = CATOPEN(MF_MSGFAC, 0);
if (argc < 3) {
die(catgets(catderr,MS_DSPMSG,M_DSPMSG, "Usage: dtdspmsg [-s setno] <catname> <msgno> ['default' arg ... ]"));
die(CATGETS(catderr,MS_DSPMSG,M_DSPMSG, "Usage: dtdspmsg [-s setno] <catname> <msgno> ['default' arg ... ]"));
}
/*______________________________________________________________________
@@ -127,8 +126,8 @@ int main(int argc,char *argv[])
get the message out of the catalog.
______________________________________________________________________*/
catdmsg = catopen(args.catname, 0);
message = catgets(catdmsg,args.set,args.msg,args.def);
catdmsg = CATOPEN(args.catname, 0);
message = CATGETS(catdmsg,args.set,args.msg,args.def);
/*______________________________________________________________________
@@ -230,26 +229,26 @@ int main(int argc,char *argv[])
/* do not allow mixing of reorder types */
if (reorder == FALSE) {
die(catgets(catderr,MS_DSPMSG,M_REORDER,"\nNone or all arguments must use %n$ format"));
die(CATGETS(catderr,MS_DSPMSG,M_REORDER,"\nNone or all arguments must use %n$ format"));
}
for (idx = 0 ; isanumber(*p) ; p++)
idx += idx * 10 + toanumber(*p);
idx--;
if (*p++ != '$') {
die(catgets(catderr,MS_DSPMSG,M_INVRE,"\n% missing from %n$ format"));
die(CATGETS(catderr,MS_DSPMSG,M_INVRE,"\n% missing from %n$ format"));
}
reorder = TRUE;
}
else {
/* do not allow mixing of reorder types */
if (reorder == TRUE) {
die(catgets(catderr,MS_DSPMSG,M_REORDER,"\nNone or all arguments must use %n$ format"));
die(CATGETS(catderr,MS_DSPMSG,M_REORDER,"\nNone or all arguments must use %n$ format"));
}
reorder = FALSE;
}
/* report invalid printf argument number */
if (idx < 0 || idx >= args.argmax) {
die(catgets(catderr,MS_DSPMSG,M_REINDEX,"\nInvalid argument index"));
die(CATGETS(catderr,MS_DSPMSG,M_REINDEX,"\nInvalid argument index"));
}
/* report unsupported % type */
if (*p == 's')
@@ -306,7 +305,7 @@ void parse_args(int argc, char *argv[], struct arguments *args)
argc--; /* Skip the program name */
if (!strcmp(*argv,"-s")) { /* check for a set number */
if (argc < 4) /* check for sufficient arguments */
die(catgets(catderr,MS_DSPMSG,M_DSPMSG, "Usage: dtdspmsg [-s setno] <catname> <msgno> ['default' arg ... ]"));
die(CATGETS(catderr,MS_DSPMSG,M_DSPMSG, "Usage: dtdspmsg [-s setno] <catname> <msgno> ['default' arg ... ]"));
argv++;
argc--; /* skip past the '-s' */
sscanf(*argv,"%d",&args->set); /* get the real set number */
@@ -317,7 +316,7 @@ void parse_args(int argc, char *argv[], struct arguments *args)
argc--;
if (!strcmp(*argv,"-s")) { /* check for a set number */
if (argc < 3) /* check for sufficient arguments */
die(catgets(catderr,MS_DSPMSG,M_DSPMSG, "Usage: dtdspmsg [-s setno] <catname> <msgno> ['default' arg ... ]"));
die(CATGETS(catderr,MS_DSPMSG,M_DSPMSG, "Usage: dtdspmsg [-s setno] <catname> <msgno> ['default' arg ... ]"));
argv++;
argc--; /* skip past the '-s' */

2
cde/programs/dtdspmsg/msgfac_msg.h
View File

@@ -30,8 +30,6 @@
#ifndef _H_MSGFAC_MSG
#define _H_MSGFAC_MSG
#include <limits.h>
#include <nl_types.h>
#define MF_MSGFAC "msgfac.cat"