projects
/
oweals
/
cde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in license headers
[oweals/cde.git]
/
cde
/
programs
/
localized
/
util
/
merge.c
diff --git
a/cde/programs/localized/util/merge.c
b/cde/programs/localized/util/merge.c
index 7e247d62b1cc501fbccc35a2ac44b4c36005a2c2..dbc523a2657e13d88ab06dca336c345c98286002 100644
(file)
--- a/
cde/programs/localized/util/merge.c
+++ b/
cde/programs/localized/util/merge.c
@@
-16,7
+16,7
@@
* details.
*
* You should have received a copy of the GNU Lesser General Public
* details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with these librar
ar
ies and programs; if not, write
+ * License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
@@
-93,6
+93,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <locale.h>
#include <nl_types.h>
#include <locale.h>
#include <nl_types.h>
@@
-248,11
+249,7
@@
void cat_open ()
#endif
if ( system(line) != 0 )
{
#endif
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
+264,7
@@
void cat_open ()
#endif
if ( system(line) != 0 )
{
#endif
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
}
}
}
}
@@
-318,17
+311,20
@@
int file; /* 0: Primary message file, 1: Default message file */
/*
* Display error message and exit program.
/*
* Display error message and exit program.
+ *
+ * file == file in which the error found 0: Primary message file
+ * 1: Default message file
+ * 2: Template file
+ * 9: N/A
*/
*/
-void fatal (m, line, file)
-char *m;
-int line; /* line where the error found */
-int file; /* file in which the error found 0: Primary message file */
+void fatal (char *m, int line, int file)
+/* file in which the error found 0: Primary message file */
/* 1: Default message file */
/* 2: Template file */
/* 9: N/A */
{
fprintf (stderr, "*** Fatal: ");
/* 1: Default message file */
/* 2: Template file */
/* 9: N/A */
{
fprintf (stderr, "*** Fatal: ");
- fprintf (stderr, m);
+ fprintf (stderr,
"%s",
m);
switch(file)
{
case 0:
switch(file)
{
case 0: