[freewnn:00643] typo daemon patch

[Katsuomi Hamajima/濱嶋克臣 <hamajima@XXXX>]

濱嶋です。

これまた半年くらい前に気づいて手元で直したけど、忘れていたものです。
daemonと書くところが全部demonになっています

diff -ru Xsi.orig/Wnn/include/demcom.h Xsi/Wnn/include/demcom.h
--- Xsi.orig/Wnn/include/demcom.h	Mon Jun 18 18:09:32 2001
+++ Xsi/Wnn/include/demcom.h	Fri Jun 29 14:59:12 2001
@@ -38,7 +38,7 @@
 */
 
 /*
- *      Demon Commands
+ *      Daemon Commands
  */
 #define JS_VERSION      0x00    /* changing this will break protocol version check */
 #define JS_OPEN         0x01
diff -ru Xsi.orig/Wnn/jlib/js.c Xsi/Wnn/jlib/js.c
--- Xsi.orig/Wnn/jlib/js.c	Mon Jun 18 18:09:37 2001
+++ Xsi/Wnn/jlib/js.c	Fri Jun 29 14:59:21 2001
@@ -160,7 +160,7 @@
 
 /**     デーモンが死んだ時のための後始末        **/
 static void
-demon_dead ()
+daemon_dead ()
 {
   current_js->js_dead = -1;
   wnn_errorno = WNN_JSERVER_DEAD;
@@ -420,7 +420,7 @@
             }
           else
             {
-              demon_dead ();
+              daemon_dead ();
               return -1;
             }
         }
@@ -520,14 +520,14 @@
                 }
               else if (rbc == 0)
                 {
-                  demon_dead ();
+                  daemon_dead ();
                   return -1;
                 }
               else
                 {               /* cc == -1 */
                   if (errno != EINTR)
                     {
-                      demon_dead ();
+                      daemon_dead ();
                       return -1;
                     }
                   continue;
diff -ru Xsi.orig/Wnn/jserver/de.c Xsi/Wnn/jserver/de.c
--- Xsi.orig/Wnn/jserver/de.c	Mon Jun 18 18:09:40 2001
+++ Xsi/Wnn/jserver/de.c	Fri Jun 29 14:59:36 2001
@@ -30,7 +30,7 @@
  */
 
 /*
-        Jserver         (Nihongo Demon)
+        Jserver         (Nihongo Daemon)
 */
 #if defined(HAVE_CONFIG_H)
 #include <config.h>
@@ -178,8 +178,8 @@
 struct msg_cat *wnn_msg_cat;
 struct msg_cat *js_msg_cat;
 
-static void demon_main (), sel_all (), new_client (), demon_init (), socket_init (), socket_init_in (), xerror (), get_options ();
-void demon_fin (), del_client (), put2_cur (), putc_cur ();
+static void daemon_main (), sel_all (), new_client (), daemon_init (), socket_init (), socket_init_in (), xerror (), get_options ();
+void daemon_fin (), del_client (), put2_cur (), putc_cur ();
 static int get_client (), rcv_1_client (), socket_accept (), socket_accept_in ();
 int get2_cur ();
 static void usage __P((void));
@@ -251,7 +251,7 @@
 #endif /* SIGTSTP */
 #endif /* !NOTFORK */
   read_default ();
-  demon_init ();
+  daemon_init ();
 
   env_init ();
   file_init ();
@@ -298,13 +298,13 @@
 #endif /* SETPGRP_VOID */
 #endif /* !NOTFORK */
 
-  demon_main ();
+  daemon_main ();
 
-  demon_fin ();
+  daemon_fin ();
 }
 
 static void
-demon_main ()
+daemon_main ()
 {
   for (;;)
     {
@@ -493,7 +493,7 @@
 
 /**     サーバをイニシャライズする      **/
 static void
-demon_init ()                   /* initialize Demon */
+daemon_init ()                   /* initialize Daemon */
 {
   signal (SIGHUP, SIG_IGN);
   signal (SIGINT, SIG_IGN);
@@ -526,7 +526,7 @@
 
 /**     サーバを終わる  **/
 void
-demon_fin ()
+daemon_fin ()
 {
   int trueFlag = 1;
   int fd;
diff -ru Xsi.orig/Wnn/jserver/de_header.h Xsi/Wnn/jserver/de_header.h
--- Xsi.orig/Wnn/jserver/de_header.h	Fri Jun 15 03:28:53 2001
+++ Xsi/Wnn/jserver/de_header.h	Fri Jun 29 15:00:32 2001
@@ -29,7 +29,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define DEMON
+#define DAEMON
 
 #include "jslib.h"
 #include "ddefine.h"
@@ -149,7 +149,7 @@
 
 
 /*
-        external variables of demon
+        external variables of daemon
 */
 
 extern char cmd_name[];
@@ -223,7 +223,7 @@
 extern int cmp_hyouka ();
 /* de.c */
 extern void del_client ();
-extern void demon_fin ();
+extern void daemon_fin ();
 extern char *gets_cur __P ((char *buffer, size_t buffer_size));
 extern w_char *getws_cur __P ((w_char * buffer, size_t buffer_size));
 extern int get2_cur ();
diff -ru Xsi.orig/Wnn/jserver/de_vars.c Xsi/Wnn/jserver/de_vars.c
--- Xsi.orig/Wnn/jserver/de_vars.c	Fri Jun 15 03:16:00 2001
+++ Xsi/Wnn/jserver/de_vars.c	Fri Jun 29 14:59:44 2001
@@ -33,7 +33,7 @@
 #include "de_header.h"
 
 /*
-        external global variables of demon
+        external global variables of daemon
 */
 
 char SER_VERSION[] = _SERVER_VERSION;
diff -ru Xsi.orig/Wnn/jserver/error.c Xsi/Wnn/jserver/error.c
--- Xsi.orig/Wnn/jserver/error.c	Mon Jun 18 18:09:42 2001
+++ Xsi/Wnn/jserver/error.c	Fri Jun 29 14:59:41 2001
@@ -139,14 +139,14 @@
 void
 terminate_hand ()
 {
-  demon_fin ();
+  daemon_fin ();
   exit (0);
 }
 
 static void
 exit_hand ()
 {
-  demon_fin ();
+  daemon_fin ();
   exit (250);
 }