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/lib/DtSearch/ausdopen.c
View File

@@ -104,7 +104,7 @@ int austext_dopen (
/* Test dbname */
if (dbname == NULL) {
INVALID_DBNAME:
sprintf (sprintbuf, catgets (dtsearch_catd, 13, 348,
sprintf (sprintbuf, CATGETS(dtsearch_catd, 13, 348,
"%s Invalid database name '%s'."),
PROGNAME"348", NULLORSTR(dbname));
DtSearchAddMessage (sprintbuf);
@@ -175,7 +175,7 @@ INVALID_DBNAME:
SETPAGES (PROGNAME "283", cache, 4);
d_open (dbdbuf, "o");
if (db_status != S_OKAY) {
sprintf (sprintbuf, catgets (dtsearch_catd, 13, 379,
sprintf (sprintbuf, CATGETS(dtsearch_catd, 13, 379,
"%s Could not open database '%s':\n %s."),
PROGNAME"379", dbdbuf, vista_msg (PROGNAME"379"));
DtSearchAddMessage (sprintbuf);

36
cde/lib/DtSearch/boolpars.c
View File

@@ -134,14 +134,14 @@ void add_syntax_errmsg (int msgno)
switch (msgno) {
case 1:
/* Message #2 is called in two places */
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 2,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 2,
"%s Query field is empty."),
PROGNAME"086");
DtSearchAddMessage (msgbuf);
break;
case 2:
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 5,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 5,
"%s Boolean operators must be positioned\n"
"between words or expressions. Two sequential words\n"
"without an operator are interpreted as being separated\n"
@@ -151,14 +151,14 @@ void add_syntax_errmsg (int msgno)
break;
case 3:
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 6,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 6,
"%s Expression in parentheses is missing."),
PROGNAME"093");
DtSearchAddMessage (msgbuf);
break;
case 4:
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 7,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 7,
"%s NOT operator (~) must be positioned to\n"
"the left of the word or expression it qualifies."),
PROGNAME"098");
@@ -167,7 +167,7 @@ void add_syntax_errmsg (int msgno)
case 5:
/* Message #3 is called in two places */
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 3,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 3,
"%s COLLOCATION operator (@) may\n"
"only be positioned between two words."),
PROGNAME"111");
@@ -175,7 +175,7 @@ void add_syntax_errmsg (int msgno)
break;
case 6:
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 4,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 4,
"%s One or more words in your\n"
"query are not stored in database '%s'.") ,
PROGNAME"089", usrblk.dblk->label);
@@ -183,7 +183,7 @@ void add_syntax_errmsg (int msgno)
break;
default:
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 8,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 8,
"%s Invalid boolean query. Syntax Error #%d.") ,
PROGNAME"100", msgno);
DtSearchAddMessage (msgbuf);
@@ -288,7 +288,7 @@ static TRUTHTAB *get_stem_truthtab (char *newstem, char *origword)
/* Add new stem to array */
if (stemno == saveusr.stemcount) {
if (++saveusr.stemcount > DtSrMAX_STEMCOUNT) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_boolpars, 9,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 9,
"%s Too many terms in boolean query."),
PROGNAME"1513");
DtSearchAddMessage (msgbuf);
@@ -490,7 +490,7 @@ TRUTHTAB *boolyac_COLLOC (
if (word1tt->stemno < 0 || word2tt->stemno < 0) {
/* Message #3 is called in two places */
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 3,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 3,
"%s COLLOCATION operator (@) may\n"
"only be positioned between two words."),
PROGNAME"371");
@@ -498,7 +498,7 @@ TRUTHTAB *boolyac_COLLOC (
return NULL;
}
if (word1tt->stemno == word2tt->stemno) {
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 12,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 12,
"%s Collocation operator is not\n"
"permitted between identical words."),
PROGNAME"377");
@@ -533,7 +533,7 @@ void yyerror (char *msg) {
else if (parser_invalid_wordcount > 0)
add_syntax_errmsg(6);
else {
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 1,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 1,
"%s Your search string is an invalid\n"
"boolean query. Please reformulate and try again."),
PROGNAME"001");
@@ -700,7 +700,7 @@ GET_ANOTHER_TOKEN:
if ((usrblk.dblk->dbrec.or_dbaccess & ORA_BLOB) == 0) {
retn_token = ERROR_TOKEN;
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 10,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 10,
"%s Collocation searches not available for database '%s'."),
PROGNAME"2567", usrblk.dblk->label);
DtSearchAddMessage (msgbuf);
@@ -709,7 +709,7 @@ GET_ANOTHER_TOKEN:
yylval.int_val = atoi (yytext + 1);
if (yylval.int_val <= 0) {
retn_token = ERROR_TOKEN;
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 11,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 11,
"%s Collocation operator '%.*s' is invalid.\n"
"Correct format is '@n' where n is greater than zero.") ,
PROGNAME"294", DtSrMAXWIDTH_HWORD, yytext);
@@ -778,7 +778,7 @@ GET_ANOTHER_TOKEN:
goto GET_ANOTHER_TOKEN;
retn_token = ERROR_TOKEN;
if (!DtSearchHasMessages()) {
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 13,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 13,
"%s Word '%.*s' is invalid.") ,
PROGNAME"315", DtSrMAXWIDTH_HWORD, yytext);
DtSearchAddMessage (msgbuf);
@@ -787,7 +787,7 @@ GET_ANOTHER_TOKEN:
}
if (strlen(stembufp) != strlen(yytext)) {
retn_token = ERROR_TOKEN;
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 14,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 14,
"%s String '%.*s' is not a single word.") ,
PROGNAME"634", DtSrMAXWIDTH_HWORD, yytext);
DtSearchAddMessage (msgbuf);
@@ -869,7 +869,7 @@ int boolean_parse (void)
if (usrblk.query == NULL) {
EMPTY_QUERY:
/* Message #2 is called in two places */
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 2,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 2,
"%s Query is empty."), PROGNAME"289");
DtSearchAddMessage (msgbuf);
return FALSE;
@@ -935,7 +935,7 @@ EMPTY_QUERY:
}
if (final_truthtab.pmsz <= 0) {
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 15,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 15,
"%s Your query cannot logically return\n"
"any records. Please reformulate and try again."),
PROGNAME"334");
@@ -943,7 +943,7 @@ EMPTY_QUERY:
return FALSE;
}
if (final_truthtab.pmsz >= 256) {
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolpars, 16,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolpars, 16,
"%s Your query will return entire database\n"
"'%s'. Please reformulate and try again.") ,
PROGNAME"341", usrblk.dblk->label);

16
cde/lib/DtSearch/boolsrch.c
View File

