]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - scheduler/main.c
Update svn:keyword properties.
[thirdparty/cups.git] / scheduler / main.c
index c34a6b4602fa6b2e68d5ca74aa46116f4748c7e0..5a8da815e5a99ef22127ea7106d69b0c182fc886 100644 (file)
@@ -1,46 +1,39 @@
 /*
- * "$Id: main.c 4997 2006-01-26 21:43:54Z mike $"
+ * "$Id$"
  *
- *   Scheduler main loop for the Common UNIX Printing System (CUPS).
+ *   Main loop for the CUPS scheduler.
  *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *
- *   main()                    - Main entry for the CUPS scheduler.
- *   cupsdClosePipe()          - Close a pipe as necessary.
- *   cupsdOpenPipe()           - Create a pipe which is closed on exec.
- *   cupsdCatchChildSignals()  - Catch SIGCHLD signals...
- *   cupsdHoldSignals()        - Hold child and termination signals.
- *   cupsdIgnoreChildSignals() - Ignore SIGCHLD signals...
- *   cupsdReleaseSignals()     - Release signals for delivery.
- *   cupsdSetString()          - Set a string value.
- *   cupsdSetStringf()         - Set a formatted string value.
- *   parent_handler()          - Catch USR1/CHLD signals...
- *   process_children()        - Process all dead children...
- *   sigchld_handler()         - Handle 'child' signals from old processes.
- *   sighup_handler()          - Handle 'hangup' signals to reconfigure the
- *                               scheduler.
- *   sigterm_handler()         - Handle 'terminate' signals that stop the
- *                               scheduler.
- *   select_timeout()          - Calculate the select timeout value.
- *   usage()                   - Show scheduler usage.
+ *   main()                - Main entry for the CUPS scheduler.
+ *   cupsdAddString()      - Copy and add a string to an array.
+ *   cupsdCheckProcess()   - Tell the main loop to check for dead children.
+ *   cupsdClearString()    - Clear a string.
+ *   cupsdFreeStrings()    - Free an array of strings.
+ *   cupsdHoldSignals()    - Hold child and termination signals.
+ *   cupsdReleaseSignals() - Release signals for delivery.
+ *   cupsdSetString()      - Set a string value.
+ *   cupsdSetStringf()     - Set a formatted string value.
+ *   launchd_checkin()     - Check-in with launchd and collect the listening
+ *                           fds.
+ *   launchd_checkout()    - Update the launchd KeepAlive file as needed.
+ *   parent_handler()      - Catch USR1/CHLD signals...
+ *   process_children()    - Process all dead children...
+ *   select_timeout()      - Calculate the select timeout value.
+ *   sigchld_handler()     - Handle 'child' signals from old processes.
+ *   sighup_handler()      - Handle 'hangup' signals to reconfigure the
+ *                           scheduler.
+ *   sigterm_handler()     - Handle 'terminate' signals that stop the scheduler.
+ *   usage()               - Show scheduler usage.
  */
 
 /*
 #include <syslog.h>
 #include <grp.h>
 
+#ifdef HAVE_LAUNCH_H
+#  include <launch.h>
+#  include <libgen.h>
+#  define CUPS_KEEPALIVE CUPS_CACHEDIR "/org.cups.cupsd"
+                                       /* Name of the launchd KeepAlive file */
+#  ifndef LAUNCH_JOBKEY_KEEPALIVE
+#    define LAUNCH_JOBKEY_KEEPALIVE "KeepAlive"
+#  endif /* !LAUNCH_JOBKEY_KEEPALIVE */
+#  ifndef LAUNCH_JOBKEY_PATHSTATE
+#    define LAUNCH_JOBKEY_PATHSTATE "PathState"
+#  endif /* !LAUNCH_JOBKEY_PATHSTATE */
+#  ifndef LAUNCH_JOBKEY_SERVICEIPC
+#    define LAUNCH_JOBKEY_SERVICEIPC "ServiceIPC"
+#  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
+#endif /* HAVE_LAUNCH_H */
+
 #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
 #  include <malloc.h>
 #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
+
 #ifdef HAVE_NOTIFY_H
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */
 
+#ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+#endif /* HAVE_SYS_PARAM_H */
+
 
 /*
  * Local functions...
  */
 
-static void    parent_handler(int sig);
-static void    process_children(void);
-static void    sigchld_handler(int sig);
-static void    sighup_handler(int sig);
-static void    sigterm_handler(int sig);
-static long    select_timeout(int fds);
-static void    usage(void);
+#ifdef HAVE_LAUNCHD
+static void            launchd_checkin(void);
+static void            launchd_checkout(void);
+#endif /* HAVE_LAUNCHD */
+static void            parent_handler(int sig);
+static void            process_children(void);
+static void            sigchld_handler(int sig);
+static void            sighup_handler(int sig);
+static void            sigterm_handler(int sig);
+static long            select_timeout(int fds);
+static void            usage(int status) __attribute__((noreturn));
 
 
 /*
  * Local globals...
  */
 
-static int     parent_signal = 0;      /* Set to signal number from child */
-static int     holdcount = 0;          /* Number of times "hold" was called */
+static int             parent_signal = 0;
+                                       /* Set to signal number from child */
+static int             holdcount = 0;  /* Number of times "hold" was called */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-static sigset_t        holdmask;               /* Old POSIX signal mask */
+static sigset_t                holdmask;       /* Old POSIX signal mask */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-static int     dead_children = 0;      /* Dead children? */
-static int     stop_scheduler = 0;     /* Should the scheduler stop? */
+static int             dead_children = 0;
+                                       /* Dead children? */
+static int             stop_scheduler = 0;
+                                       /* Should the scheduler stop? */
 
 
 /*
@@ -92,52 +113,84 @@ static int stop_scheduler = 0;     /* Should the scheduler stop? */
  */
 
 int                                    /* O - Exit status */
