X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdaemon.c;h=82d1c9e5c3c5c9667bbb5853d1c205735d3a7e3b;hb=1a3be581e0f5a91de90d62d8cb8b41fd774efec5;hp=a3a6ab12a0c31b9e9ee6096794f4d7176ca90190;hpb=906a9c59f8c77f4002616a34b0b98d91d8b1bbc5;p=yaz-moved-to-github.git

diff --git a/src/daemon.c b/src/daemon.c
index a3a6ab1..82d1c9e 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
- *
- * $Id: daemon.c,v 1.1 2008-02-18 17:07:06 adam Exp $
  */
 
 /**
@@ -17,20 +15,33 @@
 #include <signal.h>
 #include <string.h>
 #include <errno.h>
+#if HAVE_UNISTD_H
 #include <unistd.h>
-#include <assert.h>
+#endif
 #include <stdlib.h>
-#include <signal.h>
+#if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
+
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#include <sys/stat.h>
+#endif
+
 #include <fcntl.h>
+
+#if HAVE_PWD_H
 #include <pwd.h>
+#endif
+
+#if HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
 
 #include <yaz/daemon.h>
 #include <yaz/log.h>
 #include <yaz/snprintf.h>
 
+#if HAVE_PWD_H
 static void write_pidfile(int pid_fd)
 {
     if (pid_fd != -1)
@@ -42,7 +53,7 @@ static void write_pidfile(int pid_fd)
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "ftruncate");
             exit(1);
         }
-        if (write(pid_fd, buf, strlen(buf)) != strlen(buf))
+        if (write(pid_fd, buf, strlen(buf)) != (int) strlen(buf))
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "write");
             exit(1);
@@ -64,12 +75,14 @@ static void keepalive(void (*work)(void *data), void *data)
     int cont = 1;
     void (*old_sighup)(int);
     void (*old_sigterm)(int);
+    void (*old_sigusr1)(int);
     
     /* keep signals in their original state and make sure that some signals
        to parent process also gets sent to the child.. 
     */
     old_sighup = signal(SIGHUP, kill_child_handler);
     old_sigterm = signal(SIGTERM, kill_child_handler);
+    old_sigusr1 = signal(SIGUSR1, kill_child_handler);
     while (cont)
     {
         pid_t p = fork();
@@ -86,6 +99,7 @@ static void keepalive(void (*work)(void *data), void *data)
                 /* child */
             signal(SIGHUP, old_sighup);  /* restore */
             signal(SIGTERM, old_sigterm);/* restore */
+            signal(SIGUSR1, old_sigusr1);/* restore */
             
             work(data);
             exit(0);
@@ -134,26 +148,28 @@ static void keepalive(void (*work)(void *data), void *data)
                 yaz_log(YLOG_WARN, "Received SIG %d from child %ld",
                         WTERMSIG(status), (long) p);
                 cont = 0;
-                }
-            }
-            else if (status == 0)
-                cont = 0; /* child exited normally */
-            else
-            {   /* child exited with error */
-                yaz_log(YLOG_LOG, "Exit %d from child %ld", status, (long) p);
-                cont = 0;
             }
+        }
+        else if (status == 0)
+            cont = 0; /* child exited normally */
+        else
+        {   /* child exited with error */
+            yaz_log(YLOG_LOG, "Exit %d from child %ld", status, (long) p);
+            cont = 0;
+        }
         if (cont) /* respawn slower as we get more errors */
-                sleep(1 + run/5);
+            sleep(1 + run/5);
         run++;
     }
 }
+#endif
 
 int yaz_daemon(const char *progname,
                unsigned int flags,
                void (*work)(void *data), void *data,
                const char *pidfile, const char *uid)
 {
+#if HAVE_PWD_H
     int pid_fd = -1;
 
     /* open pidfile .. defer write until in child and after setuid */
@@ -190,6 +206,13 @@ int yaz_daemon(const char *progname,
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "setuid");
             exit(1);
         }
+        /* Linux don't produce core dumps evern if the limit is right and
+           files are writable.. This fixes this. See prctl(2) */
+#if HAVE_SYS_PRCTL_H
+#ifdef PR_SET_DUMPABLE
+        prctl(PR_SET_DUMPABLE, 1, 0, 0);
+#endif
+#endif
     }
 
     if (flags & YAZ_DAEMON_FORK)
@@ -234,7 +257,10 @@ int yaz_daemon(const char *progname,
         close(1);
         close(2);
         open("/dev/null", O_RDWR);
-        dup(0); dup(0);
+        if (dup(0) == -1)
+            return 1;
+        if (dup(0) == -1)
+            return 1;
         close(hand[1]);
     }
 
@@ -249,12 +275,18 @@ int yaz_daemon(const char *progname,
         work(data);
     }
     return 0;
+#else
+    work(data);
+    return 0;
+#endif
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+