@@ -342,7 +342,7 @@ static int load_or_wordrecs (void)
/* Probable corrupted database. The btree
* read succeeded but the record read failed.
*/
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolsrch, 6,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolsrch, 6,
"%s Database Error. Word '%s' is\n"
"listed in database '%s' but has no index record.") ,
PROGNAME"295", usrblk.stems[stemno], usrblk.dblk->label);
@@ -359,7 +359,7 @@ static int load_or_wordrecs (void)
(long) wordrec->or_hwaddrs,
(long) wordrec->or_hwfree);
if (wordrec->or_hwaddrs > OE_words_hitlimit) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_boolsrch, 14,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolsrch, 14,
"%s '%s' has more than %ld hits.\n"
"Please remove it from the query or raise the WHITLIM\n"
"value in the search engine configuration file."),
@@ -1110,7 +1110,7 @@ static DB_ADDR read_d99 (struct or_hwordrec *wordrec)
}
if (fread (readbuf, sizeof(DB_ADDR), request_read, fptr)
!= request_read) {
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolsrch, 28,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolsrch, 28,
"%s Database Read Error in %s.d99.") ,
PROGNAME"428", usrblk.dblk->name);
DtSearchAddMessage (msgbuf);
@@ -1342,13 +1342,13 @@ static void read_stem_bitvec_WK (void)
* The bit number is the remainder after division by 8.
*/
if ((byteno = d99recno >> 3) >= bitveclen) {
sprintf (msgbuf, catgets(dtsearch_catd, MS_boolsrch, 32,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolsrch, 32,
"%s Database Error: %s '%s'\n"
"in database '%s' has invalid d99 record number %ld.") ,
PROGNAME"394",
(usrblk.search_type == 'W') ?
catgets(dtsearch_catd, MS_boolsrch, 33, "Word") :
catgets(dtsearch_catd, MS_boolsrch, 34, "Stem of"),
CATGETS(dtsearch_catd, MS_boolsrch, 33, "Word") :
CATGETS(dtsearch_catd, MS_boolsrch, 34, "Stem of"),
usrblk.stems [save_stemno],
usrblk.dblk->label,
d99recno);
@@ -1427,7 +1427,7 @@ void boolean_search (void)
if ( saveusr.stemcount <= 0 ||
final_truthtab.pmsz <= 0 ||
final_truthtab.pmsz >= 256 ) {
fprintf (aa_stderr, catgets(dtsearch_catd, MS_boolsrch, 35,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_boolsrch, 35,
"%s Program Error: stemct=%d pmsz=%d\n") ,
PROGNAME"1404", saveusr.stemcount, final_truthtab.pmsz);
DtSearchExit (14);
@@ -1556,7 +1556,7 @@ void boolean_search (void)
* generated if a NOT operator was included in the query.
*/
if (need_zero_permute) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_boolsrch, 15,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_boolsrch, 15,
"%s Your query requires retrieving every\n"
"document in the database that does not have any of\n"
"your query words. This type of search may take an\n"

4
cde/lib/DtSearch/dbchange.c
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."),

20
cde/lib/DtSearch/dberr.c
View File

@@ -68,7 +68,7 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <nl_types.h> /* for nl_catd */
#include <Dt/MsgCatP.h> /* for nl_catd */
#include "vista.h"
#include "dberr.h" /* retained for default vista msgs */
@@ -121,7 +121,7 @@ int dberr (int verrno)
*/
void dbautorec (void)
{
fputs (catgets (dtsearch_catd, MS_vista, 304,
fputs (CATGETS(dtsearch_catd, MS_vista, 304,
"\n*** db_VISTA auto recovery in process...\n"),
aa_stderr);
db_status = S_RECOVERY;
@@ -151,19 +151,19 @@ char *vista_msg (char *location)
/* Assemble standard Raima err msg */
if (location == NULL)
location = catgets (dtsearch_catd, MS_vista, 303,
location = CATGETS(dtsearch_catd, MS_vista, 303,
"(unspecified location)");
sprintf (vista_errmsg, catgets (dtsearch_catd, MS_vista, 311,
sprintf (vista_errmsg, CATGETS(dtsearch_catd, MS_vista, 311,
"*** DB Error at %s, db_status = %d: %n"),
location, db_status, &i);
msgtarg = vista_errmsg + i;
if (db_status == S_UNAVAIL) { /* +5, usually at d_open() time */
strcpy (msgtarg, catgets (dtsearch_catd, MS_vista, 315,
strcpy (msgtarg, CATGETS(dtsearch_catd, MS_vista, 315,
"Database in use by other users."));
}
else if (db_status >= 0)
strcpy (msgtarg, catgets (dtsearch_catd, MS_vista, 312,
strcpy (msgtarg, CATGETS(dtsearch_catd, MS_vista, 312,
"Programming Error."));
else {
if (db_status < 0 && db_status > -100)
@@ -171,22 +171,22 @@ char *vista_msg (char *location)
else if (db_status <= -900)
defaultmsg = system_error[-(db_status + 900)];
else
defaultmsg = catgets (dtsearch_catd, MS_vista, 313,
defaultmsg = CATGETS(dtsearch_catd, MS_vista, 313,
"Unknown Error.");
strcpy (msgtarg, catgets (dtsearch_catd, MS_vista, -db_status,
strcpy (msgtarg, CATGETS(dtsearch_catd, MS_vista, -db_status,
defaultmsg));
}
msgtarg += strlen (msgtarg);
/* Append system errno msg */
sprintf (msgtarg, catgets (dtsearch_catd, MS_vista, 301,
sprintf (msgtarg, CATGETS(dtsearch_catd, MS_vista, 301,
"\n*** System I/O errno %d = %s"),
vista_syserrno, strerror (vista_syserrno));
msgtarg += strlen (msgtarg);
/* Append additional information for common user error msgs */
if (db_status == S_NOFILE) {
strcpy (msgtarg, catgets (dtsearch_catd, MS_vista, 302,
strcpy (msgtarg, CATGETS(dtsearch_catd, MS_vista, 302,
"\n"
"*** The usual cause for this kind of error is a missing\n"
"*** or read-only database file, or some system limit\n"

18
cde/lib/DtSearch/dtoe.c
View File

@@ -165,7 +165,7 @@ SAVEUSR saveusr = { 0 };
*/
static void expired (char *sprintbuf)
{
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oe, 71,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oe, 71,
PROGNAME "71 %s has expired."),
OE_prodname);
DtSearchAddMessage (sprintbuf);
@@ -288,7 +288,7 @@ static void save_query (char *prefix, time_t start_time)
* with a displayable funny character (tilde ~).
*/
if (usrblk.query == NULL)
strcpy (targ, catgets (dtsearch_catd, MS_misc, 1, "<null>"));
strcpy (targ, CATGETS(dtsearch_catd, MS_misc, 1, "<null>"));
else {
end = saveusr.lastqry + MAX_LASTQRY - 2;
src = usrblk.query;
@@ -326,7 +326,7 @@ void oe_write_audit_rec (long numhits)
if ((stream = fopen (OEF_audit, "a ")) == NULL)
/* the blank in "a " works around old aix bug */
{
sprintf (sprintbuf, catgets (dtsearch_catd, MS_misc, 1596,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_misc, 1596,
PROGNAME "1596 Cannot open audit file %s: %s"),
OEF_audit, strerror (errno));
DtSearchAddMessage (sprintbuf);
@@ -341,7 +341,7 @@ void oe_write_audit_rec (long numhits)
usrblk.dblk->name,
numhits,
(saveusr.lastqry == NULL) ? \
catgets (dtsearch_catd, MS_misc, 1, "<null>") : saveusr.lastqry);
CATGETS(dtsearch_catd, MS_misc, 1, "<null>") : saveusr.lastqry);
if (saveusr.lastqry != NULL) {
free (saveusr.lastqry);
saveusr.lastqry = NULL;
@@ -370,7 +370,7 @@ static int no_keytypes (void)
while (--i >= 0)
if (keytypes[i].is_selected)
return FALSE;
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oe, 440,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oe, 440,
PROGNAME "440 No record keytypes were selected in database '%s'."),
usrblk.dblk->label);
DtSearchAddMessage (sprintbuf);
@@ -539,7 +539,7 @@ void Opera_Engine (void)
expired (sprintbuf);
if (OE_flags & OE_PERMERR) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oe, 490,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oe, 490,
PROGNAME "490 %s Engine permanently disabled."), OE_prodname);
DtSearchAddMessage (sprintbuf);
usrblk.retncode = OE_ABORT;
@@ -548,7 +548,7 @@ void Opera_Engine (void)
/* Ensure that the first call is always an OE_INITIALIZE call */
if ((usrblk.request != OE_INITIALIZE) && !(OE_flags & OE_INITOK)) {
DtSearchAddMessage (catgets (dtsearch_catd, MS_oe, 523,
DtSearchAddMessage (CATGETS(dtsearch_catd, MS_oe, 523,
PROGNAME "523 Request Denied: First request must "
"be Engine Initialization."));
usrblk.retncode = OE_NOOP;
@@ -573,7 +573,7 @@ void Opera_Engine (void)
if (strcmp (usrblk.dblk->name, db->name) == 0)
break;
if (db == NULL) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oe, 48,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oe, 48,
PROGNAME "48 Request Aborted: "
"'%s' database not available at this site."),
usrblk.dblk->name);
@@ -874,7 +874,7 @@ NO_TEXT:
break;
default:
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oe, 367,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oe, 367,
PROGNAME "367: User Interface Error. "
"%d is invalid request code.\n"),
usrblk.request);

10
cde/lib/DtSearch/dtoeinit.c
View File

@@ -179,8 +179,8 @@ void oe_initialize (void)
if (usrblk.query != NULL)
ptr = usrblk.query;
else
ptr = catgets (dtsearch_catd, MS_misc, 6, "<unknown>");
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oeinit, 137,
ptr = CATGETS(dtsearch_catd, MS_misc, 6, "<unknown>");
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oeinit, 137,
"%s User Interface version %s and Engine "
"version %s are incompatible."),
PROGNAME"137", ptr, AUSAPI_VERSION);
@@ -192,7 +192,7 @@ void oe_initialize (void)
/* Load site configuration (ocf) file and create dblks list */
if (!load_ocf()) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oeinit, 202,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oeinit, 202,
"%s Initialization failed due to errors in configuration file."),
PROGNAME"202");
DtSearchAddMessage (sprintbuf);
@@ -227,7 +227,7 @@ void oe_initialize (void)
*/
if (!ve_initialize()) {
INIT_FAILED:
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oeinit, 266,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oeinit, 266,
"%s Initialization failed due to errors in database,\n"
" language, or related files."),
PROGNAME "266");
@@ -276,7 +276,7 @@ DELETE_DB:
/* Abort if fatal dictionary load errors */
if (good_dblk_count <= 0) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_misc, 8,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_misc, 8,
"%s No valid databases remain."),
PROGNAME"265");
DtSearchAddMessage (sprintbuf);

26
cde/lib/DtSearch/dtsrapi.c
View File

@@ -147,7 +147,7 @@ extern int db_oflag;
static void signal_abort (int sig)
{
fputs (DtSearchGetMessages (), aa_stderr);
fprintf (aa_stderr, catgets (dtsearch_catd, MS_ausapi, 216,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_ausapi, 216,
"\n%s %s Caught signal %d.\n"),
PROGNAME"216",
(aa_argv0) ? aa_argv0 : OE_prodname,
@@ -191,7 +191,7 @@ static int valid_dbname (char *dbname)
break;
}
if (db == NULL) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_ausapi, 1,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 1,
"%1$sInvalid or unavailable database '%2$s'."),
PROGNAME "48 ", dbname);
DtSearchAddMessage (sprintbuf);
@@ -301,7 +301,7 @@ int DtSearchInit (
int *dbcount)
{
if (aa_is_initialized) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_ausapi, 621,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 621,
"%1$s %2%s has already been initialized."),
PROGNAME"621", PRODNAME);
DtSearchAddMessage (sprintbuf);
@@ -322,7 +322,7 @@ int DtSearchInit (
/* Open msgs and help text catalogs. */
if (switches & (DtSrInNOLOCALE == 0)) {
setlocale (LC_ALL, "");
dtsearch_catd = catopen (FNAME_DTSRCAT, 0);
dtsearch_catd = CATOPEN(FNAME_DTSRCAT, 0);
}
/* Register AusText abort signal handlers.
@@ -348,7 +348,7 @@ int DtSearchInit (
/* If user name was not passed, get it from LOGNAME environment var */
if (userid == NULL || *userid == 0)
if ((userid = (char *) getenv ("LOGNAME")) == NULL) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_ausapi, 187,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 187,
"%1$s Missing both userid and LOGNAME environment variable."),
PROGNAME "187 ");
DtSearchAddMessage (sprintbuf);
@@ -398,7 +398,7 @@ int DtSearchInit (
if (dbnames) {
*dbnames = ausapi_dbnamesv;
if (!dbcount) {
sprintf (sprintbuf, catgets(dtsearch_catd, MS_ausapi, 7,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 7,
"%s dbnames specified but not dbcount."),
PROGNAME"304");
DtSearchAddMessage (sprintbuf);
@@ -494,7 +494,7 @@ static int both_valid_dates (char *date1, char *date2)
usrblk.objdate1 != 0L &&
usrblk.objdate2 != 0L &&
usrblk.objdate1 >= usrblk.objdate2) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_ausapi, 198,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 198,
"%s 'Before' date is equal to or after 'After' date.\n"
" No records would be returned."),
PROGNAME "198");
@@ -569,7 +569,7 @@ int DtSearchQuery (
break;
default:
sprintf (sprintbuf, catgets (dtsearch_catd, MS_ausapi, 20,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 20,
"%1$s Invalid search_type '%2$c'."),
PROGNAME "172 ", search_type);
DtSearchAddMessage (sprintbuf);
@@ -580,7 +580,7 @@ int DtSearchQuery (
/* Validate the 'qry' argument */
if (qry == NULL) {
QUERY_ERROR:
sprintf (sprintbuf, catgets (dtsearch_catd, MS_ausapi, 30,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 30,
"%s Null query. No search performed."),
PROGNAME"81");
DtSearchAddMessage (sprintbuf);
@@ -686,7 +686,7 @@ END_OF_SEARCH:
/* Query was invalid. Tell the user why. */
if (ausapi_msglist == NULL) {
sprintf (sprintbuf,
catgets (dtsearch_catd, MS_ausapi, 806,
CATGETS(dtsearch_catd, MS_ausapi, 806,
"%s Query insufficient or search options "
"incompatible with database '%s' to commence search."),
PROGNAME "806", usrblk.dblk->name);
@@ -795,7 +795,7 @@ int DtSearchHighlight (
/* copy cleartext to usrblk if necessary */
if (cleartext == NULL || cleartext[0] == 0) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_ausapi, 40,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 40,
"%1$s Null cleartext. No highlighting performed."),
PROGNAME "349 ", dbname);
DtSearchAddMessage (sprintbuf);
@@ -817,7 +817,7 @@ int DtSearchHighlight (
if (stems) {
if (stemcount > DtSrMAX_STEMCOUNT) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_ausapi, 1072,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 1072,
"%s Program Error: Stem count (%d) greater than maximum (%d)."),
PROGNAME"1072", stemcount, DtSrMAX_STEMCOUNT);
DtSearchAddMessage (sprintbuf);
@@ -864,7 +864,7 @@ int DtSearchHighlight (
* msglist.
*/
if (!ausapi_msglist) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_ausapi, 1342,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_ausapi, 1342,
"%s Search Engine Error %d for highlight request for "
"database '%s', hit word count=%ld, search type='%c', text='%.30s'"),
PROGNAME "1342",

114
cde/lib/DtSearch/dtsrdbrec.c
View File

@@ -104,25 +104,25 @@ void print_dbrec (char *dbname, struct or_dbrec * dbrec)
int i;
int blobs_are_possible = FALSE;
printf (catgets (dtsearch_catd, MS_dbrec, 1,
printf (CATGETS(dtsearch_catd, MS_dbrec, 1,
"---------- System Values for Database '%s' ----------\n"),
dbname);
printf (catgets (dtsearch_catd, MS_dbrec, 2,
printf (CATGETS(dtsearch_catd, MS_dbrec, 2,
"Schema version number (version) is '%s'.\n"),
dbrec->or_version);
printf (catgets (dtsearch_catd, MS_dbrec, 3,
printf (CATGETS(dtsearch_catd, MS_dbrec, 3,
"Maximum object key size (sizeof(objkey)) is %ld bytes.\n"),
DtSrMAX_DB_KEYSIZE);
if (ORD_USEHUGEKEYS & dbrec->or_dbflags)
printf ("%s", catgets (dtsearch_catd, MS_dbrec, 4,
printf ("%s", CATGETS(dtsearch_catd, MS_dbrec, 4,
"Optional 'Huge' keys enabled.\n"));
printf (catgets (dtsearch_catd, MS_dbrec, 12,
printf (CATGETS(dtsearch_catd, MS_dbrec, 12,
"Maximum length of an abstract string (abstrsz) is %d.\n"),
dbrec->or_abstrsz);
if (dbrec->or_abstrsz == 0)
puts (catgets (dtsearch_catd, MS_dbrec, 14,
puts (CATGETS(dtsearch_catd, MS_dbrec, 14,
" (Abstracts are not used in this database)."));
else {
/*
@@ -130,88 +130,88 @@ void print_dbrec (char *dbname, struct or_dbrec * dbrec)
* actually are
*/
if (dbrec->or_hufid != 0L)
printf (catgets (dtsearch_catd, MS_dbrec, 20,
printf (CATGETS(dtsearch_catd, MS_dbrec, 20,
"Abstracts are %scompressed.\n"),
(ORC_COMPABSTR & dbrec->or_compflags) ? "" : "not ");
}
printf (catgets (dtsearch_catd, MS_dbrec, 22,
printf (CATGETS(dtsearch_catd, MS_dbrec, 22,
"Parsing language is number %d, %s.\n"),
dbrec->or_language, language_name(dbrec->or_language));
printf (catgets (dtsearch_catd, MS_dbrec, 24,
printf (CATGETS(dtsearch_catd, MS_dbrec, 24,
"Minimum word length (minwordsz) is %d.\n"),
dbrec->or_minwordsz);
printf (catgets (dtsearch_catd, MS_dbrec, 26,
printf (CATGETS(dtsearch_catd, MS_dbrec, 26,
"Maximum word length (maxwordsz) is %d.\n"),
dbrec->or_maxwordsz);
printf (catgets (dtsearch_catd, MS_dbrec, 30,
printf (CATGETS(dtsearch_catd, MS_dbrec, 30,
"Number of .d00 slots per object (recslots) is %d.\n"),
dbrec->or_recslots);
printf (catgets (dtsearch_catd, MS_dbrec, 36,
printf (CATGETS(dtsearch_catd, MS_dbrec, 36,
" (Maximum number of database objects is %ld).\n"),
0xffffffL / (long) dbrec->or_recslots);
printf (catgets (dtsearch_catd, MS_dbrec, 40,
printf (CATGETS(dtsearch_catd, MS_dbrec, 40,
"Huffman compression table id (hufid) is %ld.\n"),
dbrec->or_hufid);
if (dbrec->or_hufid == 0L)
puts (catgets (dtsearch_catd, MS_dbrec, 42,
puts (CATGETS(dtsearch_catd, MS_dbrec, 42,
" (Compression is disabled in this database)."));
if (dbrec->or_hufid == -1L)
puts (catgets (dtsearch_catd, MS_dbrec, 44,
puts (CATGETS(dtsearch_catd, MS_dbrec, 44,
" (Specific compression table is not yet determined)."));
blobs_are_possible = FALSE;
switch (dbrec->or_dbaccess) {
case ORA_VARIES:
puts (catgets (dtsearch_catd, MS_dbrec, 50,
puts (CATGETS(dtsearch_catd, MS_dbrec, 50,
"Engine accessibility to data may vary from object to object."));
blobs_are_possible = TRUE;
break;
case ORA_NOTAVAIL:
puts (catgets (dtsearch_catd, MS_dbrec, 54,
puts (CATGETS(dtsearch_catd, MS_dbrec, 54,
"Data objects are not directly accessible from the engine."));
break;
case ORA_BLOB:
puts (catgets (dtsearch_catd, MS_dbrec, 56,
puts (CATGETS(dtsearch_catd, MS_dbrec, 56,
"Data objects are stored internally as blobs."));
blobs_are_possible = TRUE;
break;
case ORA_REFBLOB:
puts (catgets (dtsearch_catd, MS_dbrec, 60,
puts (CATGETS(dtsearch_catd, MS_dbrec, 60,
"Only server file references to objects are stored in the blobs."));
break;
case ORA_CREFBLOB:
puts (catgets (dtsearch_catd, MS_dbrec, 64,
puts (CATGETS(dtsearch_catd, MS_dbrec, 64,
"Only client file references to objects are stored in the blobs."));
break;
case ORA_REFKEY:
puts (catgets (dtsearch_catd, MS_dbrec, 68,
puts (CATGETS(dtsearch_catd, MS_dbrec, 68,
"Object keys are server file references to the objects."));
break;
case ORA_CREFKEY:
puts (catgets (dtsearch_catd, MS_dbrec, 72,
puts (CATGETS(dtsearch_catd, MS_dbrec, 72,
"Object keys are client file references to the objects."));
break;
case ORA_REFHUGEKEY:
puts (catgets (dtsearch_catd, MS_dbrec, 74,
puts (CATGETS(dtsearch_catd, MS_dbrec, 74,
"Server file references to objects are "
"stored in the 'huge' keys."));
break;
case ORA_REFABSTR:
puts (catgets (dtsearch_catd, MS_dbrec, 80,
puts (CATGETS(dtsearch_catd, MS_dbrec, 80,
"Server file references to objects are stored in the abstracts."));
break;
case ORA_CREFABSTR:
puts (catgets (dtsearch_catd, MS_dbrec, 86,
puts (CATGETS(dtsearch_catd, MS_dbrec, 86,
"Client file references to objects are stored in the abstracts."));
break;
default:
printf (catgets (dtsearch_catd, MS_dbrec, 90,
printf (CATGETS(dtsearch_catd, MS_dbrec, 90,
"Error: meaning of or_dbaccess value (%hd) is unknown.\n"),
dbrec->or_dbaccess);
blobs_are_possible = TRUE;
@@ -224,59 +224,59 @@ void print_dbrec (char *dbname, struct or_dbrec * dbrec)
* actually are
*/
if (dbrec->or_hufid != 0L)
printf (catgets (dtsearch_catd, MS_dbrec, 100,
printf (CATGETS(dtsearch_catd, MS_dbrec, 100,
"Repository blobs are %scompressed.\n"),
(ORC_COMPBLOB & dbrec->or_compflags) ? "" : "not ");
}
else
puts (catgets (dtsearch_catd, MS_dbrec, 110,
puts (CATGETS(dtsearch_catd, MS_dbrec, 110,
"Repository blobs are not used in this database."));
printf (catgets (dtsearch_catd, MS_dbrec, 120,
printf (CATGETS(dtsearch_catd, MS_dbrec, 120,
"Database switches (dbflags) are 0x%lx:\n"),
dbrec->or_dbflags);
printf (catgets (dtsearch_catd, MS_dbrec, 130,
printf (CATGETS(dtsearch_catd, MS_dbrec, 130,
" Inverted index %s words exactly as parsed.\n"),
(ORD_XWORDS & dbrec->or_dbflags) ?
catgets (dtsearch_catd, MS_dbrec, 124, "INCLUDES") :
catgets (dtsearch_catd, MS_dbrec, 125, "EXCLUDES"));
CATGETS(dtsearch_catd, MS_dbrec, 124, "INCLUDES") :
CATGETS(dtsearch_catd, MS_dbrec, 125, "EXCLUDES"));
printf (catgets (dtsearch_catd, MS_dbrec, 140,
printf (CATGETS(dtsearch_catd, MS_dbrec, 140,
" Inverted index %s word stems.\n"),
(ORD_XSTEMS & dbrec->or_dbflags) ?
catgets (dtsearch_catd, MS_dbrec, 124, "INCLUDES") :
catgets (dtsearch_catd, MS_dbrec, 125, "EXCLUDES"));
CATGETS(dtsearch_catd, MS_dbrec, 124, "INCLUDES") :
CATGETS(dtsearch_catd, MS_dbrec, 125, "EXCLUDES"));
printf (catgets (dtsearch_catd, MS_dbrec, 160,
printf (CATGETS(dtsearch_catd, MS_dbrec, 160,
" Use of optional 'huge' keys is %s.\n"),
(ORD_USEHUGEKEYS & dbrec->or_dbflags) ?
catgets (dtsearch_catd, MS_dbrec, 126, "ENABLED") :
catgets (dtsearch_catd, MS_dbrec, 127, "DISABLED"));
CATGETS(dtsearch_catd, MS_dbrec, 126, "ENABLED") :
CATGETS(dtsearch_catd, MS_dbrec, 127, "DISABLED"));
printf (catgets (dtsearch_catd, MS_dbrec, 162,
printf (CATGETS(dtsearch_catd, MS_dbrec, 162,
" Mark-for-deletion is %s.\n"),
(ORD_NOMARKDEL & dbrec->or_dbflags) ?
catgets (dtsearch_catd, MS_dbrec, 127, "DISABLED") :
catgets (dtsearch_catd, MS_dbrec, 126, "ENABLED"));
CATGETS(dtsearch_catd, MS_dbrec, 127, "DISABLED") :
CATGETS(dtsearch_catd, MS_dbrec, 126, "ENABLED"));
printf (catgets (dtsearch_catd, MS_dbrec, 164,
printf (CATGETS(dtsearch_catd, MS_dbrec, 164,
" Appendable user notes are %s.\n"),
(ORD_NONOTES & dbrec->or_dbflags) ?
catgets (dtsearch_catd, MS_dbrec, 127, "DISABLED") :
catgets (dtsearch_catd, MS_dbrec, 126, "ENABLED"));
CATGETS(dtsearch_catd, MS_dbrec, 127, "DISABLED") :
CATGETS(dtsearch_catd, MS_dbrec, 126, "ENABLED"));
printf (catgets (dtsearch_catd, MS_dbrec, 170,
printf (CATGETS(dtsearch_catd, MS_dbrec, 170,
" Text characters are %s wide.\n"),
(ORD_WIDECHAR & dbrec->or_dbflags) ?
catgets (dtsearch_catd, MS_dbrec, 172, "MULTIPLE bytes") :
catgets (dtsearch_catd, MS_dbrec, 174, "a SINGLE byte"));
CATGETS(dtsearch_catd, MS_dbrec, 172, "MULTIPLE bytes") :
CATGETS(dtsearch_catd, MS_dbrec, 174, "a SINGLE byte"));
printf (catgets (dtsearch_catd, MS_dbrec, 200,
printf (CATGETS(dtsearch_catd, MS_dbrec, 200,
"Current number of database objects (reccount) is %ld.\n"),
dbrec->or_reccount);
printf (catgets (dtsearch_catd, MS_dbrec, 210,
printf (CATGETS(dtsearch_catd, MS_dbrec, 210,
"Last currently used slot number (maxdba) is %ld.\n"),
dbrec->or_maxdba);
@@ -306,22 +306,22 @@ int main (int argc, char *argv[])
aa_argv0 = argv[0];
setlocale (LC_ALL, "");
dtsearch_catd = catopen (FNAME_DTSRCAT, 0);
austools_catd = catopen (FNAME_AUSCAT, 0);
dtsearch_catd = CATOPEN(FNAME_DTSRCAT, 0);
austools_catd = CATOPEN(FNAME_AUSCAT, 0);
time (&now);
time_ptr = _XLocaltime(&now, localtime_buf);
strftime (renamebuf, sizeof (renamebuf),
catgets (dtsearch_catd, MS_misc, 22, "%A, %b %d %Y, %I:%M %p"),
CATGETS(dtsearch_catd, MS_misc, 22, "%A, %b %d %Y, %I:%M %p"),
time_ptr);
printf (catgets (dtsearch_catd, MS_misc, 23,
printf (CATGETS(dtsearch_catd, MS_misc, 23,
"%s: Version %s. Run %s.\n"),
aa_argv0,
DtSrVERSION,
renamebuf);
if (argc < 2) {
printf (catgets (dtsearch_catd, MS_dbrec, 310,
printf (CATGETS(dtsearch_catd, MS_dbrec, 310,
"USAGE: %s <dbname>\n"), aa_argv0);
return 2;
}
@@ -329,21 +329,21 @@ int main (int argc, char *argv[])
db_oflag = O_RDONLY; /* db files may be read-only */
d_open (argv[1], "o");
if (db_status != S_OKAY) {
printf (catgets (dtsearch_catd, MS_dbrec, 330,
printf (CATGETS(dtsearch_catd, MS_dbrec, 330,
"Could not open '%s' database.\n%s\n"),
argv[1], vista_msg(PROGNAME"293"));
return 3;
}
d_recfrst (OR_DBREC, 0);
if (db_status != S_OKAY) {
printf (catgets (dtsearch_catd, MS_dbrec, 340,
printf (CATGETS(dtsearch_catd, MS_dbrec, 340,
"No dbrec record in database '%s'.\n"),
argv[1]);
return 4;
}
d_recread (&dbrec, 0);
if (db_status != S_OKAY) {
printf (catgets (dtsearch_catd, MS_dbrec, 350,
printf (CATGETS(dtsearch_catd, MS_dbrec, 350,
"Can't read dbrec record in database '%s'.\n%s\n"),
argv[1], vista_msg(PROGNAME"306"));
return 5;

4
cde/lib/DtSearch/dtsrjoint.c
View File

@@ -124,7 +124,7 @@ void aa_check_initialization (void)
if (aa_is_initialized)
return;
fprintf (aa_stderr,
catgets (dtsearch_catd, 2, 37,
CATGETS(dtsearch_catd, 2, 37,
"%s First API function call must be DtSearchInit().\n"),
PROGNAME"37");
DtSearchExit (37);
@@ -183,7 +183,7 @@ DtSrObjdate DtSearchValidDateString (char *datestr)
#endif
INVALID_DATESTR:
sprintf (msgbuf,
catgets (dtsearch_catd, 2, 115,
CATGETS(dtsearch_catd, 2, 115,
"%s '%s' is invalid or incomplete date string.\n"
"The correct format is '[yy]yy [mm [dd]]'."),
PROGNAME"115", datestr);

2
cde/lib/DtSearch/dtsrutil.c
View File

@@ -166,7 +166,7 @@ char *get_hitlist_text (int maxlen)
size_t mallocsz;
if (usrblk.dittocount <= 0L) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_misc, 96,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_misc, 96,
"%s Hitlist is empty."), PROGNAME"96");
DtSearchAddMessage (sprintbuf);
return NULL;

44
cde/lib/DtSearch/dtsrve.c
View File

@@ -107,7 +107,7 @@ char *strupr(char *);
*/
void dummy_workproc (void)
{
fputs (catgets (dtsearch_catd, MS_ve, 26,
fputs (CATGETS(dtsearch_catd, MS_ve, 26,
PROGNAME "26 Called dummy_workproc().\n"),
aa_stderr);
return;
@@ -201,7 +201,7 @@ int ve_initialize (void)
RECFRST (PROGNAME "285", OR_DBREC, db->vistano); /* seqtl retrieval */
if (db_status != S_OKAY) {
NO_DBREC:
sprintf (msgbuf, catgets (dtsearch_catd, MS_misc, 13,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_misc, 13,
"%s No DB record in database '%s'."),
PROGNAME "853 ", db->name);
DtSearchAddMessage (msgbuf);
@@ -222,14 +222,14 @@ int ve_initialize (void)
/*-------------- DBREC SANITY CHECKS ----------------*/
if (db->dbrec.or_reccount <= 0) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_ve, 167,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_ve, 167,
"%s No data in database '%s'."),
PROGNAME"167 ", db->name);
DtSearchAddMessage (msgbuf);
goto DELETE_DB;
}
if (!is_compatible_version (db->dbrec.or_version, SCHEMA_VERSION)) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_ve, 178,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_ve, 178,
"%s Database '%s' version '%s' incompatible"
" with Engine version '%s'."),
PROGNAME"178 ",
@@ -238,7 +238,7 @@ int ve_initialize (void)
goto DELETE_DB;
}
if (db->dbrec.or_reccount > db->dbrec.or_maxdba) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_ve, 251,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_ve, 251,
"%s Database '%s' corrupted: "
"Incompatible record counts and database addresses.\n"),
PROGNAME" 251", db->name);
@@ -246,7 +246,7 @@ int ve_initialize (void)
goto DELETE_DB;
}
if (db->dbrec.or_maxwordsz < MAXWIDTH_SWORD - 1) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_ve, 185,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_ve, 185,
"%s Database '%s' maximum word size %d is too short."),
PROGNAME" 185", db->name, db->dbrec.or_maxwordsz);
DtSearchAddMessage (msgbuf);
@@ -257,7 +257,7 @@ int ve_initialize (void)
* for now, huffman decompress table hardcoded and
* linked in
*/
sprintf (msgbuf, catgets (dtsearch_catd, MS_ve, 156,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_ve, 156,
"%s Incompatible data compression table used for database '%s'.\n"
" Database compressed with %ld, "
"engine decompressor is %ld.\n"),
@@ -289,7 +289,7 @@ int ve_initialize (void)
fprintf (aa_stderr, "--> opening '%s'\n", d9x_fname);
if ((db->syofile = fopen (d9x_fname, open_mode)) == NULL) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_oeinit, 317,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_oeinit, 317,
default_cant_open_msg), PROGNAME "286",
d9x_fname, errno, strerror (errno), OE_prodname, db->name);
DtSearchAddMessage (msgbuf);
@@ -301,7 +301,7 @@ int ve_initialize (void)
fprintf (aa_stderr, "--> opening '%s'\n", d9x_fname);
if ((db->syifile = fopen (d9x_fname, open_mode)) == NULL) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_oeinit, 317,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_oeinit, 317,
default_cant_open_msg), PROGNAME "298",
d9x_fname, errno, strerror (errno), OE_prodname, db->name);
DtSearchAddMessage (msgbuf);
@@ -337,7 +337,7 @@ DELETE_DB:
/* Quit if no dblks remain */
if (good_dblk_count <= 0) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_misc, 8,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_misc, 8,
"%s No valid databases remain."), PROGNAME "246");
DtSearchAddMessage (msgbuf);
return FALSE;
@@ -419,14 +419,14 @@ int ve_append_notes (void)
/* Test if function is disabled */
if (!OE_enable_usernotes || usrblk.dblk->dbrec.or_dbflags & ORD_NONOTES) {
sprintf (mybuf, catgets (dtsearch_catd, MS_ve, 309,
sprintf (mybuf, CATGETS(dtsearch_catd, MS_ve, 309,
"%s User notes disabled "), PROGNAME" 309");
ptr = mybuf + strlen (mybuf);
if (!OE_enable_usernotes)
strcpy (ptr, catgets (dtsearch_catd, MS_ve, 310,
strcpy (ptr, CATGETS(dtsearch_catd, MS_ve, 310,
"for entire Engine."));
else
sprintf (ptr, catgets (dtsearch_catd, MS_ve, 311,
sprintf (ptr, CATGETS(dtsearch_catd, MS_ve, 311,
"for database '%s'."),
usrblk.dblk->name);
DtSearchAddMessage (mybuf);
@@ -435,7 +435,7 @@ int ve_append_notes (void)
/* Test for invalid dba */
if (usrblk.dba == NULL_DBA) {
DtSearchAddMessage (catgets (dtsearch_catd, MS_ve, 157,
DtSearchAddMessage (CATGETS(dtsearch_catd, MS_ve, 157,
PROGNAME "157 Client Program Error: "
"Null database address in usrblk.dba."));
OE_flags |= OE_PERMERR;
@@ -452,7 +452,7 @@ int ve_append_notes (void)
for (;;) {
if ((semaphore_file = fopen (OEF_notessem, "r+")) == NULL) {
sprintf (mybuf,
catgets (dtsearch_catd, MS_ve, 183,
CATGETS(dtsearch_catd, MS_ve, 183,
"%s Could not open user notes semaphore file '%s': %s.\n"),
PROGNAME "183 ", OEF_notessem, strerror (errno));
DtSearchAddMessage (mybuf);
@@ -478,7 +478,7 @@ int ve_append_notes (void)
fclose (semaphore_file);
if (++i > NOTES_SEM_DELAY) {
sprintf (mybuf,
catgets (dtsearch_catd, MS_ve, 199,
CATGETS(dtsearch_catd, MS_ve, 199,
"%s Could not acquire user notes semaphore '%s' "
"within %d tries.\n"),
PROGNAME " 199", OEF_notessem, NOTES_SEM_DELAY);
@@ -503,9 +503,9 @@ int ve_append_notes (void)
appendbufptr = entirebufptr + strlen (entirebufptr);
time (&mystamp);
time_ptr = _XLocaltime(&mystamp, localtime_buf);
strftime (mybuf, sizeof (mybuf), catgets (dtsearch_catd, MS_ve, 332,
strftime (mybuf, sizeof (mybuf), CATGETS(dtsearch_catd, MS_ve, 332,
"%Y/%m/%d at %H:%M %Z"), time_ptr);
sprintf (appendbufptr, catgets (dtsearch_catd, MS_ve, 333,
sprintf (appendbufptr, CATGETS(dtsearch_catd, MS_ve, 333,
"\n <User Note Appended by '%s' on %s>\n"),
usrblk.userid, mybuf);
strcat (appendbufptr, usrblk.query); /* now add user's text */
@@ -544,7 +544,7 @@ int ve_append_notes (void)
/* Also append the note to the backup flat file */
if ((backup_file = fopen (OEF_notesnot, "at ")) == NULL) {
sprintf (mybuf,
catgets (dtsearch_catd, MS_ve, 230,
CATGETS(dtsearch_catd, MS_ve, 230,
"%s Could not open user notes backup file '%s': %s."),
PROGNAME " 230", OEF_notesnot, strerror (errno));
DtSearchAddMessage (mybuf);
@@ -713,7 +713,7 @@ int ve_getrec_dba (LLIST ** bloblist)
/* Test for invalid dba */
if (dba == NULL_DBA) {
DtSearchAddMessage (catgets (dtsearch_catd, MS_ve, 157,
DtSearchAddMessage (CATGETS(dtsearch_catd, MS_ve, 157,
PROGNAME "245 Client Program Error: "
"Null database address in usrblk.dba."));
OE_flags |= OE_PERMERR;
@@ -727,7 +727,7 @@ int ve_getrec_dba (LLIST ** bloblist)
*/
d_crset (&dba, vistano);
if (db_status == S_INVADDR) {
sprintf (msgbuf, catgets (dtsearch_catd, MS_ve, 142,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_ve, 142,
"%s Client Error: Requested record with invalid\n"
" database addr %ld (%d:%ld, x'%08.8lx') for database '%s'."),
PROGNAME "142 ", dba, dba >> 24, dba & 0xffffff, dba, usrblk.dblk->label);
@@ -951,7 +951,7 @@ DtSrINT32 ve_reckey2dba (void)
if (usrblk.query == NULL) {
null_query = TRUE;
usrblk.query = "";
DtSearchAddMessage (catgets (dtsearch_catd, MS_ve, 398,
DtSearchAddMessage (CATGETS(dtsearch_catd, MS_ve, 398,
PROGNAME "398 NULL query string."));
}
if (strncmp (usrblk.query, debugkey, strlen (debugkey)) == 0) {

2
cde/lib/DtSearch/globals.c
View File

@@ -58,7 +58,7 @@
#define _XOPEN_SOURCE
#endif
#include <stdio.h>
#include <nl_types.h>
#include <Dt/MsgCatP.h>
FILE *aa_stderr = NULL;
char *aa_argv0 = "<argv0>";

8
cde/lib/DtSearch/hdecode.c
View File

@@ -139,13 +139,13 @@ void hc_decode (
/* Create hctree from external file? */
if (hctree == NULL) {
if ((hdecode_filebuf = malloc (HDEC_FBUFSZ)) == NULL) {
fprintf (aa_stderr, catgets(dtsearch_catd, MS_huff, 10,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_huff, 10,
"%s Out of Memory.\n"),
PROGNAME"076");
DtSearchExit (2);
}
if ((hdecode_file = fopen (hctree_name, "r")) == NULL) {
fprintf (aa_stderr, catgets(dtsearch_catd, MS_huff, 11,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_huff, 11,
"%s Cannot open tree file '%s': %s\n"),
PROGNAME"082", hctree_name, strerror (errno));
DtSearchExit (2);
@@ -171,7 +171,7 @@ void hc_decode (
}
for (i = 0; i <= hctree_root; i++) {
if ((fgets (hdecode_filebuf, HDEC_FBUFSZ, hdecode_file)) == NULL) {
fprintf (aa_stderr, catgets(dtsearch_catd, MS_huff, 12,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_huff, 12,
"%s Invalid format hctree '%s'.\n"),
PROGNAME"106", hctree_name);
DtSearchExit (2);
@@ -195,7 +195,7 @@ void hc_decode (
if (encode_id != hctree_id) {
fprintf (aa_stderr, catgets(dtsearch_catd, MS_huff, 13,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_huff, 13,
"%s Incompatible hctree_ids.\n"),
PROGNAME"118");
DtSearchExit (2);

2
cde/lib/DtSearch/hencode.c
View File

@@ -102,7 +102,7 @@ void gen_vec (char *fname_huffcode_tab)
_Xstrtokparams strtok_buf;
if ((tab_stream = fopen (fname_huffcode_tab, "r")) == NULL) {
printf (catgets(dtsearch_catd, MS_huff, 1,
printf (CATGETS(dtsearch_catd, MS_huff, 1,
"%s: Cannot open huffman encode file '%s':\n"
" %s\n Exit Code = 2\n"),
PROGNAME"222", fname_huffcode_tab, strerror (errno));

14
cde/lib/DtSearch/jpn.c
View File

@@ -731,7 +731,7 @@ ENTIRE_SUBSTR_IS_WORD:
} /* end state switch */
/* Should never get here... */
fprintf (aa_stderr, catgets(dtsearch_catd, MS_lang, 20,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_lang, 20,
"%s Program Error: Unknown jstate %d.\n") ,
PROGNAME"246", last_jstate);
DtSearchExit (46);
@@ -865,7 +865,7 @@ FILL_ANOTHER_SUBSTRING:
fputs ("jpnparser: js=ETX\n", aa_stderr);
if (add_msgs) {
char msgbuf [DtSrMAXWIDTH_HWORD + 100];
sprintf (msgbuf, catgets(dtsearch_catd, MS_lang, 21,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_lang, 21,
"%s '%.*s' is not a valid Japanese word.") ,
PROGNAME"812", DtSrMAXWIDTH_HWORD, save_parg_string);
DtSearchAddMessage (msgbuf);
@@ -980,7 +980,7 @@ static int load_jpntree (
}
else {
sprintf (sprintbuf,
catgets (dtsearch_catd, MS_misc, 362, "%s: %s: %s."),
CATGETS(dtsearch_catd, MS_misc, 362, "%s: %s: %s."),
PROGNAME"362", fname, strerror(errno));
DtSearchAddMessage (sprintbuf);
return 2;
@@ -1010,7 +1010,7 @@ static int load_jpntree (
/* Test for word too short */
if (strlen((char*)readbuf) < 4) {
sprintf (sprintbuf, catgets(dtsearch_catd, MS_lang, 23,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_lang, 23,
"%s Word '%s' on line %ld is too short.") ,
PROGNAME"1074", readbuf, linecount);
DtSearchAddMessage (sprintbuf);
@@ -1043,7 +1043,7 @@ static int load_jpntree (
/* Test for duplicate word */
if (i == 0) {
sprintf (sprintbuf,
catgets (dtsearch_catd, MS_misc, 423,
CATGETS(dtsearch_catd, MS_misc, 423,
"%s Word '%s' in '%s' is a duplicate."),
PROGNAME"423", readbuf, fname);
DtSearchAddMessage (sprintbuf);
@@ -1090,7 +1090,7 @@ static int load_jpntree (
fprintf (aa_stderr,
PROGNAME"1185 load '%s' unsuccessful, %d comments discarded.\n",
fname, comment_count);
sprintf (sprintbuf, catgets(dtsearch_catd, MS_lang, 24,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_lang, 24,
"%s No Japanese words in word file '%s'.") ,
PROGNAME"1186", fname);
DtSearchAddMessage (sprintbuf);
@@ -1154,7 +1154,7 @@ int load_jpn_language (DBLK *dblk, DBLK *dblist)
path[0] = 0;
else {
if (strlen (dblk->path) > _POSIX_PATH_MAX - 14) {
sprintf (msgbuf, catgets(dtsearch_catd, MS_lang, 25,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_lang, 25,
"%s Database '%s' path too long: '%s'.") ,
PROGNAME"759", dblk->name, dblk->path);
DtSearchAddMessage (msgbuf);

30
cde/lib/DtSearch/lang.c
View File

@@ -335,7 +335,7 @@ char *teskey_parser (PARG *parg)
is_hiliting = (parg->flags & PA_HILITING);
add_msgs = (parg->flags & PA_MSGS);
if (charmap == NULL) {
fprintf (aa_stderr, catgets(dtsearch_catd, MS_lang, 4,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_lang, 4,
"%s dblk not initialized.\n"),
PROGNAME"801");
DtSearchExit (55);
@@ -350,7 +350,7 @@ char *teskey_parser (PARG *parg)
cofunction = (READCFP) readchar_ftext;
}
else {
fprintf (aa_stderr, catgets(dtsearch_catd, MS_lang, 5,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_lang, 5,
"%s Program Error: parg contains neither file nor string.\n"),
PROGNAME"327");
DtSearchExit (27);
@@ -444,7 +444,7 @@ READ_ANOTHER_WORD:
candidate_offset-1, outbuf);
if (add_msgs) {
char msgbuf [DtSrMAXWIDTH_HWORD + 100];
sprintf (msgbuf, catgets(dtsearch_catd, MS_lang, 8,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_lang, 8,
"%s '%.*s...' is larger\n"
"than the maximum word size of database '%s'.") ,
PROGNAME"449", maxwordsz,
@@ -503,7 +503,7 @@ READ_ANOTHER_WORD:
/*------------- UNKNOWN State ------------*/
else {
fprintf (aa_stderr, catgets(dtsearch_catd, MS_lang, 10,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_lang, 10,
"%s Program Error: Unknown parser state.\n"),
PROGNAME"306");
DtSearchExit (26);
@@ -516,7 +516,7 @@ READ_ANOTHER_WORD:
fprintf (aa_stderr, "teskey: etx\n");
if (add_msgs) {
char msgbuf [200];
sprintf (msgbuf, catgets(dtsearch_catd, MS_lang, 12,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_lang, 12,
"%s '%.120s' is not a valid word in database '%s'.") ,
PROGNAME"506", parg->string, dblk->label);
DtSearchAddMessage (msgbuf);
@@ -553,7 +553,7 @@ READ_ANOTHER_WORD:
fprintf (aa_stderr, ", (TOO SHORT, min %d)\n", minwordsz);
if (add_msgs) {
char msgbuf [200];
sprintf (msgbuf, catgets(dtsearch_catd, MS_lang, 17,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_lang, 17,
"%s '%s' is less than the\n"
"minimum word size of database '%s'.") ,
PROGNAME"543", parg->string, dblk->label);
@@ -570,7 +570,7 @@ READ_ANOTHER_WORD:
fprintf (aa_stderr, ", (STOP LIST)\n");
if (add_msgs) {
char msgbuf [200];
sprintf (msgbuf, catgets(dtsearch_catd, MS_lang, 19,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_lang, 19,
"%s The word '%s' is not indexed in database '%s'.") ,
PROGNAME"558", parg->string, dblk->label);
DtSearchAddMessage (msgbuf);
@@ -666,7 +666,7 @@ int load_wordtree (
}
else {
sprintf (sprintbuf,
catgets (dtsearch_catd, MS_misc, 362, "%s: %s: %s."),
CATGETS(dtsearch_catd, MS_misc, 362, "%s: %s: %s."),
PROGNAME"362", fname, strerror(errno));
DtSearchAddMessage (sprintbuf);
return 2;
@@ -694,7 +694,7 @@ int load_wordtree (
/* If requested confirm all chars are teskey-concordable. */
if (do_teskey_test)
if (!is_concordable (token, dblk->charmap)) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_misc, 400,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_misc, 400,
"%s: %s, line %ld: Invalid chars in word '%s'."),
PROGNAME"400", fname, linecount, token);
DtSearchAddMessage (sprintbuf);
@@ -723,7 +723,7 @@ int load_wordtree (
/* test for duplicate word */
if (i == 0) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_misc, 423,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_misc, 423,
"%s Word '%s' in '%s' is a duplicate."),
PROGNAME"423", token, fname);
DtSearchAddMessage (sprintbuf);
@@ -920,7 +920,7 @@ static int load_include_list (DBLK *dblk, DBLK *dblist)
}
else {
sprintf (sprintbuf,
catgets (dtsearch_catd, MS_misc, 362, "%s: %s: %s."),
CATGETS(dtsearch_catd, MS_misc, 362, "%s: %s: %s."),
PROGNAME"1218", dblk->fname_inc, strerror(ENOENT));
DtSearchAddMessage (sprintbuf);
return FALSE;
@@ -1011,7 +1011,7 @@ static int load_stop_list (DBLK *dblk, DBLK *dblist)
i = load_wordtree (&dblk->stoplist, dblk, dblk->fname_stp, TRUE);
if (i == 1) {
sprintf (sprintbuf,
catgets (dtsearch_catd, MS_misc, 362, "%s: %s: %s"),
CATGETS(dtsearch_catd, MS_misc, 362, "%s: %s: %s"),
PROGNAME"1270", dblk->fname_stp, strerror(ENOENT));
DtSearchAddMessage (sprintbuf);
}
@@ -1149,7 +1149,7 @@ static int load_paice_suffixes (DBLK *dblk, DBLK *dblist)
fp = fopen (dblk->fname_sfx, "rt");
if (fp == NULL) {
sprintf (msgbuf,
catgets (dtsearch_catd, MS_misc, 362, "%s: %s: %s."),
CATGETS(dtsearch_catd, MS_misc, 362, "%s: %s: %s."),
PROGNAME"181", dblk->fname_sfx, strerror(errno));
DtSearchAddMessage (msgbuf);
dblk->fname_sfx = NULL;
@@ -1192,7 +1192,7 @@ static int load_paice_suffixes (DBLK *dblk, DBLK *dblist)
/* OPTIONAL TOKEN #2: if next token '*', set 'intact' flag */
if ((token = (UCHAR *)_XStrtok(NULL, SFX_DELIMS, strtok_buf)) == NULL) {
BAD_RULE:
sprintf (msgbuf, catgets(dtsearch_catd, MS_lang, 51,
sprintf (msgbuf, CATGETS(dtsearch_catd, MS_lang, 51,
"%s %s, Line %d: Invalid Paice Rule for suffix '%s'.") ,
PROGNAME"898", dblk->fname_sfx, lineno, suffix);
DtSearchAddMessage (msgbuf);
@@ -1398,7 +1398,7 @@ static char *paice_stemmer (char *wordin, DBLK *dblk)
return "";
if ((rules_table = (PRULE **)dblk->stem_extra) == NULL) {
fprintf (aa_stderr, catgets (dtsearch_catd, MS_lang, 31,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_lang, 31,
"%s Stemmer suffixes file never loaded.\n"),
PROGNAME"310");
DtSearchExit (2);

4
cde/lib/DtSearch/mrclean.c
View File

@@ -963,9 +963,9 @@ aa_argv0 = argv[0];
time (&starttime);
time_ptr = _XLocaltime(&starttime, localtime_buf);
strftime (dbfpath, sizeof (dbfpath), /* just use any ol' buffer */
catgets (dtsearch_catd, MS_misc, 22, "%A, %b %d %Y, %I:%M %p"),
CATGETS(dtsearch_catd, MS_misc, 22, "%A, %b %d %Y, %I:%M %p"),
time_ptr);
printf (catgets (dtsearch_catd, MS_misc, 23,
printf (CATGETS(dtsearch_catd, MS_misc, 23,
"%s: Version %s%s. Run %s.\n"),
aa_argv0, AUSAPI_VERSION, betabuf, dbfpath);

6
cde/lib/DtSearch/msgutil.c
View File

@@ -122,7 +122,7 @@ char *nowstring (time_t * now)
}
time_ptr = _XLocaltime(now, localtime_buf);
strftime (buf, sizeof (buf),
catgets (dtsearch_catd, MS_misc, 2, "%Y/%m/%d,%H:%M:%S"),
CATGETS(dtsearch_catd, MS_misc, 2, "%Y/%m/%d,%H:%M:%S"),
time_ptr);
return buf;
} /* nowstring() */
@@ -342,8 +342,8 @@ void *austext_malloc (size_t size, char *location, void *ignore)
ptr = ((aa_argv0) ? aa_argv0 : "");
if (location == NULL)
location = catgets (dtsearch_catd, MS_misc, 1, "<null>");
outofmem_msg = catgets (dtsearch_catd, MS_misc, 3,
location = CATGETS(dtsearch_catd, MS_misc, 1, "<null>");
outofmem_msg = CATGETS(dtsearch_catd, MS_misc, 3,
"*** %sOut of Memory at %s asking for %lu bytes! ***\n");
fprintf (aa_stderr, outofmem_msg, ptr, location, size);
fflush (aa_stderr);

68
cde/lib/DtSearch/ocf.c
View File

@@ -287,7 +287,7 @@ static int read_database (char *keyword, _Xstrtokparams *strtok_buf)
if ((token = _XStrtok(NULL, DELIMITERS, *strtok_buf)) == NULL) {
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 477,
CATGETS(dtsearch_catd, MS_loadocf, 477,
"%s %s: Missing database name after '%s' keyword.\n"),
PROGNAME"477", cfgfname, keyword);
DtSearchAddMessage (sprintbufp);
@@ -297,7 +297,7 @@ static int read_database (char *keyword, _Xstrtokparams *strtok_buf)
if (strlen (token) > 8) {
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 184,
CATGETS(dtsearch_catd, MS_loadocf, 184,
"%s %s: More than 8 characters in Database name '%.16s'.\n"),
PROGNAME"184", cfgfname, token);
DtSearchAddMessage (sprintbufp);
@@ -346,7 +346,7 @@ static void set_boolbit (long *flagvar, long mask, char *flagname,
*flagvar &= ~mask; /* switch OFF */
else {
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 352,
CATGETS(dtsearch_catd, MS_loadocf, 352,
"%s %s: Invalid %s value, line ignored.\n"),
PROGNAME"352", cfgfname, flagname);
DtSearchAddMessage (sprintbufp);
@@ -366,9 +366,9 @@ static void set_int (int *intvar, char *keyword, _Xstrtokparams *strtok_buf)
int myint;
if ((token = _XStrtok(NULL, DELIMITERS, *strtok_buf)) == NULL) {
token = catgets (dtsearch_catd, MS_loadocf, 140, "(missing)");
token = CATGETS(dtsearch_catd, MS_loadocf, 140, "(missing)");
ERR_MSG:
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 610,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 610,
"%s %s: %s value is '%s'. "
"Should be positive integer. Line ignored."),
PROGNAME"844", cfgfname, keyword, token);
@@ -393,9 +393,9 @@ static void set_long (long *longvar, char *keyword,
long longi;
if ((token = _XStrtok(NULL, DELIMITERS, *strtok_buf)) == NULL) {
token = catgets (dtsearch_catd, MS_loadocf, 140, "(missing)");
token = CATGETS(dtsearch_catd, MS_loadocf, 140, "(missing)");
ERR_MSG:
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 610,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 610,
"%s %s: %s value is '%s'. "
"Should be positive integer. Line ignored."),
PROGNAME"610", cfgfname, keyword, token);
@@ -427,7 +427,7 @@ static void set_boolint (int *boolint, char *keyword,
*boolint = FALSE; /* switch OFF */
else {
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 352,
CATGETS(dtsearch_catd, MS_loadocf, 352,
"%s %s: Invalid %s value, line ignored.\n"),
PROGNAME"352", cfgfname, keyword);
DtSearchAddMessage (sprintbufp);
@@ -464,7 +464,7 @@ static void set_fileio (_Xstrtokparams *strtok_buf)
else if (strcmp (token, "-HOME") == 0)
OE_fileio = "-HOME";
else {
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 607,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 607,
"%s %s: Invalid FILEIO value. "
"User file reads and writes prohibited."),
PROGNAME"607", cfgfname);
@@ -487,7 +487,7 @@ static void read_rest_of_line (char *keyword, char **passed_ptr,
_Xstrtokparams *strtok_buf)
{
if ((token = _XStrtok(NULL, "\n", *strtok_buf)) == NULL) {
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 1007,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 1007,
"%s%s: Empty %s string ignored."),
PROGNAME"1007 ", cfgfname, keyword);
DtSearchAddMessage (sprintbufp);
@@ -515,12 +515,12 @@ static void read_filepath (_Xstrtokparams *strtok_buf)
* Set tabx to matching oef table entry.
*/
if ((token = _XStrtok(NULL, DELIMITERS, *strtok_buf)) == NULL) {
token = catgets (dtsearch_catd, MS_loadocf, 142, "rest of line");
errp = catgets (dtsearch_catd, MS_loadocf, 143, "is empty");
token = CATGETS(dtsearch_catd, MS_loadocf, 142, "rest of line");
errp = CATGETS(dtsearch_catd, MS_loadocf, 143, "is empty");
IGNORE_FILEPATH:
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 903,
CATGETS(dtsearch_catd, MS_loadocf, 903,
"%s %s: FILEPATH '%s' %s. Line ignored."),
PROGNAME"903", cfgfname, token, errp);
DtSearchAddMessage (sprintbufp);
@@ -532,11 +532,11 @@ IGNORE_FILEPATH:
break;
}
if (oef_table[tabx].id == NULL) {
errp = catgets (dtsearch_catd, MS_loadocf, 165, "unknown id");
errp = CATGETS(dtsearch_catd, MS_loadocf, 165, "unknown id");
goto IGNORE_FILEPATH;
}
if (oef_table[tabx].previously_specified) {
errp = catgets (dtsearch_catd, MS_loadocf, 166, "previously specified");
errp = CATGETS(dtsearch_catd, MS_loadocf, 166, "previously specified");
goto IGNORE_FILEPATH;
}
@@ -545,7 +545,7 @@ IGNORE_FILEPATH:
*/
if ((token = _XStrtok(NULL, DELIMITERS, *strtok_buf)) == NULL) {
token = oef_table[tabx].id;
errp = catgets (dtsearch_catd, MS_loadocf, 168,
errp = CATGETS(dtsearch_catd, MS_loadocf, 168,
"missing path specification");
goto IGNORE_FILEPATH;
}
@@ -586,7 +586,7 @@ static void read_path (_Xstrtokparams *strtok_buf)
/* parse the path for this dictionary/database */
if ((token = _XStrtok(NULL, DELIMITERS, *strtok_buf)) == NULL) {
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 221,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 221,
"%s %s: Database '%s', No PATH specified, statement ignored.\n"),
PROGNAME"221", cfgfname, db->name);
DtSearchAddMessage (sprintbufp);
@@ -607,7 +607,7 @@ static void read_path (_Xstrtokparams *strtok_buf)
/* append warning msg: passed keyword no longer used */
static void obsolete_keyword (char *keyword)
{
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 1,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 1,
"%1$s%2$s: %3$s keyword is obsolete."),
PROGNAME "001 ", cfgfname, keyword);
DtSearchAddMessage (sprintbufp);
@@ -632,7 +632,7 @@ static void read_maxhits (_Xstrtokparams *strtok_buf)
if ((token = _XStrtok(NULL, DELIMITERS, *strtok_buf)) == NULL) {
INVALID_MAXHITS:
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 304,
CATGETS(dtsearch_catd, MS_loadocf, 304,
"%s %s: Database '%s', invalid MAXHITS value.\n"),
PROGNAME"304", cfgfname, db->name);
DtSearchAddMessage (sprintbufp);
@@ -672,7 +672,7 @@ static int add_a_keytype (char ktchar)
/* Make sure we have not exceeded max number of keytypes */
if (db->ktcount >= MAX_KTCOUNT) {
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 732,
CATGETS(dtsearch_catd, MS_loadocf, 732,
"%s %s: Database '%s', No more than %d keytypes allowed.\n"),
PROGNAME"732", cfgfname, db->name, MAX_KTCOUNT);
DtSearchAddMessage (sprintbufp);
@@ -685,7 +685,7 @@ static int add_a_keytype (char ktchar)
if (!isprint (ktchar))
ktchar = '?';
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 684,
CATGETS(dtsearch_catd, MS_loadocf, 684,
"%s %s: Database '%s',\n Invalid KEYTYPE character '%c'."),
PROGNAME"684", cfgfname, db->name, ktchar);
DtSearchAddMessage (sprintbufp);
@@ -698,7 +698,7 @@ static int add_a_keytype (char ktchar)
for (i = 0; i < db->ktcount; i++)
if (ktchar == kt[i].ktchar) {
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 1002,
CATGETS(dtsearch_catd, MS_loadocf, 1002,
"%s %s: Database '%s', Duplicate KEYTYPE character '%c'.\n"),
PROGNAME"1002", cfgfname, db->name, ktchar);
DtSearchAddMessage (sprintbufp);
@@ -716,12 +716,12 @@ static int add_a_keytype (char ktchar)
kt[newindex].is_selected = TRUE;
kt[newindex].ktchar = ktchar;
sprintf (kt[newindex].name,
catgets (dtsearch_catd, MS_loadocf, 457, "'%c' Records"), ktchar);
CATGETS(dtsearch_catd, MS_loadocf, 457, "'%c' Records"), ktchar);
/* Warn about inaccessible lowercase ktchars */
if ( ((ascii_charmap[ktchar] & 0xff) != ktchar) && OE_uppercase_keys ) {
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 1011,
CATGETS(dtsearch_catd, MS_loadocf, 1011,
"%s %s: Database '%s': Records with lowercase\n"
" KEYTYPE character '%c' will be inaccessible.\n"
" Set UPPERKEYS = FALSE if lowercase keys are intended."),
@@ -870,7 +870,7 @@ GOT_FULLNAME:
*/
if (fptr == NULL) {
if (errno != ENOENT || is_prespecified_fname) {
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 414,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 414,
"%s Unable to open configuration file '%s':\n %s."),
PROGNAME"414", fullname, strerror(errno));
DtSearchAddMessage (sprintbufp);
@@ -885,7 +885,7 @@ GOT_FULLNAME:
strcpy (OE_sitecnfg_fname, fullname);
}
if (fstat (fileno (fptr), &statbuf) == -1) {
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 1404,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 1404,
"%s Status unavailable for configuration file '%s': %s"),
PROGNAME"1404", fullname, strerror(errno));
DtSearchAddMessage (sprintbufp);
@@ -1014,7 +1014,7 @@ int load_ocf (void)
goto OCFOPEN_OK;
/* If we can't find site config on OE side we must quit. */
sprintf (sprintbuf, catgets (dtsearch_catd, MS_loadocf, 1643,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_loadocf, 1643,
"%1$sCannot find or open '%2$s'\n"
" configuration file in any of the following locations:\n"
" DTSROCFPATH directory = %3$s,\n"
@@ -1025,16 +1025,16 @@ int load_ocf (void)
)
,PROGNAME "1643 "
,FNAME_SITECONFIG
,(p) ? p : catgets (dtsearch_catd, MS_misc, 16,
,(p) ? p : CATGETS(dtsearch_catd, MS_misc, 16,
"<no environment variable>")
,inbuf
,(q) ? q : catgets (dtsearch_catd, MS_misc, 16,
,(q) ? q : CATGETS(dtsearch_catd, MS_misc, 16,
"<no environment variable>")
,(OE_inittab_dir) ? OE_inittab_dir :
catgets (dtsearch_catd, MS_misc, 17,
CATGETS(dtsearch_catd, MS_misc, 17,
"<no server daemon>")
,(OE_server_dir) ? OE_server_dir :
catgets (dtsearch_catd, MS_misc, 17,
CATGETS(dtsearch_catd, MS_misc, 17,
"<no server daemon>")
);
DtSearchAddMessage (sprintbuf);
@@ -1130,7 +1130,7 @@ OCFOPEN_OK:
/* if we made it this far, the first token is unknown */
sprintf (sprintbufp,
catgets (dtsearch_catd, MS_loadocf, 495,
CATGETS(dtsearch_catd, MS_loadocf, 495,
"%s %s: '%.16s' is invalid keyword.\n"),
PROGNAME"495", cfgfname, token);
DtSearchAddMessage (sprintbufp);
@@ -1149,7 +1149,7 @@ OCFOPEN_OK:
* in site config file, remove the dblk and mark fatal error.
*/
if (usrblk.dblist == NULL) {
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 1869,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 1869,
"%s %s: Configuration file must specify at least one database."),
PROGNAME"1869", cfgfname);
DtSearchAddMessage (sprintbufp);
@@ -1158,7 +1158,7 @@ OCFOPEN_OK:
else
for (db = usrblk.dblist; db != NULL; db = db->link) {
if (db->ktcount <= 0) {
sprintf (sprintbufp, catgets (dtsearch_catd, MS_loadocf, 986,
sprintf (sprintbufp, CATGETS(dtsearch_catd, MS_loadocf, 986,
"%s %s: KEYTYPES missing for database '%s'."),
PROGNAME"986", cfgfname, db->name);
DtSearchAddMessage (sprintbufp);

12
cde/lib/DtSearch/opendblk.c
View File

@@ -135,7 +135,7 @@ int open_dblk (DBLK ** dblist, int numpages, int debugging)
db_oflag);
if (dblist == NULL || numpages < 8) {
BAD_INPUT:
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oeinit, 99,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oeinit, 99,
"%s Programming Error: Invalid input to open_dblk()."),
PROGNAME "99");
DtSearchAddMessage (sprintbuf);
@@ -192,14 +192,14 @@ BAD_INPUT:
if (debugging)
fprintf (aa_stderr, PROGNAME "129 UNLINK: cant open '%s'.\n",
temp_file_name);
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oeinit, 317,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oeinit, 317,
"%s Cannot open database file '%s'.\n"
" Errno %d = %s\n"
" %s is removing '%s' from list of available databases."),
PROGNAME "317", temp_file_name, errno, strerror (errno),
OE_prodname, db->name);
if (errno == ENOENT)
strcat (sprintbuf, catgets (dtsearch_catd, MS_oeinit, 318,
strcat (sprintbuf, CATGETS(dtsearch_catd, MS_oeinit, 318,
"\n This can usually be corrected by specifying a valid\n"
" database PATH in the site configuration file."));
DtSearchAddMessage (sprintbuf);
@@ -216,7 +216,7 @@ BAD_INPUT:
fprintf (aa_stderr,
PROGNAME "149 UNLINK: cant get status '%s'.\n",
temp_file_name);
sprintf (sprintbuf, catgets (dtsearch_catd, MS_oeinit, 1404,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_oeinit, 1404,
"%s Removing database '%s' from list of "
"available databases because status is "
"unavailable for file %s: %s"),
@@ -252,7 +252,7 @@ DELETE_DB:
/* quit if no dblks remain */
if (vistano <= 0) {
sprintf (sprintbuf, catgets (dtsearch_catd, MS_misc, 8,
sprintf (sprintbuf, CATGETS(dtsearch_catd, MS_misc, 8,
"%s No valid databases remain."), PROGNAME "265");
DtSearchAddMessage (sprintbuf);
return FALSE;
@@ -283,7 +283,7 @@ DELETE_DB:
if (db_status != S_OKAY) {
targptr = austext_malloc (totlen + 128, PROGNAME"239", NULL);
sprintf (targptr, catgets (dtsearch_catd, MS_vista, 378,
sprintf (targptr, CATGETS(dtsearch_catd, MS_vista, 378,
"%s Could not open following database name string:\n '%s'"),
PROGNAME"378", allnames);
DtSearchAddMessage (targptr);

30
cde/lib/DtSearch/vestatis.c
View File

@@ -184,14 +184,14 @@ void release_shm_mem (void)
{
if (global_memory_ptr != NULL) {
if (shmdt (global_memory_ptr) == -1) {
DtSearchAddMessage (catgets (dtsearch_catd, MS_vestatis, 104,
DtSearchAddMessage (CATGETS(dtsearch_catd, MS_vestatis, 104,
PROGNAME "104 Cannot detach shared memory "));
OE_flags |= OE_PERMERR;
usrblk.retncode = OE_ABORT;
return;
}
if (shmctl (shm_id, IPC_RMID, NULL) == -1) {
DtSearchAddMessage (catgets (dtsearch_catd, MS_vestatis, 110,
DtSearchAddMessage (CATGETS(dtsearch_catd, MS_vestatis, 110,
PROGNAME "110 Cannot remove shared memory "));
OE_flags |= OE_PERMERR;
usrblk.retncode = OE_ABORT;
@@ -224,7 +224,7 @@ static int init_global_memory (DtSrINT32 addrs, DtSrINT32 r_addrs)
shm_id = shmget (IPC_PRIVATE, k, SHM_FLAG);
if ((global_memory_ptr = (char *) shmat (shm_id, (char *) 0, 0)) ==
((char *) -1)) {
DtSearchAddMessage (catgets (dtsearch_catd, MS_vestatis, 115,
DtSearchAddMessage (CATGETS(dtsearch_catd, MS_vestatis, 115,
PROGNAME "115 No shared memory available"));
OE_flags |= OE_PERMERR;
usrblk.retncode = OE_ABORT;
@@ -404,7 +404,7 @@ int efim_qsort (void)
sptr++;
if (sptr == STACKSZ) {
fputs (catgets (dtsearch_catd, MS_vestatis, 107,
fputs (CATGETS(dtsearch_catd, MS_vestatis, 107,
PROGNAME "107 Qsort stack overflow.\n"),
aa_stderr);
OE_flags |= OE_PERMERR;
@@ -433,7 +433,7 @@ int efim_qsort (void)
sptr++;
if (sptr == STACKSZ) {
fputs (catgets (dtsearch_catd, MS_vestatis, 107,
fputs (CATGETS(dtsearch_catd, MS_vestatis, 107,
PROGNAME "107 Qsort stack overflow.\n"),
aa_stderr);
OE_flags |= OE_PERMERR;
@@ -630,7 +630,7 @@ void get_next_memory_block (size_t node_size)
mem_offset += node_size;
cur_pos = mem_start;
if (mem_start == NULL) {
fprintf (aa_stderr, catgets (dtsearch_catd, MS_vestatis, 310,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_vestatis, 310,
"%s Out of Memory. Need %ld bytes.\n"),
PROGNAME "310", total_memory_size);
OE_flags |= OE_PERMERR;
@@ -645,7 +645,7 @@ void get_next_memory_block (size_t node_size)
memory_blocks = (CNCRD_MEMORY_AREA_LIST *)
malloc (sizeof (CNCRD_MEMORY_AREA_LIST) + 2);
if (memory_blocks == NULL) {
fputs (catgets (dtsearch_catd, MS_vestatis, 314,
fputs (CATGETS(dtsearch_catd, MS_vestatis, 314,
PROGNAME"314 Out of Memory.\n"), aa_stderr);
OE_flags |= OE_PERMERR;
usrblk.retncode = OE_ABORT;
@@ -761,7 +761,7 @@ void init_memory (void)
{
mem_start = (char *) malloc (MEMORY_SIZE);
if (mem_start == NULL) {
fprintf (aa_stderr, catgets (dtsearch_catd, MS_vestatis, 310,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_vestatis, 310,
"%s Out of Memory. Need %ld bytes.\n"), PROGNAME "310", MEMORY_SIZE);
OE_flags |= OE_PERMERR;
usrblk.retncode = OE_ABORT;
@@ -778,7 +778,7 @@ void init_memory (void)
memory_blocks = (CNCRD_MEMORY_AREA_LIST *)
malloc (sizeof (CNCRD_MEMORY_AREA_LIST) + 2);
if (memory_blocks == NULL) {
fputs (catgets (dtsearch_catd, MS_vestatis, 314,
fputs (CATGETS(dtsearch_catd, MS_vestatis, 314,
PROGNAME "314 Out of Memory.\n"), aa_stderr);
OE_flags |= OE_PERMERR;
usrblk.retncode = OE_ABORT;
@@ -1008,7 +1008,7 @@ void load_ditto_str (void)
*/
d_crset (&dba1, saveusr.vistano);
if (db_status < 0) {
fprintf (aa_stderr, catgets (dtsearch_catd, MS_vestatis, 437,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_vestatis, 437,
"%s: db_status = %d, dba = %d:%ld (x'%08.8lx'), vistano = %d\n"),
PROGNAME "437", db_status, (dba1 & 0xff000000) >> 24,
dba1 & 0xffffff, dba1, saveusr.vistano);
@@ -1019,7 +1019,7 @@ void load_ditto_str (void)
}
d_recread (&cur_rec, saveusr.vistano);
if (db_status < 0) {
fprintf (aa_stderr, catgets (dtsearch_catd, MS_vestatis, 437,
fprintf (aa_stderr, CATGETS(dtsearch_catd, MS_vestatis, 437,
"%s: db_status = %d, dba = %d:%ld (x'%08.8lx'), vistano = %d\n"),
PROGNAME "437", db_status, (dba1 & 0xff000000) >> 24,
dba1 & 0xffffff, dba1, saveusr.vistano);
@@ -1047,7 +1047,7 @@ void load_ditto_str (void)
else {
cur_ditto_mem = malloc (dittosz);
if (cur_ditto_mem == NULL) {
fputs ( catgets (dtsearch_catd, MS_vestatis, 504,
fputs ( CATGETS(dtsearch_catd, MS_vestatis, 504,
PROGNAME "504 Cannot allocate cur_ditto\n"),
aa_stderr);
OE_flags |= OE_PERMERR;
@@ -1150,7 +1150,7 @@ void load_ditto_str (void)
if (num_hits >= maxhits) {
if (!(usrblk.flags & USR_NO_INFOMSGS)) {
sprintf (vestat_msgbuf, catgets (dtsearch_catd, MS_vestatis, 421,
sprintf (vestat_msgbuf, CATGETS(dtsearch_catd, MS_vestatis, 421,
"$s Total Number Hits = %ld. Discarded hits beyond maximum number specified."),
PROGNAME "421", (long)num_hits);
DtSearchAddMessage (vestat_msgbuf);
@@ -1342,7 +1342,7 @@ static void stat_search (void)
*/
if (num_hits > SORT_MESG && !(usrblk.flags & USR_NO_ITERATE)) {
if (!mes_search_box) {
DtSearchAddMessage (catgets (dtsearch_catd, MS_vestatis, 990,
DtSearchAddMessage (CATGETS(dtsearch_catd, MS_vestatis, 990,
PROGNAME"990 The system is now sorting. Please wait."));
}
usrblk.retncode = OE_SEARCHING;
@@ -1406,7 +1406,7 @@ void ve_statistical (void)
/* stat_array size = 1 node for every possible object */
if (usrblk.query[0] == 0) {
DtSearchAddMessage (catgets (dtsearch_catd, MS_vestatis,
DtSearchAddMessage (CATGETS(dtsearch_catd, MS_vestatis,
677, PROGNAME "677 Query field is empty."));
usrblk.retncode = OE_BAD_QUERY;
return;