-main(int  argc,                                /* I - Number of command-line arguments */
+main(int  argc,                                /* I - Number of command-line args */
      char *argv[])                     /* I - Command-line arguments */
 {
   int                  i;              /* Looping var */
   char                 *opt;           /* Option character */
   int                  fg;             /* Run in the foreground */
-  int                  fds;            /* Number of ready descriptors select returns */
-  fd_set               *input,         /* Input set for select() */
-                       *output;        /* Output set for select() */
+  int                  fds;            /* Number of ready descriptors */
   cupsd_client_t       *con;           /* Current client */
   cupsd_job_t          *job;           /* Current job */
   cupsd_listener_t     *lis;           /* Current listener */
   time_t               current_time,   /* Current time */
-                       activity,       /* Activity timer */
-                       browse_time,    /* Next browse send time */
+                       activity,       /* Client activity timer */
                        senddoc_time,   /* Send-Document time */
-                       expire_time;    /* Subscription expire time */
-#ifdef HAVE_MALLINFO
-  time_t               mallinfo_time;  /* Malloc information time */
-#endif /* HAVE_MALLINFO */
-  struct timeval       timeout;        /* select() timeout */
+                       expire_time,    /* Subscription expire time */
+                       report_time,    /* Malloc/client/job report time */
+                       event_time;     /* Last event notification time */
+  long                 timeout;        /* Timeout for cupsdDoSelect() */
   struct rlimit                limit;          /* Runtime limit */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction     action;         /* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-#ifdef __sgi
-  cups_file_t          *fp;            /* Fake lpsched lock file */
-  struct stat          statbuf;        /* Needed for checking lpsched FIFO */
-#endif /* __sgi */
+  int                  run_as_child = 0;
+                                       /* Needed for background fork/exec */
+#ifdef __APPLE__
+  int                  use_sysman = !getuid();
+                                       /* Use system management functions? */
+#else
+  time_t               netif_time = 0; /* Time since last network update */
+#endif /* __APPLE__ */
+#if HAVE_LAUNCHD
+  int                  launchd_idle_exit;
+                                       /* Idle exit on select timeout? */
+#endif /* HAVE_LAUNCHD */
 
 
+#ifdef HAVE_GETEUID
+ /*
+  * Check for setuid invocation, which we do not support!
+  */
+
+  if (getuid() != geteuid())
+  {
+    fputs("cupsd: Cannot run as a setuid program\n", stderr);
+    return (1);
+  }
+#endif /* HAVE_GETEUID */
+
  /*
   * Check for command-line arguments...
   */
 
   fg = 0;
 
+#ifdef HAVE_LAUNCHD
+  if (getenv("CUPSD_LAUNCHD"))
+  {
+    Launchd = 1;
+    fg      = 1;
+  }
+#endif /* HAVE_LAUNCHD */
+
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '-')
       for (opt = argv[i] + 1; *opt != '\0'; opt ++)
         switch (*opt)
        {
+         case 'C' : /* Run as child with config file */
+              run_as_child = 1;
+             fg           = -1;
+
          case 'c' : /* Configuration file */
              i ++;
              if (i >= argc)
-               usage();
+             {
+               _cupsLangPuts(stderr, _("cupsd: Expected config filename "
+                                       "after \"-c\" option."));
+               usage(1);
+             }
 
               if (argv[i][0] == '/')
              {
@@ -153,11 +206,32 @@ main(int  argc,                           /* I - Number of command-line arguments */
                * Relative directory...
                */
 
-                char current[1024];    /* Current directory */
+                char *current;         /* Current directory */
 
+              /*
+               * Allocate a buffer for the current working directory to
+               * reduce run-time stack usage; this approximates the
+               * behavior of some implementations of getcwd() when they
+               * are passed a NULL pointer.
+               */
+
+                if ((current = malloc(1024)) == NULL)
+               {
+                 _cupsLangPuts(stderr,
+                               _("cupsd: Unable to get current directory."));
+                  return (1);
+               }
+
+               if (!getcwd(current, 1024))
+               {
+                 _cupsLangPuts(stderr,
+                               _("cupsd: Unable to get current directory."));
+                  free(current);
+                 return (1);
+               }
 
-                getcwd(current, sizeof(current));
                cupsdSetStringf(&ConfigurationFile, "%s/%s", current, argv[i]);
+               free(current);
               }
              break;
 
@@ -165,25 +239,119 @@ main(int  argc,                          /* I - Number of command-line arguments */
              fg = 1;
              break;
 
-          case 'F' : /* Run in foreground, but still disconnect from terminal... */
+          case 'F' : /* Run in foreground, but disconnect from terminal... */
              fg = -1;
              break;
 
+          case 'h' : /* Show usage/help */
+             usage(0);
+             break;
+
+          case 'l' : /* Started by launchd... */
+#ifdef HAVE_LAUNCHD
+             Launchd = 1;
+             fg      = 1;
+#else
+             _cupsLangPuts(stderr, _("cupsd: launchd(8) support not compiled "
+                                     "in, running in normal mode."));
+              fg = 0;
+#endif /* HAVE_LAUNCHD */
+             break;
+
+          case 'p' : /* Stop immediately for profiling */
+              fputs("cupsd: -p (startup profiling) is for internal testing "
+                    "use only!\n", stderr);
+             stop_scheduler = 1;
+             fg             = 1;
+             break;
+
+          case 'P' : /* Disable security profiles */
+              fputs("cupsd: -P (disable security profiles) is for internal "
+                    "testing use only!\n", stderr);
+             UseProfiles = 0;
+             break;
+
+          case 's' : /* Set cups-files.conf location */
+              i ++;
+             if (i >= argc)
+             {
+               _cupsLangPuts(stderr, _("cupsd: Expected cups-files.conf "
+                                       "filename after \"-s\" option."));
+               usage(1);
+             }
+
+              if (argv[i][0] != '/')
+             {
+              /*
+               * Relative filename not allowed...
+               */
+
+               _cupsLangPuts(stderr, _("cupsd: Relative cups-files.conf "
+                                       "filename not allowed."));
+               usage(1);
+              }
+
+             cupsdSetString(&CupsFilesFile, argv[i]);
+             break;
+
+#ifdef __APPLE__
+          case 'S' : /* Disable system management functions */
+              fputs("cupsd: -S (disable system management) for internal "
+                    "testing use only!\n", stderr);
+             use_sysman = 0;
+             break;
+#endif /* __APPLE__ */
+
+          case 't' : /* Test the cupsd.conf file... */
+             TestConfigFile = 1;
+             fg             = 1;
+             break;
+
          default : /* Unknown option */
-              fprintf(stderr, "cupsd: Unknown option \'%c\' - aborting!\n",
-                     *opt);
-             usage();
+              _cupsLangPrintf(stderr, _("cupsd: Unknown option \"%c\" - "
+                                       "aborting."), *opt);
+             usage(1);
              break;
        }
     else
     {
-      fprintf(stderr, "cupsd: Unknown argument \'%s\' - aborting!\n", argv[i]);
-      usage();
+      _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting."),
+                      argv[i]);
+      usage(1);
     }
 
   if (!ConfigurationFile)
     cupsdSetString(&ConfigurationFile, CUPS_SERVERROOT "/cupsd.conf");
 
+  if (!CupsFilesFile)
+  {
+    char       *filename,              /* Copy of cupsd.conf filename */
+               *slash;                 /* Final slash in cupsd.conf filename */
+    size_t     len;                    /* Size of buffer */
+
+    len = strlen(ConfigurationFile) + 15;
+    if ((filename = malloc(len)) == NULL)
+    {
+      _cupsLangPrintf(stderr,
+                     _("cupsd: Unable to get path to "
+                       "cups-files.conf file."));
+      return (1);
+    }
+
+    strlcpy(filename, ConfigurationFile, len);
+    if ((slash = strrchr(filename, '/')) == NULL)
+    {
+      _cupsLangPrintf(stderr,
+                     _("cupsd: Unable to get path to "
+                       "cups-files.conf file."));
+      return (1);
+    }
+
+    strlcpy(slash, "/cups-files.conf", len - (slash - filename));
+    cupsdSetString(&CupsFilesFile, filename);
+    free(filename);
+  }
+
  /*
   * If the user hasn't specified "-f", run in the background...
   */
@@ -238,15 +406,38 @@ main(int  argc,                           /* I - Number of command-line arguments */
       }
       else if (WIFEXITED(i))
       {
-        fprintf(stderr, "cupsd: Child exited with status %d!\n", WEXITSTATUS(i));
+        fprintf(stderr, "cupsd: Child exited with status %d\n",
+               WEXITSTATUS(i));
        return (2);
       }
       else
       {
-        fprintf(stderr, "cupsd: Child exited on signal %d!\n", WTERMSIG(i));
+        fprintf(stderr, "cupsd: Child exited on signal %d\n", WTERMSIG(i));
        return (3);
       }
     }
+
+#if defined(__OpenBSD__) && OpenBSD < 201211
+   /*
+    * Call _thread_sys_closefrom() so the child process doesn't reset the
+    * parent's file descriptors to be blocking.  This is a workaround for a
+    * limitation of userland libpthread on older versions of OpenBSD.
+    */
+
+    _thread_sys_closefrom(0);
+#endif /* __OpenBSD__ && OpenBSD < 201211 */
+
+   /*
+    * Since CoreFoundation and DBUS both create fork-unsafe data on execution of
+    * a program, and since this kind of really unfriendly behavior seems to be
+    * more common these days in system libraries, we need to re-execute the
+    * background cupsd with the "-C" option to avoid problems.  Unfortunately,
+    * we also have to assume that argv[0] contains the name of the cupsd
+    * executable - there is no portable way to get the real pathname...
+    */
+
+    execlp(argv[0], argv[0], "-C", ConfigurationFile, (char *)0);
+    exit(errno);
   }
 
   if (fg < 1)
@@ -278,8 +469,30 @@ main(int  argc,                            /* I - Number of command-line arguments */
 
     getrlimit(RLIMIT_NOFILE, &limit);
 
-    for (i = 0; i < limit.rlim_cur; i ++)
+    for (i = 0; i < limit.rlim_cur && i < 1024; i ++)
+      close(i);
+
+   /*
+    * Redirect stdin/out/err to /dev/null...
+    */
+
+    if ((i = open("/dev/null", O_RDONLY)) != 0)
+    {
+      dup2(i, 0);
+      close(i);
+    }
+
+    if ((i = open("/dev/null", O_WRONLY)) != 1)
+    {
+      dup2(i, 1);
+      close(i);
+    }
+
+    if ((i = open("/dev/null", O_WRONLY)) != 2)
+    {
+      dup2(i, 2);
       close(i);
+    }
 #endif /* DEBUG */
   }
 
