Can specify multiple spam-blocks now.

[~andy/fetchmail] / daemon.c

diff --git a/daemon.c b/daemon.c
index 27449e352b8833ae717a6867c6dc2b16dd8a8ab3..e7b9214bb218270560163f4528573404d4bf0edd 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1,65 +1,87 @@
 /*
- * damemon.c -- turn a process into a daemon under POSIX, SYSV, BSD.
+ * daemon.c -- turn a process into a daemon under POSIX, SYSV, BSD.
  *
  * For license terms, see the file COPYING in this directory.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/file.h>
+#include <errno.h>
 #include <signal.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#else /* !HAVE_FCNTL_H */
+#ifdef HAVE_SYS_FCNTL_H
+#include <sys/fcntl.h>
+#endif /* HAVE_SYS_FCNTL_H */
+#endif /* !HAVE_FCNTL_H */
+#include <sys/stat.h>  /* get umask(2) prototyped */
 
-#if defined(HAVE_SYS_WAIT_H)
-#  include <sys/wait.h>
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
 #endif
 
-#if defined(HAVE_UNISTD_H)
-#  include <unistd.h>
+#if defined(STDC_HEADERS)
+#include <stdlib.h>
 #endif
 
 #if defined(QNX)
-#  include <unix.h>
+#include <unix.h>
+#endif
+
+#if !defined(HAVE_SETSID) && defined(SIGTSTP)
+#if defined(HAVE_TERMIOS_H)
+#  include <termios.h>         /* for TIOCNOTTY under Linux */
+#endif
+
+#if !defined(TIOCNOTTY) && defined(HAVE_SGTTY_H)
+#  include <sgtty.h>           /* for TIOCNOTTY under NEXTSTEP */
 #endif
+#endif /* !defined(HAVE_SETSID) && defined(SIGTSTP) */
 
 /* BSD portability hack */
-#if !defined(SIGCLD) && defined(SIGCHLD)
-#define SIGCLD SIGCHLD
+#if !defined(SIGCHLD) && defined(SIGCLD)
+#define SIGCHLD        SIGCLD
 #endif
 
 #include "fetchmail.h"
+#include "tunable.h"
 
 RETSIGTYPE
-sigchld_handler ()
-/* process SIGCHLD/SIGCLD to obtain the exit code of the terminating process */
+sigchld_handler (int sig)
+/* process SIGCHLD to obtain the exit code of the terminating process */
 {
-  pid_t pid;
+    pid_t pid;
 
-#if defined(HAVE_UNION_WAIT)
-  union wait status;
+#if    defined(HAVE_WAITPID)                           /* the POSIX way */
+    int status;
+
+    while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
+       continue; /* swallow 'em up. */
+#elif  defined(HAVE_WAIT3)                             /* the BSD way */
+#if defined(HAVE_UNION_WAIT) && !defined(__FreeBSD__)
+    union wait status;
 #else
-  int status;
+    int status;
 #endif
 
-#if    defined(HAVE_WAIT3)
-  while ((pid = wait3(&status, WNOHANG, (struct rusage *) 0)) > 0)
-    ; /* swallow 'em up. */
-#elif  defined(HAVE_WAITPID)
-  while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
-    ; /* swallow 'em up. */
+    while ((pid = wait3(&status, WNOHANG, 0)) > 0)
+       continue; /* swallow 'em up. */
 #else  /* Zooks! Nothing to do but wait(), and hope we don't block... */
-  wait(&status);
-#endif
+    int status;
 
+    wait(&status);
+#endif
 }
 
 int
-daemonize (logfile, termhook)
+daemonize (const char *logfile, void (*termhook)(int))
 /* detach from control TTY, become process group leader, catch SIGCHLD */
-const char *logfile;
-void (*termhook)(int);
 {
   int fd;
   pid_t childpid;
@@ -87,7 +109,7 @@ void (*termhook)(int);
      group leader */
 
   if ((childpid = fork()) < 0) {
-    perror("fork");
+    error(0, errno, "fork");
     return(PS_IOERR);
   }
   else if (childpid > 0) 
@@ -100,13 +122,14 @@ void (*termhook)(int);
 #if    defined(HAVE_SETSID)            /* POSIX */
   /* POSIX makes this soooo easy to do */
   if (setsid() < 0) {
-    perror("setsid");
+    error(0, errno, "setsid");
     return(PS_IOERR);
   }
 #elif  defined(SIGTSTP)                /* BSD */
   /* change process group */
+#ifndef __EMX__
   setpgrp(0, getpid());
-
+#endif
   /* lose controlling tty */
   if ((fd = open("/dev/tty", O_RDWR)) >= 0) {
     ioctl(fd, TIOCNOTTY, (char *) 0);
@@ -114,12 +137,14 @@ void (*termhook)(int);
   }
 #else                                  /* SVR3 and older */
   /* change process group */
+#ifndef __EMX__
   setpgrp();
+#endif
   
   /* lose controlling tty */
   signal(SIGHUP, SIG_IGN);
-  if ((childpid = fork) < 0) {
-    perror("fork");
+  if ((childpid = fork()) < 0) {
+    error(0, errno, "fork");
     return(PS_IOERR);
   }
   else if (childpid > 0) {
@@ -143,19 +168,19 @@ nottyDetach:
 
   /* Reopen stdin descriptor on /dev/null */
   if ((fd = open("/dev/null", O_RDWR)) < 0) {   /* stdin */
-    perror("open: /dev/null");
+    error(0, errno, "open: /dev/null");
     return(PS_IOERR);
   }
 
   if (logfile)
-    fd = open(logfile, O_CREAT|O_WRONLY|O_APPEND, 0777);       /* stdout */
+    fd = open(logfile, O_CREAT|O_WRONLY|O_APPEND, 0666);       /* stdout */
   else
     if (dup(fd) < 0) {                         /* stdout */
-      perror("dup");
+      error(0, errno, "dup");
       return(PS_IOERR);
     }
   if (dup(fd) < 0) {                           /* stderr */
-    perror("dup");
+    error(0, errno, "dup");
     return(PS_IOERR);
   }
 
@@ -170,10 +195,12 @@ nottyDetach:
 #endif
 
   /* set up to catch child process termination signals */ 
-  signal(SIGCLD, sigchld_handler); 
+  signal(SIGCHLD, sigchld_handler); 
 #if defined(SIGPWR)
   signal(SIGPWR, sigchld_handler); 
 #endif
+
+  return(0);
 }
 
 /* daemon.c ends here */