external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

message catalogs: fix comment lines, also remove linux hack in merge.c

Browse source 
According to the spec, blank lines in message catalogs or lines
beginning with '$ ' are valid comments.

However, there were many cases where lines in the message catalogs
contained just a single '$', without the required space after it.

Under linux, this caused 126766 error lines (in my builds) of the
form:

... unknown directive `': line ignored

This also causes gencat to exit with a non-0 exit code.  Even though
gencat says it ignores the line, it really doesn't.

An early porting change to programs/localized/util/merge.c was made to
ignore this return value on linux.  This hack has now been removed.

Build logs are a lot smaller and cleaner now.
This commit is contained in:
Jon Trulson 2012-09-03 15:12:57 -06:00
parent e9bb2bcf09
commit a29fc20957
470 changed files with 22507 additions and 22515 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cde/programs/localized/util/merge.c
View file

@ -248,11 +248,7 @@ void cat_open ()
#endif #endif
if ( system(line) != 0 ) if ( system(line) != 0 )
{ {
/* Utter Linux HACK, it seems the return value of GNU gencat is != 0
even on success */
#if !defined(linux)
fatal("primary .tmsg file would not gencat\n",0,9); fatal("primary .tmsg file would not gencat\n",0,9);
#endif
} }
} }
@ -267,11 +263,7 @@ void cat_open ()
#endif #endif
if ( system(line) != 0 ) if ( system(line) != 0 )
{ {
/* Utter Linux HACK, it seems the return value of GNU gencat is != 0
even on success */
#if !defined(linux)
fatal("default .tmsg file would not gencat\n",0,9); fatal("default .tmsg file would not gencat\n",0,9);
#endif
} }
} }