@@ -299,68 +512,87 @@ main(int  argc,                           /* I - Number of command-line arguments */
 
   getrlimit(RLIMIT_NOFILE, &limit);
 
-  if (limit.rlim_max > CUPS_MAX_FDS)
-    MaxFDs = CUPS_MAX_FDS;
+#if !defined(HAVE_POLL) && !defined(HAVE_EPOLL) && !defined(HAVE_KQUEUE)
+  if (limit.rlim_max > FD_SETSIZE)
+    MaxFDs = FD_SETSIZE;
   else
+#endif /* !HAVE_POLL && !HAVE_EPOLL && !HAVE_KQUEUE */
+#ifdef RLIM_INFINITY
+  if (limit.rlim_max == RLIM_INFINITY)
+    MaxFDs = 16384;
+  else
+#endif /* RLIM_INFINITY */
     MaxFDs = limit.rlim_max;
 
   limit.rlim_cur = MaxFDs;
 
   setrlimit(RLIMIT_NOFILE, &limit);
 
+  cupsdStartSelect();
+
  /*
-  * Allocate memory for the input and output sets...
+  * Read configuration...
   */
 
-  SetSize = (MaxFDs + 31) / 8 + 4;
-  if (SetSize < sizeof(fd_set))
-    SetSize = sizeof(fd_set);
-
-  InputSet  = (fd_set *)calloc(1, SetSize);
-  OutputSet = (fd_set *)calloc(1, SetSize);
-  input     = (fd_set *)calloc(1, SetSize);
-  output    = (fd_set *)calloc(1, SetSize);
-
-  if (InputSet == NULL || OutputSet == NULL || input == NULL || output == NULL)
-  {
-    syslog(LOG_LPR, "Unable to allocate memory for select() sets - exiting!");
+  if (!cupsdReadConfiguration())
     return (1);
+  else if (TestConfigFile)
+  {
+    printf("\"%s\" is OK.\n", CupsFilesFile);
+    printf("\"%s\" is OK.\n", ConfigurationFile);
+    return (0);
   }
 
  /*
-  * Read configuration...
+  * Clean out old temp files and printer cache data.
   */
 
-  if (!cupsdReadConfiguration())
+  if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
+    cupsdCleanFiles(TempDir, NULL);
+
+  cupsdCleanFiles(CacheDir, "*.ipp");
+
+#if HAVE_LAUNCHD
+  if (Launchd)
   {
-    syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
-           ConfigurationFile);
-    return (1);
+   /*
+    * If we were started by launchd get the listen sockets file descriptors...
+    */
+
+    launchd_checkin();
+    launchd_checkout();
   }
+#endif /* HAVE_LAUNCHD */
+
+ /*
+  * Startup the server...
+  */
+
+  httpInitialize();
+
+  cupsdStartServer();
 
  /*
   * Catch hangup and child signals and ignore broken pipes...
   */
 
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  if (RunAsUser)
-    sigset(SIGHUP, sigterm_handler);
-  else
-    sigset(SIGHUP, sighup_handler);
-
+  sigset(SIGCHLD, sigchld_handler);
+  sigset(SIGHUP, sighup_handler);
   sigset(SIGPIPE, SIG_IGN);
   sigset(SIGTERM, sigterm_handler);
 #elif defined(HAVE_SIGACTION)
   memset(&action, 0, sizeof(action));
 
   sigemptyset(&action.sa_mask);
-  sigaddset(&action.sa_mask, SIGHUP);
-
-  if (RunAsUser)
-    action.sa_handler = sigterm_handler;
-  else
-    action.sa_handler = sighup_handler;
+  sigaddset(&action.sa_mask, SIGTERM);
+  sigaddset(&action.sa_mask, SIGCHLD);
+  action.sa_handler = sigchld_handler;
+  sigaction(SIGCHLD, &action, NULL);
 
+  sigemptyset(&action.sa_mask);
+  sigaddset(&action.sa_mask, SIGHUP);
+  action.sa_handler = sighup_handler;
   sigaction(SIGHUP, &action, NULL);
 
   sigemptyset(&action.sa_mask);
@@ -373,37 +605,12 @@ main(int  argc,                           /* I - Number of command-line arguments */
   action.sa_handler = sigterm_handler;
   sigaction(SIGTERM, &action, NULL);
 #else
-  if (RunAsUser)
-    signal(SIGHUP, sigterm_handler);
-  else
-    signal(SIGHUP, sighup_handler);
-
+  signal(SIGCLD, sigchld_handler);     /* No, SIGCLD isn't a typo... */
+  signal(SIGHUP, sighup_handler);
   signal(SIGPIPE, SIG_IGN);
   signal(SIGTERM, sigterm_handler);
 #endif /* HAVE_SIGSET */
 
-#ifdef __sgi
- /*
-  * Try to create a fake lpsched lock file if one is not already there.
-  * Some Adobe applications need it under IRIX in order to enable
-  * printing...
-  */
-
-  if ((fp = cupsFileOpen("/var/spool/lp/SCHEDLOCK", "w")) == NULL)
-  {
-    syslog(LOG_LPR, "Unable to create fake lpsched lock file "
-                    "\"/var/spool/lp/SCHEDLOCK\"\' - %s!",
-           strerror(errno));
-  }
-  else
-  {
-    fchmod(cupsFileNumber(fp), 0644);
-    fchown(cupsFileNumber(fp), User, Group);
-
-    cupsFileClose(fp);
-  }
-#endif /* __sgi */
-
  /*
   * Initialize authentication certificates...
   */
@@ -415,7 +622,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
   * we are up and running...
   */
 
-  if (!fg)
+  if (!fg || run_as_child)
   {
    /*
     * Send a signal to the parent process, but only if the parent is
@@ -429,23 +636,31 @@ main(int  argc,                           /* I - Number of command-line arguments */
       kill(i, SIGUSR1);
   }
 
+#ifdef __APPLE__
  /*
-  * If the administrator has configured the server to run as an unpriviledged
-  * user, change to that user now...
+  * Start power management framework...
   */
 
-  if (RunAsUser)
-  {
-    setgid(Group);
-    setgroups(1, &Group);
-    setuid(User);
-  }
+  if (use_sysman)
+    cupsdStartSystemMonitor();
+#endif /* __APPLE__ */
 
  /*
-  * Catch signals...
+  * Send server-started event...
   */
 
-  cupsdCatchChildSignals();
+#ifdef HAVE_LAUNCHD
+  if (Launchd)
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+                  "Scheduler started via launchd.");
+  else
+#endif /* HAVE_LAUNCHD */
+  if (fg)
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+                  "Scheduler started in foreground.");
+  else
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+                  "Scheduler started in background.");
 
  /*
   * Start any pending print jobs...
@@ -457,22 +672,15 @@ main(int  argc,                           /* I - Number of command-line arguments */
   * Loop forever...
   */
 
-#ifdef HAVE_MALLINFO
-  mallinfo_time = 0;
-#endif /* HAVE_MALLINFO */
-  browse_time   = time(NULL);
-  senddoc_time  = time(NULL);
-  expire_time   = time(NULL);
+  current_time  = time(NULL);
+  event_time    = current_time;
+  expire_time   = current_time;
   fds           = 1;
+  report_time   = 0;
+  senddoc_time  = current_time;
 
   while (!stop_scheduler)
   {
-#ifdef DEBUG
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "main: Top of loop, dead_children=%d, NeedReload=%d",
-                    dead_children, NeedReload);
-#endif /* DEBUG */
-
    /*
     * Check if there are dead children to handle...
     */
@@ -490,127 +698,147 @@ main(int  argc,                         /* I - Number of command-line arguments */
       * Close any idle clients...
       */
 
-      if (NumClients > 0)
+      if (cupsArrayCount(Clients) > 0)
       {
-        for (i = NumClients, con = Clients; i > 0; i --, con ++)
+       for (con = (cupsd_client_t *)cupsArrayFirst(Clients);
+            con;
+            con = (cupsd_client_t *)cupsArrayNext(Clients))
          if (con->http.state == HTTP_WAITING)
-         {
            cupsdCloseClient(con);
-           con --;
-         }
          else
            con->http.keep_alive = HTTP_KEEPALIVE_OFF;
 
         cupsdPauseListening();
       }
 
-     /*
-      * Check for any active jobs...
-      */
-
-      for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
-          job;
-          job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
-        if (job->state->values[0].integer == IPP_JOB_PROCESSING)
-         break;
-
      /*
       * Restart if all clients are closed and all jobs finished, or
       * if the reload timeout has elapsed...
       */
 
-      if ((NumClients == 0 && (!job || NeedReload != RELOAD_ALL)) ||
+      if ((cupsArrayCount(Clients) == 0 &&
+           (cupsArrayCount(PrintingJobs) == 0 || NeedReload != RELOAD_ALL)) ||
           (time(NULL) - ReloadTime) >= ReloadTimeout)
       {
+       /*
+       * Shutdown the server...
+       */
+
+        DoingShutdown = 1;
+
+       cupsdStopServer();
+
+       /*
+       * Read configuration...
+       */
+
         if (!cupsdReadConfiguration())
         {
           syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
                 ConfigurationFile);
           break;
        }
+
+#if HAVE_LAUNCHD
+       if (Launchd)
+       {
+        /*
+         * If we were started by launchd, get the listen socket file
+         * descriptors...
+         */
+
+         launchd_checkin();
+         launchd_checkout();
+       }
+#endif /* HAVE_LAUNCHD */
+
+       /*
+        * Startup the server...
+        */
+
+        DoingShutdown = 0;
+
+        cupsdStartServer();
+
+       /*
+        * Send a server-restarted event...
+       */
+
+        cupsdAddEvent(CUPSD_EVENT_SERVER_RESTARTED, NULL, NULL,
+                      "Scheduler restarted.");
       }
     }
 
    /*
-    * Check for available input or ready output.  If select() returns
-    * 0 or -1, something bad happened and we should exit immediately.
+    * Check for available input or ready output.  If cupsdDoSelect()
+    * returns 0 or -1, something bad happened and we should exit
+    * immediately.
     *
     * Note that we at least have one listening socket open at all
     * times.
     */
 
-    memcpy(input, InputSet, SetSize);
-    memcpy(output, OutputSet, SetSize);
+    if ((timeout = select_timeout(fds)) > 1 && LastEvent)
+      timeout = 1;
 
-    timeout.tv_sec  = select_timeout(fds);
-    timeout.tv_usec = 0;
+#if HAVE_LAUNCHD
+   /*
+    * If no other work is scheduled and we're being controlled by
+    * launchd then timeout after 'LaunchdTimeout' seconds of
+    * inactivity...
+    */
 
-    if (timeout.tv_sec < 86400)                /* Only use timeout for < 1 day */
-      fds = select(MaxFDs, input, output, NULL, &timeout);
+    if (timeout == 86400 && Launchd && LaunchdTimeout &&
+        !cupsArrayCount(ActiveJobs) &&
+       (!Browsing || !BrowseLocalProtocols || !cupsArrayCount(Printers)))
+    {
+      timeout          = LaunchdTimeout;
+      launchd_idle_exit = 1;
+    }
     else
-      fds = select(MaxFDs, input, output, NULL, NULL);
+      launchd_idle_exit = 0;
+#endif /* HAVE_LAUNCHD */
 
