FreeWnn-1.1.1-fix-x86-64-61907.patch

FreeWnn-1.1.1-fix-x86-64-61907.patch (text/plain), 2.54 KB, created by MATSUU Takuto (RETIRED) on 2004-05-01 23:58:07 UTC

diff -ruN FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c	2003-10-17 14:02:53.000000000 +0900
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c	2003-10-17 16:31:29.000000000 +0900
@@ -200,6 +200,7 @@
   struct passwd *pwent;
 
   char nlspath[64];
+  pid_t ppid;
 
   strcpy (lang_dir, LANG_NAME);
   strcpy (nlspath, LIBDIR);
@@ -240,8 +241,10 @@
 #endif /* KOREAN */
 #endif /* CHINESE */
 #ifndef NOTFORK
-  if (fork ())
-    {
+  if ((ppid = fork ()) == -1) {
+	printf ("\nCannot fork. errno=%d\n", errno);
+	exit (1);
+  } else if (ppid) {
       signal (SIGCHLD, _exit);
       signal (SIGHUP, SIG_IGN);
       signal (SIGINT, SIG_IGN);
@@ -251,6 +254,7 @@
 #endif
       signal (SIGTERM, _exit);
       pause ();
+      exit (0);
     }
 #endif /* !NOTFORK */
 
@@ -314,6 +318,8 @@
   demon_main ();
 
   demon_fin ();
+
+  return 0;
 }
 
 static void
diff -ruN FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de_header.h FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de_header.h
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de_header.h	2000-03-21 01:31:18.000000000 +0900
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de_header.h	2003-10-17 16:31:29.000000000 +0900
@@ -339,7 +339,7 @@
 /* error.c */
 extern void error_exit1 ();
 extern void error_exit ();
-extern void error1 ();
+extern void error1 (const char *fmt, ...);
 extern intfntype signal_hand ();
 extern intfntype terminate_hand ();
 extern void out ();
diff -ruN FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/error.c FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/error.c	2000-02-24 00:31:34.000000000 +0900
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c	2003-10-17 16:31:29.000000000 +0900
@@ -32,6 +32,7 @@
 #include <config.h>
 
 #include <stdio.h>
+#include <stdarg.h>
 #include <time.h>
 #include <errno.h>
 #include <signal.h>
@@ -42,7 +43,7 @@
 extern int errno;
 
 static void my_error (), exit_hand ();
-void error1 ();
+void error1 (const char *fmt, ...);
 
 void
 error_exit1 (x, y1, y2, y3, y4, y5)
@@ -110,17 +111,20 @@
 }
 
 void
-error1 (x, y1, y2, y3, y4, y5)
-     register char *x;
-     int y1, y2, y3, y4, y5;
+error1 (const char *fmt, ...)
 {
-  char buf[512];
+  char buf[512], tmp[512];
+  va_list args;
+
+  va_start (args, fmt);
 
   strcpy (buf, cmd_name);       /* strcpy(buf , "jserver:"); */
   strcat (buf, ":");
-  strcat (buf, x);
-  sprintf (buf, x, y1, y2, y3, y4, y5);
-  my_error (buf);
+  strcat (buf, fmt);
+  vsnprintf (tmp, 512 - strlen (buf) - 1, buf, args);
+  my_error (tmp);
+
+  va_end (args);
 }