-    if (fds < 0)
+    if ((fds = cupsdDoSelect(timeout)) < 0)
     {
-      char     s[16384],               /* String buffer */
-               *sptr;                  /* Pointer into buffer */
-      int      slen;                   /* Length of string buffer */
-
-
      /*
       * Got an error from select!
       */
 
-      if (errno == EINTR)      /* Just interrupted by a signal */
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+      cupsd_printer_t  *p;             /* Current printer */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+
+      if (errno == EINTR)              /* Just interrupted by a signal */
         continue;
 
      /*
       * Log all sorts of debug info to help track down the problem.
       */
 
-      cupsdLogMessage(CUPSD_LOG_EMERG, "select() failed - %s!",
+      cupsdLogMessage(CUPSD_LOG_EMERG, "cupsdDoSelect() failed - %s!",
                       strerror(errno));
 
-      strcpy(s, "InputSet =");
-      slen = 10;
-      sptr = s + 10;
-
-      for (i = 0; i < MaxFDs; i ++)
-        if (FD_ISSET(i, InputSet))
-       {
-          snprintf(sptr, sizeof(s) - slen, " %d", i);
-         slen += strlen(sptr);
-         sptr += strlen(sptr);
-       }
-
-      cupsdLogMessage(CUPSD_LOG_EMERG, s);
-
-      strcpy(s, "OutputSet =");
-      slen = 11;
-      sptr = s + 11;
-
-      for (i = 0; i < MaxFDs; i ++)
-        if (FD_ISSET(i, OutputSet))
-       {
-          snprintf(sptr, sizeof(s) - slen, " %d", i);
-         slen += strlen(sptr);
-         sptr += strlen(sptr);
-       }
-
-      cupsdLogMessage(CUPSD_LOG_EMERG, s);
-
-      for (i = 0, con = Clients; i < NumClients; i ++, con ++)
+      for (i = 0, con = (cupsd_client_t *)cupsArrayFirst(Clients);
+          con;
+          i ++, con = (cupsd_client_t *)cupsArrayNext(Clients))
         cupsdLogMessage(CUPSD_LOG_EMERG,
                        "Clients[%d] = %d, file = %d, state = %d",
                        i, con->http.fd, con->file, con->http.state);
 
-      for (i = 0, lis = Listeners; i < NumListeners; i ++, lis ++)
+      for (i = 0, lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
+           lis;
+          i ++, lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
         cupsdLogMessage(CUPSD_LOG_EMERG, "Listeners[%d] = %d", i, lis->fd);
 
-      cupsdLogMessage(CUPSD_LOG_EMERG, "BrowseSocket = %d", BrowseSocket);
-
       cupsdLogMessage(CUPSD_LOG_EMERG, "CGIPipes[0] = %d", CGIPipes[0]);
 
+#ifdef __APPLE__
+      cupsdLogMessage(CUPSD_LOG_EMERG, "SysEventPipes[0] = %d",
+                      SysEventPipes[0]);
+#endif /* __APPLE__ */
+
       for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
           job;
           job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
@@ -619,158 +847,125 @@ main(int  argc,                         /* I - Number of command-line arguments */
                        job->status_buffer ? job->status_buffer->fd : -1,
                        job->print_pipes[0], job->print_pipes[1],
                        job->back_pipes[0], job->back_pipes[1]);
+
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+      for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+          p;
+          p = (cupsd_printer_t *)cupsArrayNext(Printers))
+        cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
+                       p->reg_name ? p->reg_name : "(null)");
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
       break;
     }
 
     current_time = time(NULL);
 
    /*
-    * Check for status info from job filters...
+    * Write dirty config/state files...
     */
 
-    for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
-        job;
-        job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
-      if (job->status_buffer && FD_ISSET(job->status_buffer->fd, input))
-      {
-       /*
-        * Clear the input bit to avoid updating the next job
-       * using the same status pipe file descriptor...
-       */
-
-        FD_CLR(job->status_buffer->fd, input);
-
-       /*
-        * Read any status messages from the filters...
-       */
-
-        cupsdUpdateJob(job);
-      }
+    if (DirtyCleanTime && current_time >= DirtyCleanTime)
+      cupsdCleanDirty();
 
+#ifdef __APPLE__
    /*
-    * Update CGI messages as needed...
+    * If we are going to sleep and still have pending jobs, stop them after
+    * a period of time...
     */
 
-    if (CGIPipes[0] >= 0 && FD_ISSET(CGIPipes[0], input))
-      cupsdUpdateCGI();
+    if (SleepJobs > 0 && current_time >= SleepJobs &&
+        cupsArrayCount(PrintingJobs) > 0)
+    {
+      SleepJobs = 0;
+      cupsdStopAllJobs(CUPSD_JOB_DEFAULT, 5);
+    }
+#endif /* __APPLE__ */
 
+#ifndef __APPLE__
    /*
-    * Update notifier messages as needed...
+    * Update the network interfaces once a minute...
     */
 
-    if (NotifierPipes[0] >= 0 && FD_ISSET(NotifierPipes[0], input))
-      cupsdUpdateNotifierStatus();
+    if ((current_time - netif_time) >= 60)
+    {
+      netif_time  = current_time;
+      NetIFUpdate = 1;
+    }
+#endif /* !__APPLE__ */
 
+#if HAVE_LAUNCHD
    /*
-    * Expire subscriptions as needed...
+    * If no other work was scheduled and we're being controlled by launchd
+    * then timeout after 'LaunchdTimeout' seconds of inactivity...
     */
 
-    if (cupsArrayCount(Subscriptions) > 0 && current_time > expire_time)
+    if (!fds && launchd_idle_exit)
     {
-      cupsdExpireSubscriptions(NULL, NULL);
-
-      expire_time = current_time;
+      cupsdLogMessage(CUPSD_LOG_INFO,
+                      "Printer sharing is off and there are no jobs pending, "
+                     "will restart on demand.");
+      stop_scheduler = 1;
+      break;
     }
+#endif /* HAVE_LAUNCHD */
 
    /*
-    * Update the browse list as needed...
+    * Resume listening for new connections as needed...
     */
 
-    if (Browsing && BrowseRemoteProtocols)
-    {
-      if (BrowseSocket >= 0 && FD_ISSET(BrowseSocket, input))
-        cupsdUpdateCUPSBrowse();
-
-      if (PollPipe >= 0 && FD_ISSET(PollPipe, input))
-        cupsdUpdatePolling();
+    if (ListeningPaused && ListeningPaused <= current_time &&
+        cupsArrayCount(Clients) < MaxClients)
+      cupsdResumeListening();
 
-#ifdef HAVE_LIBSLP
-      if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
-          BrowseSLPRefresh <= current_time)
-        cupsdUpdateSLPBrowse();
-#endif /* HAVE_LIBSLP */
-    }
+   /*
+    * Expire subscriptions and unload completed jobs as needed...
+    */
 
-    if (Browsing && BrowseLocalProtocols && current_time > browse_time)
+    if (current_time > expire_time)
     {
-      cupsdSendBrowseList();
-      browse_time = current_time;
-    }
+      if (cupsArrayCount(Subscriptions) > 0)
+        cupsdExpireSubscriptions(NULL, NULL);
 
-   /*
-    * Check for new connections on the "listen" sockets...
-    */
+      cupsdUnloadCompletedJobs();
 
-    for (i = NumListeners, lis = Listeners; i > 0; i --, lis ++)
-      if (lis->fd >= 0 && FD_ISSET(lis->fd, input))
-      {
-        FD_CLR(lis->fd, input);
-        cupsdAcceptClient(lis);
-      }
+      expire_time = current_time;
+    }
 
+#ifndef HAVE_AUTHORIZATION_H
    /*
-    * Check for new data on the client sockets...
+    * Update the root certificate once every 5 minutes if we have client
+    * connections...
     */
 
-    for (i = NumClients, con = Clients; i > 0; i --, con ++)
+    if ((current_time - RootCertTime) >= RootCertDuration && RootCertDuration &&
+        !RunUser && cupsArrayCount(Clients))
     {
      /*
-      * Process the input buffer...
+      * Update the root certificate...
       */
 
-      if (FD_ISSET(con->http.fd, input) || con->http.used)
-      {
-        FD_CLR(con->http.fd, input);
-
-        if (!cupsdReadClient(con))
-       {
-         if (con->pipe_pid)
-           FD_CLR(con->file, input);
+      cupsdDeleteCert(0);
+      cupsdAddCert(0, "root", cupsdDefaultAuthType());
+    }
+#endif /* !HAVE_AUTHORIZATION_H */
 
-         con --;
-         continue;
-       }
-      }
+   /*
+    * Check for new data on the client sockets...
+    */
 
+    for (con = (cupsd_client_t *)cupsArrayFirst(Clients);
+        con;
+        con = (cupsd_client_t *)cupsArrayNext(Clients))
+    {
      /*
-      * Write data as needed...
+      * Process pending data in the input buffer...
       */
 
-      if (con->pipe_pid && FD_ISSET(con->file, input))
-      {
-       /*
-        * Keep track of pending input from the file/pipe separately
-       * so that we don't needlessly spin on select() when the web
-       * client is not ready to receive data...
-       */
-
-       FD_CLR(con->file, input);
-        con->file_ready = 1;
-
-#ifdef DEBUG
-        cupsdLogMessage(CUPSD_LOG_DEBUG2, "main: Data ready file %d!",
-                       con->file);
-#endif /* DEBUG */
-
-       if (!FD_ISSET(con->http.fd, output))
-       {
-         cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                         "main: Removing fd %d from InputSet...", con->file);
-         FD_CLR(con->file, input);
-         FD_CLR(con->file, InputSet);
-       }
-      }
-
-      if (FD_ISSET(con->http.fd, output))
+      if (con->http.used)
       {
-        FD_CLR(con->http.fd, output);
-
-       if (!con->pipe_pid || con->file_ready)
-          if (!cupsdWriteClient(con))
-         {
-           con --;
-           continue;
-         }
+        cupsdReadClient(con);
+       continue;
       }
 
      /*
@@ -785,7 +980,6 @@ main(int  argc,                             /* I - Number of command-line arguments */
                        con->http.fd, Timeout);
 
         cupsdCloseClient(con);
-        con --;
         continue;
       }
     }
@@ -800,38 +994,55 @@ main(int  argc,                           /* I - Number of command-line arguments */
       senddoc_time = current_time;
     }
 
-#ifdef HAVE_MALLINFO
    /*
-    * Log memory usage every minute...
+    * Clean job history...
     */
 
-    if ((current_time - mallinfo_time) >= 60 && LogLevel >= CUPSD_LOG_DEBUG)
+    if (JobHistoryUpdate && current_time >= JobHistoryUpdate)
+      cupsdCleanJobs();
+
+   /*
+    * Log statistics at most once a minute when in debug mode...
+    */
+
+    if ((current_time - report_time) >= 60 && LogLevel >= CUPSD_LOG_DEBUG)
     {
-      struct mallinfo mem;             /* Malloc information */
+      size_t           string_count,   /* String count */
+                       alloc_bytes,    /* Allocated string bytes */
+                       total_bytes;    /* Total string bytes */
+#ifdef HAVE_MALLINFO
+      struct mallinfo  mem;            /* Malloc information */
 
 
       mem = mallinfo();
-      cupsdLogMessage(CUPSD_LOG_DEBUG,
-                      "mallinfo: arena = %d, used = %d, free = %d\n",
-                      mem.arena, mem.usmblks + mem.uordblks,
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-arena=%lu", mem.arena);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-used=%lu",
+                      mem.usmblks + mem.uordblks);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-free=%lu",
                      mem.fsmblks + mem.fordblks);
-      mallinfo_time = current_time;
-    }
 #endif /* HAVE_MALLINFO */
 
-   /*
-    * Update the root certificate once every 5 minutes...
-    */
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: clients=%d",
+                      cupsArrayCount(Clients));
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: jobs=%d",
+                      cupsArrayCount(Jobs));
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: jobs-active=%d",
+                      cupsArrayCount(ActiveJobs));
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: printers=%d",
+                      cupsArrayCount(Printers));
 
-    if ((current_time - RootCertTime) >= RootCertDuration && RootCertDuration &&
-        !RunUser)
-    {
-     /*
-      * Update the root certificate...
-      */
+      string_count = _cupsStrStatistics(&alloc_bytes, &total_bytes);
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                      "Report: stringpool-string-count=" CUPS_LLFMT,
+                     CUPS_LLCAST string_count);
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                      "Report: stringpool-alloc-bytes=" CUPS_LLFMT,
+                     CUPS_LLCAST alloc_bytes);
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                      "Report: stringpool-total-bytes=" CUPS_LLFMT,
+                     CUPS_LLCAST total_bytes);
 
-      cupsdDeleteCert(0);
-      cupsdAddCert(0, "root");
+      report_time = current_time;
     }
 
    /*
@@ -839,19 +1050,21 @@ main(int  argc,                          /* I - Number of command-line arguments */
     * accumulated.  Don't send these more than once a second...
     */
 
-    if (LastEvent && (time(NULL) - LastEventTime) > 1)
+    if (LastEvent && (current_time - event_time) >= 1)
     {
 #ifdef HAVE_NOTIFY_POST
-      if (LastEvent & CUPSD_EVENT_PRINTER_CHANGED)
+      if (LastEvent & (CUPSD_EVENT_PRINTER_ADDED |
+                       CUPSD_EVENT_PRINTER_DELETED |
+                       CUPSD_EVENT_PRINTER_MODIFIED))
       {
-        cupsdLogMessage(CUPSD_LOG_DEBUG,
+        cupsdLogMessage(CUPSD_LOG_DEBUG2,
                        "notify_post(\"com.apple.printerListChange\")");
        notify_post("com.apple.printerListChange");
       }
 
       if (LastEvent & CUPSD_EVENT_PRINTER_STATE_CHANGED)
       {
-        cupsdLogMessage(CUPSD_LOG_DEBUG,
+        cupsdLogMessage(CUPSD_LOG_DEBUG2,
                        "notify_post(\"com.apple.printerHistoryChange\")");
        notify_post("com.apple.printerHistoryChange");
       }
@@ -860,18 +1073,18 @@ main(int  argc,                          /* I - Number of command-line arguments */
                        CUPSD_EVENT_JOB_CONFIG_CHANGED |
                        CUPSD_EVENT_JOB_PROGRESS))
       {
-        cupsdLogMessage(CUPSD_LOG_DEBUG,
+        cupsdLogMessage(CUPSD_LOG_DEBUG2,
                        "notify_post(\"com.apple.jobChange\")");
        notify_post("com.apple.jobChange");
       }
 #endif /* HAVE_NOTIFY_POST */
 
      /*
-      * Reset the accumulated events and notification time...
+      * Reset the accumulated events...
       */
 
-      LastEventTime = time(NULL);
-      LastEvent     = CUPSD_EVENT_NONE;
+      LastEvent  = CUPSD_EVENT_NONE;
+      event_time = current_time;
     }
   }
 
@@ -880,148 +1093,116 @@ main(int  argc,                                /* I - Number of command-line arguments */
   */
 
   if (stop_scheduler)
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Scheduler shutting down normally.");
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STOPPED, NULL, NULL,
+                  "Scheduler shutting down normally.");
+  }
   else
+  {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "Scheduler shutting down due to program error.");
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STOPPED, NULL, NULL,
+                  "Scheduler shutting down due to program error.");
+  }
 
  /*
-  * Close all network clients and stop all jobs...
+  * Close all network clients...
   */
 
+  DoingShutdown = 1;
+
   cupsdStopServer();
 
-  cupsdStopAllJobs();
+#ifdef HAVE_LAUNCHD
+ /*
+  * Update the launchd KeepAlive file as needed...
+  */
+
+  if (Launchd)
+    launchd_checkout();
+#endif /* HAVE_LAUNCHD */
 
-#ifdef __sgi
  /*
-  * Remove the fake IRIX lpsched lock file, but only if the existing
-  * file is not a FIFO which indicates that the real IRIX lpsched is
-  * running...
+  * Stop all jobs...
   */
 
-  if (!stat("/var/spool/lp/FIFO", &statbuf))
-    if (!S_ISFIFO(statbuf.st_mode))
-      unlink("/var/spool/lp/SCHEDLOCK");
-#endif /* __sgi */
+  cupsdFreeAllJobs();
 
+#ifdef __APPLE__
  /*
-  * Free memory used by FD sets and return...
+  * Stop monitoring system event monitoring...
   */
 
-  free(InputSet);
-  free(OutputSet);
-  free(input);
-  free(output);
+  if (use_sysman)
+    cupsdStopSystemMonitor();
+#endif /* __APPLE__ */
+
+  cupsdStopSelect();
 
   return (!stop_scheduler);
 }
 
 
 /*
- * 'cupsdClosePipe()' - Close a pipe as necessary.
+ * 'cupsdAddString()' - Copy and add a string to an array.
  */
 
-void
-cupsdClosePipe(int *fds)               /* I - Pipe file descriptors (2) */
+int                                    /* O  - 1 on success, 0 on failure */
+cupsdAddString(cups_array_t **a,       /* IO - String array */
+               const char   *s)                /* I  - String to copy and add */
 {
- /*
-  * Close file descriptors as needed...
-  */
-
-  if (fds[0] >= 0)
-  {
-    close(fds[0]);
-    fds[0] = -1;
-  }
+  if (!*a)
+    *a = cupsArrayNew3((cups_array_func_t)strcmp, NULL,
+                      (cups_ahash_func_t)NULL, 0,
+                      (cups_acopy_func_t)_cupsStrAlloc,
+                      (cups_afree_func_t)_cupsStrFree);
 
-  if (fds[1] >= 0)
-  {
-    close(fds[1]);
-    fds[1] = -1;
-  }
+  return (cupsArrayAdd(*a, (char *)s));
 }
 
 
 /*
- * 'cupsdOpenPipe()' - Create a pipe which is closed on exec.
+ * 'cupsdCheckProcess()' - Tell the main loop to check for dead children.
  */
 
-int                                    /* O - 0 on success, -1 on error */
-cupsdOpenPipe(int *fds)                        /* O - Pipe file descriptors (2) */
+void
+cupsdCheckProcess(void)
 {
  /*
-  * Create the pipe...
-  */
-
-  if (pipe(fds))
-    return (-1);
-
- /*
-  * Set the "close on exec" flag on each end of the pipe...
-  */
-
-  if (fcntl(fds[0], F_SETFD, fcntl(fds[0], F_GETFD) | FD_CLOEXEC))
-  {
-    close(fds[0]);
-    close(fds[1]);
-    return (-1);
-  }
-
-  if (fcntl(fds[1], F_SETFD, fcntl(fds[1], F_GETFD) | FD_CLOEXEC))
-  {
-    close(fds[0]);
-    close(fds[1]);
-    return (-1);
-  }
-
- /*
-  * Return 0 indicating success...
+  * Flag that we have dead children...
   */
 
-  return (0);
+  dead_children = 1;
 }
 
 
 /*
- * 'cupsdCatchChildSignals()' - Catch SIGCHLD signals...
+ * 'cupsdClearString()' - Clear a string.
  */
 
 void
-cupsdCatchChildSignals(void)
+cupsdClearString(char **s)             /* O - String value */
 {
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction     action;         /* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGCHLD, sigchld_handler);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  sigaddset(&action.sa_mask, SIGTERM);
-  sigaddset(&action.sa_mask, SIGCHLD);
-  action.sa_handler = sigchld_handler;
-  sigaction(SIGCHLD, &action, NULL);
-#else
-  signal(SIGCLD, sigchld_handler);     /* No, SIGCLD isn't a typo... */
-#endif /* HAVE_SIGSET */
+  if (s && *s)
+  {
+    _cupsStrFree(*s);
+    *s = NULL;
+  }
 }
 
 
 /*
- * 'cupsdClearString()' - Clear a string.
+ * 'cupsdFreeStrings()' - Free an array of strings.
  */
 
 void
-cupsdClearString(char **s)             /* O - String value */
+cupsdFreeStrings(cups_array_t **a)     /* IO - String array */
 {
-  if (s && *s)
+  if (*a)
   {
-    free(*s);
-    *s = NULL;
+    cupsArrayDelete(*a);
+    *a = NULL;
   }
 }
 
@@ -1054,36 +1235,6 @@ cupsdHoldSignals(void)
 }
 
 
-/*
- * 'cupsdIgnoreChildSignals()' - Ignore SIGCHLD signals...
- *
- * We don't really ignore them, we set the signal handler to SIG_DFL,
- * since some OS's rely on signals for the wait4() function to work.
- */
-
-void
-cupsdIgnoreChildSignals(void)
-{
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction     action;         /* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGCHLD, SIG_DFL);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  sigaddset(&action.sa_mask, SIGCHLD);
-  action.sa_handler = SIG_DFL;
-  sigaction(SIGCHLD, &action, NULL);
-#else
-  signal(SIGCLD, SIG_DFL);     /* No, SIGCLD isn't a typo... */
-#endif /* HAVE_SIGSET */
-}
-
-
 /*
  * 'cupsdReleaseSignals()' - Release signals for delivery.
  */
@@ -1116,10 +1267,10 @@ cupsdSetString(char       **s,          /* O - New string */
     return;
 
   if (*s)
-    free(*s);
+    _cupsStrFree(*s);
 
   if (v)
-    *s = strdup(v);
+    *s = _cupsStrAlloc(v);
   else
     *s = NULL;
 }
@@ -1134,7 +1285,7 @@ cupsdSetStringf(char       **s,           /* O - New string */
                 const char *f,         /* I - Printf-style format string */
                ...)                    /* I - Additional args as needed */
 {
-  char         v[4096];                /* Formatting string value */
+  char         v[65536 + 64];          /* Formatting string value */
   va_list      ap;                     /* Argument pointer */
   char         *olds;                  /* Old string */
 
@@ -1150,16 +1301,207 @@ cupsdSetStringf(char       **s,                /* O - New string */
     vsnprintf(v, sizeof(v), f, ap);
     va_end(ap);
 
-    *s = strdup(v);
+    *s = _cupsStrAlloc(v);
   }
   else
     *s = NULL;
 
   if (olds)
-    free(olds);
+    _cupsStrFree(olds);
 }
 
 
+#ifdef HAVE_LAUNCHD
+/*
+ * 'launchd_checkin()' - Check-in with launchd and collect the listening fds.
+ */
+
+static void
+launchd_checkin(void)
+{
+  size_t               i,              /* Looping var */
+                       count;          /* Number of listeners */
+  launch_data_t                ld_msg,         /* Launch data message */
+                       ld_resp,        /* Launch data response */
+                       ld_array,       /* Launch data array */
+                       ld_sockets,     /* Launch data sockets dictionary */
+                       tmp;            /* Launch data */
+  cupsd_listener_t     *lis;           /* Listeners array */
+  http_addr_t          addr;           /* Address variable */
+  socklen_t            addrlen;        /* Length of address */
+  int                  fd;             /* File descriptor */
+  char                 s[256];         /* String addresss */
+
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: pid=%d", (int)getpid());
+
+ /*
+  * Check-in with launchd...
+  */
+
+  ld_msg = launch_data_new_string(LAUNCH_KEY_CHECKIN);
+  if ((ld_resp = launch_msg(ld_msg)) == NULL)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                   "launchd_checkin: launch_msg(\"" LAUNCH_KEY_CHECKIN
+                   "\") IPC failure");
+    exit(EXIT_FAILURE);
+    return; /* anti-compiler-warning */
+  }
+
+  if (launch_data_get_type(ld_resp) == LAUNCH_DATA_ERRNO)
+  {
+    errno = launch_data_get_errno(ld_resp);
+    cupsdLogMessage(CUPSD_LOG_ERROR, "launchd_checkin: Check-in failed: %s",
+                    strerror(errno));
+    exit(EXIT_FAILURE);
+    return; /* anti-compiler-warning */
+  }
+
+ /*
+  * Get the sockets dictionary...
+  */
+
+  if ((ld_sockets = launch_data_dict_lookup(ld_resp, LAUNCH_JOBKEY_SOCKETS))
+          == NULL)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "launchd_checkin: No sockets found to answer requests on!");
+    exit(EXIT_FAILURE);
+    return; /* anti-compiler-warning */
+  }
+
+ /*
+  * Get the array of listener sockets...
+  */
+
+  if ((ld_array = launch_data_dict_lookup(ld_sockets, "Listeners")) == NULL)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "launchd_checkin: No sockets found to answer requests on!");
+    exit(EXIT_FAILURE);
+    return; /* anti-compiler-warning */
+  }
+
+ /*
+  * Add listening fd(s) to the Listener array...
+  */
+
+  if (launch_data_get_type(ld_array) == LAUNCH_DATA_ARRAY)
+  {
+    count = launch_data_array_get_count(ld_array);
+
+    for (i = 0; i < count; i ++)
+    {
+     /*
+      * Get the launchd file descriptor and address...
+      */
+
+      if ((tmp = launch_data_array_get_index(ld_array, i)) != NULL)
+      {
+       fd      = launch_data_get_fd(tmp);
+       addrlen = sizeof(addr);
+
+       if (getsockname(fd, (struct sockaddr *)&addr, &addrlen))
+       {
+         cupsdLogMessage(CUPSD_LOG_ERROR,
+                         "launchd_checkin: Unable to get local address - %s",
+                         strerror(errno));
+         continue;
+       }
+
+       /*
+       * Try to match the launchd socket address to one of the listeners...
+       */
+
+       for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
+            lis;
+            lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+         if (httpAddrEqual(&lis->address, &addr))
+           break;
+
+       /*
+       * Add a new listener If there's no match...
+       */
+
+       if (lis)
+       {
+         cupsdLogMessage(CUPSD_LOG_DEBUG,
+                 "launchd_checkin: Matched existing listener %s with fd %d...",
+                 httpAddrString(&(lis->address), s, sizeof(s)), fd);
+       }
+       else
+       {
+         cupsdLogMessage(CUPSD_LOG_DEBUG,
+                 "launchd_checkin: Adding new listener %s with fd %d...",
+                 httpAddrString(&addr, s, sizeof(s)), fd);
+
+         if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
+         {
+           cupsdLogMessage(CUPSD_LOG_ERROR,
+                           "launchd_checkin: Unable to allocate listener - "
+                           "%s.", strerror(errno));
+           exit(EXIT_FAILURE);
+         }
+
+         cupsArrayAdd(Listeners, lis);
+
+         memcpy(&lis->address, &addr, sizeof(lis->address));
+       }
+
+       lis->fd = fd;
+
+#  ifdef HAVE_SSL
+       if (httpAddrPort(&(lis->address)) == 443)
+         lis->encryption = HTTP_ENCRYPT_ALWAYS;
+#  endif /* HAVE_SSL */
+      }
+    }
+  }
+
+  launch_data_free(ld_msg);
+  launch_data_free(ld_resp);
+}
+
+
+/*
+ * 'launchd_checkout()' - Update the launchd KeepAlive file as needed.
+ */
+
+static void
+launchd_checkout(void)
+{
+  int  fd;                             /* File descriptor */
+
+
+ /*
+  * Create or remove the launchd KeepAlive file based on whether
+  * there are active jobs, polling, browsing for remote printers or
+  * shared printers to advertise...
+  */
+
+  if (cupsArrayCount(ActiveJobs) ||
+      (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG,
+                    "Creating launchd keepalive file \"" CUPS_KEEPALIVE
+                    "\"...");
+
+    if ((fd = open(CUPS_KEEPALIVE, O_RDONLY | O_CREAT | O_EXCL, S_IRUSR)) >= 0)
+      close(fd);
+  }
+  else
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG,
+                    "Removing launchd keepalive file \"" CUPS_KEEPALIVE
+                    "\"...");
+
+    unlink(CUPS_KEEPALIVE);
+  }
+}
+#endif /* HAVE_LAUNCHD */
+
+
 /*
  * 'parent_handler()' - Catch USR1/CHLD signals...
  */
@@ -1183,9 +1525,12 @@ static void
 process_children(void)
 {
   int          status;                 /* Exit status of child */
-  int          pid;                    /* Process ID of child */
+  int          pid,                    /* Process ID of child */
+               job_id;                 /* Job ID of child */
   cupsd_job_t  *job;                   /* Current job */
   int          i;                      /* Looping var */
+  char         name[1024];             /* Process name */
+  const char   *type;                  /* Type of program */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "process_children()");
@@ -1208,31 +1553,11 @@ process_children(void)
   if ((pid = wait(&status)) > 0)
 #endif /* HAVE_WAITPID */
   {
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "process_children: pid = %d, status = %d\n", pid, status);
-
    /*
-    * Ignore SIGTERM errors - that comes when a job is cancelled...
+    * Collect the name of the process that finished...
     */
 
-    if (status == SIGTERM)
-      status = 0;
-
-    if (status)
-    {
-      if (WIFEXITED(status))
-       cupsdLogMessage(CUPSD_LOG_ERROR, "PID %d stopped with status %d!", pid,
-                       WEXITSTATUS(status));
-      else
-       cupsdLogMessage(CUPSD_LOG_ERROR, "PID %d crashed on signal %d!", pid,
-                       WTERMSIG(status));
-
-      if (LogLevel < CUPSD_LOG_DEBUG)
-        cupsdLogMessage(CUPSD_LOG_INFO,
-                       "Hint: Try setting the LogLevel to \"debug\" to find out more.");
-    }
-    else
-      cupsdLogMessage(CUPSD_LOG_DEBUG2, "PID %d exited with no errors.", pid);
+    cupsdFinishProcess(pid, name, sizeof(name), &job_id);
 
    /*
     * Delete certificates for CGI processes...
@@ -1242,128 +1567,188 @@ process_children(void)
       cupsdDeleteCert(pid);
 
    /*
-    * Lookup the PID in the jobs list...
+    * Handle completed job filters...
     */
 
-    for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
-        job;
-        job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
-      if (job->state != NULL &&
-          job->state->values[0].integer == IPP_JOB_PROCESSING)
+    if (job_id > 0)
+      job = cupsdFindJob(job_id);
+    else
+      job  = NULL;
+
+    if (job)
+    {
+      for (i = 0; job->filters[i]; i ++)
+       if (job->filters[i] == pid)
+         break;
+
+      if (job->filters[i] || job->backend == pid)
       {
-       for (i = 0; job->filters[i]; i ++)
-          if (job->filters[i] == pid)
-           break;
+       /*
+       * OK, this process has gone away; what's left?
+       */
 
-       if (job->filters[i] || job->backend == pid)
+       if (job->filters[i])
+       {
+         job->filters[i] = -pid;
+         type            = "Filter";
+       }
+       else
+       {
+         job->backend = -pid;
+         type         = "Backend";
+       }
+
+       if (status && status != SIGTERM && status != SIGKILL &&
+           status != SIGPIPE)
        {
         /*
-          * OK, this process has gone away; what's left?
+         * An error occurred; save the exit status so we know to stop
+         * the printer or cancel the job when all of the filters finish...
+         *
+         * A negative status indicates that the backend failed and the
+         * printer needs to be stopped.
+         *
+         * In order to preserve the most serious status, we always log
+         * when a process dies due to a signal (e.g. SIGABRT, SIGSEGV,
+         * and SIGBUS) and prefer to log the backend exit status over a
+         * filter's.
          */
 
-          if (job->filters[i])
-           job->filters[i] = -pid;
-         else
-           job->backend = -pid;
+         int old_status = abs(job->status);
 
-          if (status && job->status >= 0)
-         {
-          /*
-           * An error occurred; save the exit status so we know to stop
-           * the printer or cancel the job when all of the filters finish...
-           *
-           * A negative status indicates that the backend failed and the
-           * printer needs to be stopped.
-           */
-
-            if (job->filters[i])
-             job->status = status;     /* Filter failed */
+          if (WIFSIGNALED(status) ||   /* This process crashed, or */
+              !job->status ||          /* No process had a status, or */
+              (!job->filters[i] && WIFEXITED(old_status)))
+          {                            /* Backend and filter didn't crash */
+           if (job->filters[i])
+             job->status = status;     /* Filter failed */
            else
-             job->status = -status;    /* Backend failed */
-         }
-
-        /*
-         * If this is not the last file in a job, see if all of the
-         * filters are done, and if so move to the next file.
-         */
+             job->status = -status;    /* Backend failed */
+          }
 
-          if (job->current_file < job->num_files)
+         if (job->state_value == IPP_JOB_PROCESSING &&
+             job->status_level > CUPSD_LOG_ERROR &&
+             (job->filters[i] || !WIFEXITED(status)))
          {
-           for (i = 0; job->filters[i] < 0; i ++);
-
-           if (!job->filters[i])
-           {
-            /*
-             * Process the next file...
-             */
+           char        message[1024];  /* New printer-state-message */
 
-             cupsdFinishJob(job);
-           }
-         }
-         break;
-       }
-      }
-  }
-}
 
+           job->status_level = CUPSD_LOG_ERROR;
 
-/*
- * 'sigchld_handler()' - Handle 'child' signals from old processes.
- */
+           snprintf(message, sizeof(message), "%s failed", type);
 
-static void
-sigchld_handler(int sig)       /* I - Signal number */
-{
-  (void)sig;
+            if (job->printer)
+           {
+             strlcpy(job->printer->state_message, message,
+                      sizeof(job->printer->state_message));
+           }
 
- /*
-  * Flag that we have dead children...
-  */
+           if (!job->attrs)
+             cupsdLoadJob(job);
 
-  dead_children = 1;
+           if (!job->printer_message && job->attrs)
+           {
+             if ((job->printer_message =
+                      ippFindAttribute(job->attrs, "job-printer-state-message",
+                                       IPP_TAG_TEXT)) == NULL)
+               job->printer_message = ippAddString(job->attrs, IPP_TAG_JOB,
+                                                   IPP_TAG_TEXT,
+                                                   "job-printer-state-message",
+                                                   NULL, NULL);
+           }
 
- /*
-  * Reset the signal handler as needed...
-  */
+           if (job->printer_message)
+             cupsdSetString(&(job->printer_message->values[0].string.text),
+                            message);
+         }
+       }
 
-#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
-  signal(SIGCLD, sigchld_handler);
-#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
-}
+       /*
+       * If this is not the last file in a job, see if all of the
+       * filters are done, and if so move to the next file.
+       */
 
+       if (job->current_file < job->num_files && job->printer)
+       {
+         for (i = 0; job->filters[i] < 0; i ++);
 
-/*
- * 'sighup_handler()' - Handle 'hangup' signals to reconfigure the scheduler.
- */
+         if (!job->filters[i] &&
+             (!job->printer->pc || !job->printer->pc->single_file ||
+              job->backend <= 0))
+         {
+          /*
+           * Process the next file...
+           */
 
-static void
-sighup_handler(int sig)        /* I - Signal number */
-{
-  (void)sig;
+           cupsdContinueJob(job);
+         }
+       }
+       else if (job->state_value >= IPP_JOB_CANCELED)
+       {
+        /*
+         * Remove the job from the active list if there are no processes still
+         * running for it...
+         */
 
-  NeedReload = RELOAD_ALL;
-  ReloadTime = time(NULL);
+         for (i = 0; job->filters[i] < 0; i++);
 
-#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
-  signal(SIGHUP, sighup_handler);
-#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
-}
+         if (!job->filters[i] && job->backend <= 0)
+           cupsArrayRemove(ActiveJobs, job);
+       }
+      }
+    }
 
+   /*
+    * Show the exit status as needed, ignoring SIGTERM and SIGKILL errors
+    * since they come when we kill/end a process...
+    */
 
-/*
- * 'sigterm_handler()' - Handle 'terminate' signals that stop the scheduler.
- */
+    if (status == SIGTERM || status == SIGKILL)
+    {
+      cupsdLogJob(job, CUPSD_LOG_DEBUG,
+                 "PID %d (%s) was terminated normally with signal %d.", pid,
+                 name, status);
+    }
+    else if (status == SIGPIPE)
+    {
+      cupsdLogJob(job, CUPSD_LOG_DEBUG,
+                 "PID %d (%s) did not catch or ignore signal %d.", pid, name,
+                 status);
+    }
+    else if (status)
+    {
+      if (WIFEXITED(status))
+      {
+        int code = WEXITSTATUS(status);        /* Exit code */
+
+        if (code > 100)
+         cupsdLogJob(job, CUPSD_LOG_DEBUG,
+                     "PID %d (%s) stopped with status %d (%s)", pid, name,
+                     code, strerror(code - 100));
+       else
+         cupsdLogJob(job, CUPSD_LOG_DEBUG,
+                     "PID %d (%s) stopped with status %d.", pid, name, code);
+      }
+      else
+       cupsdLogJob(job, CUPSD_LOG_DEBUG, "PID %d (%s) crashed on signal %d.",
+                   pid, name, WTERMSIG(status));
 
-static void
-sigterm_handler(int sig)               /* I - Signal */
-{
-  (void)sig;   /* remove compiler warnings... */
+      if (LogLevel < CUPSD_LOG_DEBUG)
+        cupsdLogJob(job, CUPSD_LOG_INFO,
+                   "Hint: Try setting the LogLevel to \"debug\" to find out "
+                   "more.");
+    }
+    else
+      cupsdLogJob(job, CUPSD_LOG_DEBUG, "PID %d (%s) exited with no errors.",
+                 pid, name);
+  }
 
  /*
-  * Flag that we should stop and return...
+  * If wait*() is interrupted by a signal, tell main() to call us again...
   */
 
-  stop_scheduler = 1;
+  if (pid < 0 && errno == EINTR)
+    dead_children = 1;
 }
 
 
@@ -1373,41 +1758,37 @@ sigterm_handler(int sig)                /* I - Signal */
  */
 
 static long                            /* O - Number of seconds */
-select_timeout(int fds)                        /* I - Number of ready descriptors select returned */
+select_timeout(int fds)                        /* I - Number of descriptors returned */
 {
-  int                  i;              /* Looping var */
   long                 timeout;        /* Timeout for select */
   time_t               now;            /* Current time */
   cupsd_client_t       *con;           /* Client information */
-  cupsd_printer_t      *p;             /* Printer information */
   cupsd_job_t          *job;           /* Job information */
   cupsd_subscription_t *sub;           /* Subscription information */
   const char           *why;           /* Debugging aid */
 
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
+                 (long)JobHistoryUpdate);
+
  /*
   * Check to see if any of the clients have pending data to be
   * processed; if so, the timeout should be 0...
   */
 
-  for (i = NumClients, con = Clients; i > 0; i --, con ++)
+  for (con = (cupsd_client_t *)cupsArrayFirst(Clients);
+       con;
+       con = (cupsd_client_t *)cupsArrayNext(Clients))
     if (con->http.used > 0)
       return (0);
 
  /*
-  * If select has been active in the last second (fds != 0) or we have
+  * If select has been active in the last second (fds > 0) or we have
   * many resources in use then don't bother trying to optimize the
   * timeout, just make it 1 second.
   */
 
-  if (fds || NumClients > 50)
-    return (1);
-
- /*
-  * If we had a recent event notification, timeout in 1 second...
-  */
-
-  if (LastEvent)
+  if (fds > 0 || cupsArrayCount(Clients) > 50)
     return (1);
 
  /*
@@ -1418,11 +1799,40 @@ select_timeout(int fds)                 /* I - Number of ready descriptors select returned */
   timeout = now + 86400;               /* 86400 == 1 day */
   why     = "do nothing";
 
+#ifdef __APPLE__
+ /*
+  * When going to sleep, wake up to cancel jobs that don't complete in time.
+  */
+
+  if (SleepJobs > 0 && SleepJobs < timeout)
+  {
+    timeout = SleepJobs;
+    why     = "cancel jobs before sleeping";
+  }
+#endif /* __APPLE__ */
+
+ /*
+  * Check whether we are accepting new connections...
+  */
+
+  if (ListeningPaused > 0 && cupsArrayCount(Clients) < MaxClients &&
+      ListeningPaused < timeout)
+  {
+    if (ListeningPaused <= now)
+      timeout = now;
+    else
+      timeout = ListeningPaused;
+
+    why = "resume listening";
+  }
+
  /*
   * Check the activity and close old clients...
   */
 
-  for (i = NumClients, con = Clients; i > 0; i --, con ++)
+  for (con = (cupsd_client_t *)cupsArrayFirst(Clients);
+       con;
+       con = (cupsd_client_t *)cupsArrayNext(Clients))
     if ((con->http.activity + Timeout) < timeout)
     {
       timeout = con->http.activity + Timeout;
@@ -1430,60 +1840,53 @@ select_timeout(int fds)                 /* I - Number of ready descriptors select returned */
     }
 
  /*
-  * Update the browse list as needed...
+  * Write out changes to configuration and state files...
+  */
+
+  if (DirtyCleanTime && timeout > DirtyCleanTime)
+  {
+    timeout = DirtyCleanTime;
+    why     = "write dirty config/state files";
+  }
+
+ /*
+  * Check for any job activity...
   */
 
-  if (Browsing && BrowseLocalProtocols)
+  if (JobHistoryUpdate && timeout > JobHistoryUpdate)
+  {
+    timeout = JobHistoryUpdate;
+    why     = "update job history";
+  }
+
+  for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
+       job;
+       job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
   {
-#ifdef HAVE_LIBSLP
-    if ((BrowseLocalProtocols & BROWSE_SLP) && (BrowseSLPRefresh < timeout))
+    if (job->cancel_time && job->cancel_time < timeout)
     {
-      timeout = BrowseSLPRefresh;
-      why     = "update SLP browsing";
+      timeout = job->cancel_time;
+      why     = "cancel stuck jobs";
     }
-#endif /* HAVE_LIBSLP */
 
-    if (BrowseLocalProtocols & BROWSE_CUPS)
+    if (job->kill_time && job->kill_time < timeout)
     {
-      for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
-           p;
-          p = (cupsd_printer_t *)cupsArrayNext(Printers))
-      {
-       if (p->type & CUPS_PRINTER_REMOTE)
-       {
-         if ((p->browse_time + BrowseTimeout) < timeout)
-         {
-           timeout = p->browse_time + BrowseTimeout;
-           why     = "browse timeout a printer";
-         }
-       }
-       else if (!(p->type & CUPS_PRINTER_IMPLICIT))
-       {
-         if (BrowseInterval && (p->browse_time + BrowseInterval) < timeout)
-         {
-           timeout = p->browse_time + BrowseInterval;
-           why     = "send browse update";
-         }
-       }
-      }
+      timeout = job->kill_time;
+      why     = "kill unresponsive jobs";
     }
-  }
 
- /*
-  * Check for any active jobs...
-  */
+    if (job->state_value == IPP_JOB_HELD && job->hold_until < timeout)
+    {
+      timeout = job->hold_until;
+      why     = "release held jobs";
+    }
 
-  if (timeout > (now + 10) && ActiveJobs)
-  {
-    for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
-        job;
-        job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
-      if (job->state->values[0].integer <= IPP_JOB_PROCESSING)
-      {
-       timeout = now + 10;
-       why     = "process active jobs";
-       break;
-      }
+    if (job->state_value == IPP_JOB_PENDING && timeout > (now + 10))
+    {
+      timeout = now + 10;
+      why     = "start pending jobs";
+      break;
+    }
   }
 
 #ifdef HAVE_MALLINFO
@@ -1505,18 +1908,16 @@ select_timeout(int fds)                 /* I - Number of ready descriptors select returned */
   for (sub = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions);
        sub;
        sub = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
-    if (!sub->job && sub->expire < timeout)
+    if (!sub->job && sub->expire && sub->expire < timeout)
     {
       timeout = sub->expire;
       why     = "expire subscription";
     }
 
  /*
-  * Adjust from absolute to relative time.  If p->browse_time above
-  * was 0 then we can end up with a negative value here, so check.
-  * We add 1 second to the timeout since events occur after the
-  * timeout expires, and limit the timeout to 86400 seconds (1 day)
-  * to avoid select() timeout limits present on some operating
+  * Adjust from absolute to relative time.  We add 1 second to the timeout since
+  * events occur after the timeout expires, and limit the timeout to 86400
+  * seconds (1 day) to avoid select() timeout limits present on some operating
   * systems...
   */
 
@@ -1531,25 +1932,98 @@ select_timeout(int fds)                 /* I - Number of ready descriptors select returned */
   * Log and return the timeout value...
   */
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: %ld seconds to %s",
-                  timeout, why);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout(%d): %ld seconds to %s",
+                  fds, timeout, why);
 
   return (timeout);
 }
 
 
+/*
+ * 'sigchld_handler()' - Handle 'child' signals from old processes.
+ */
+
+static void
+sigchld_handler(int sig)               /* I - Signal number */
+{
+  (void)sig;
+
+ /*
+  * Flag that we have dead children...
+  */
+
+  dead_children = 1;
+
+ /*
+  * Reset the signal handler as needed...
+  */
+
+#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
+  signal(SIGCLD, sigchld_handler);
+#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
+}
+
+
+/*
+ * 'sighup_handler()' - Handle 'hangup' signals to reconfigure the scheduler.
+ */
+
+static void
+sighup_handler(int sig)                        /* I - Signal number */
+{
+  (void)sig;
+
+  NeedReload = RELOAD_ALL;
+  ReloadTime = time(NULL);
+
+#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
+  signal(SIGHUP, sighup_handler);
+#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
+}
+
+
+/*
+ * 'sigterm_handler()' - Handle 'terminate' signals that stop the scheduler.
+ */
+
+static void
+sigterm_handler(int sig)               /* I - Signal number */
+{
+  (void)sig;   /* remove compiler warnings... */
+
+ /*
+  * Flag that we should stop and return...
+  */
+
+  stop_scheduler = 1;
+}
+
+
 /*
  * 'usage()' - Show scheduler usage.
  */
 
 static void
-usage(void)
+usage(int status)                      /* O - Exit status */
 {
-  fputs("Usage: cupsd [-c config-file] [-f] [-F]\n", stderr);
-  exit(1);
+  FILE *fp = status ? stderr : stdout; /* Output file */
+
+
+  _cupsLangPuts(fp, _("Usage: cupsd [options]"));
+  _cupsLangPuts(fp, _("Options:"));
+  _cupsLangPuts(fp, _("  -c cupsd.conf           Set cupsd.conf file to use."));
+  _cupsLangPuts(fp, _("  -f                      Run in the foreground."));
+  _cupsLangPuts(fp, _("  -F                      Run in the foreground but "
+                      "detach from console."));
+  _cupsLangPuts(fp, _("  -h                      Show this usage message."));
+  _cupsLangPuts(fp, _("  -l                      Run cupsd from launchd(8)."));
+  _cupsLangPuts(fp, _("  -t                      Test the configuration "
+                      "file."));
+
+  exit(status);
 }
 
 
 /*
- * End of "$Id: main.c 4997 2006-01-26 21:43:54Z mike $".
+ * End of "$Id$".
  */