/*
- * "$Id: main.c 7925 2008-09-10 17:47:26Z mike $"
+ * "$Id$"
*
- * Scheduler main loop for the Common UNIX Printing System (CUPS).
+ * Main loop for the CUPS scheduler.
*
- * Copyright 2007-2009 by Apple Inc.
+ * 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
*
* Contents:
*
- * main() - Main entry for the CUPS scheduler.
- * cupsdClosePipe() - Close a pipe as necessary.
- * cupsdOpenPipe() - Create a pipe which is closed on exec.
- * 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() - Check-out with launchd.
- * 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.
+ * 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 <sys/resource.h>
#include <syslog.h>
#include <grp.h>
-#include <cups/dir.h>
#ifdef HAVE_LAUNCH_H
# include <launch.h>
# include <libgen.h>
-# define CUPS_KEEPALIVE CUPS_CACHEDIR "/org.cups.cupsd"
+# define CUPS_KEEPALIVE CUPS_CACHEDIR "/org.cups.cupsd"
/* Name of the launchd KeepAlive file */
# ifndef LAUNCH_JOBKEY_KEEPALIVE
# define LAUNCH_JOBKEY_KEEPALIVE "KeepAlive"
#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 */
-#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
-# include <dlfcn.h>
-#endif /* __APPLE__ && HAVE_DLFCN_H */
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif /* HAVE_SYS_PARAM_H */
/*
static void sighup_handler(int sig);
static void sigterm_handler(int sig);
static long select_timeout(int fds);
-static void usage(int status);
+static void usage(int status) __attribute__((noreturn));
/*
static int stop_scheduler = 0;
/* Should the scheduler stop? */
-#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
-static const char *PSQLibPath = "/usr/lib/libPrintServiceQuota.dylib";
-static const char *PSQLibFuncName = "PSQUpdateQuota";
-static void *PSQLibRef; /* libPrintServiceQuota.dylib */
-#endif /* HAVE_DLFCN_H */
-
/*
* 'main()' - Main entry for the CUPS scheduler.
cupsd_listener_t *lis; /* Current listener */
time_t current_time, /* Current time */
activity, /* Client activity timer */
- browse_time, /* Next browse send time */
senddoc_time, /* Send-Document time */
expire_time, /* Subscription expire time */
report_time, /* Malloc/client/job report time */
- event_time; /* Last time an event notification was done */
+ 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 run_as_child = 0,
- /* Needed for Mac OS X fork/exec */
- use_sysman = !getuid();
+ int use_sysman = !getuid();
/* Use system management functions? */
#else
time_t netif_time = 0; /* Time since last network update */
if (getuid() != geteuid())
{
- fputs("cupsd: Cannot run as a setuid program!\n", stderr);
+ fputs("cupsd: Cannot run as a setuid program\n", stderr);
return (1);
}
#endif /* HAVE_GETEUID */
for (opt = argv[i] + 1; *opt != '\0'; opt ++)
switch (*opt)
{
-#ifdef __APPLE__
- case 'S' : /* Disable system management functions */
- puts("Warning: -S (disable system management) for internal testing use only!");
- use_sysman = 0;
- break;
-
case 'C' : /* Run as child with config file */
run_as_child = 1;
fg = -1;
-#endif /* __APPLE__ */
case 'c' : /* Configuration file */
i ++;
if (i >= argc)
{
_cupsLangPuts(stderr, _("cupsd: Expected config filename "
- "after \"-c\" option!\n"));
+ "after \"-c\" option."));
usage(1);
}
char *current; /* Current directory */
-
/*
* Allocate a buffer for the current working directory to
* reduce run-time stack usage; this approximates the
if ((current = malloc(1024)) == NULL)
{
_cupsLangPuts(stderr,
- _("cupsd: Unable to get current directory!\n"));
+ _("cupsd: Unable to get current directory."));
return (1);
}
if (!getcwd(current, 1024))
{
_cupsLangPuts(stderr,
- _("cupsd: Unable to get current directory!\n"));
+ _("cupsd: Unable to get current directory."));
free(current);
return (1);
}
fg = 1;
#else
_cupsLangPuts(stderr, _("cupsd: launchd(8) support not compiled "
- "in, running in normal mode.\n"));
+ "in, running in normal mode."));
fg = 0;
#endif /* HAVE_LAUNCHD */
break;
case 'p' : /* Stop immediately for profiling */
- puts("Warning: -p (startup profiling) is for internal testing use only!");
+ fputs("cupsd: -p (startup profiling) is for internal testing "
+ "use only!\n", stderr);
stop_scheduler = 1;
fg = 1;
break;
case 'P' : /* Disable security profiles */
- puts("Warning: -P (disable security profiles) is for internal testing use only!");
+ 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;
default : /* Unknown option */
_cupsLangPrintf(stderr, _("cupsd: Unknown option \"%c\" - "
- "aborting!\n"), *opt);
+ "aborting."), *opt);
usage(1);
break;
}
else
{
- _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting!\n"),
+ _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...
*/
}
else if (WIFEXITED(i))
{
- fprintf(stderr, "cupsd: Child exited with status %d!\n",
+ 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);
}
}
-#ifdef __APPLE__
+#if defined(__OpenBSD__) && OpenBSD < 201211
/*
- * Since CoreFoundation has an overly-agressive check for whether a
- * process has forked but not exec'd (whether CF has been called or
- * not...), we now have to exec ourselves with the "-f" option to
- * eliminate their bogus warning messages.
+ * 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);
-#endif /* __APPLE__ */
}
if (fg < 1)
* Redirect stdin/out/err to /dev/null...
*/
- open("/dev/null", O_RDONLY);
- open("/dev/null", O_WRONLY);
- open("/dev/null", O_WRONLY);
+ 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 */
}
*/
if (!cupsdReadConfiguration())
- {
- if (TestConfigFile)
- printf("%s contains errors\n", ConfigurationFile);
- else
- syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
- ConfigurationFile);
return (1);
- }
else if (TestConfigFile)
{
- printf("%s is OK\n", ConfigurationFile);
+ printf("\"%s\" is OK.\n", CupsFilesFile);
+ printf("\"%s\" is OK.\n", ConfigurationFile);
return (0);
}
- if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
- {
- /*
- * Clean out the temporary directory...
- */
-
- cups_dir_t *dir; /* Temporary directory */
- cups_dentry_t *dent; /* Directory entry */
- char tempfile[1024]; /* Temporary filename */
-
-
- if ((dir = cupsDirOpen(TempDir)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Cleaning out old temporary files in \"%s\"...", TempDir);
-
- while ((dent = cupsDirRead(dir)) != NULL)
- {
- snprintf(tempfile, sizeof(tempfile), "%s/%s", TempDir, dent->filename);
+ /*
+ * Clean out old temp files and printer cache data.
+ */
- if (unlink(tempfile))
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "Unable to remove temporary file \"%s\" - %s",
- tempfile, strerror(errno));
- else
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Removed temporary file \"%s\"...",
- tempfile);
- }
+ if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
+ cupsdCleanFiles(TempDir, NULL);
- cupsDirClose(dir);
- }
- else
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "Unable to open temporary directory \"%s\" - %s",
- TempDir, strerror(errno));
- }
+ cupsdCleanFiles(CacheDir, "*.ipp");
#if HAVE_LAUNCHD
if (Launchd)
}
#endif /* HAVE_LAUNCHD */
-#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
- /*
- * Load Print Service quota enforcement library (X Server only)
- */
-
- PSQLibRef = dlopen(PSQLibPath, RTLD_LAZY);
-
- if (PSQLibRef)
- PSQUpdateQuotaProc = dlsym(PSQLibRef, PSQLibFuncName);
-#endif /* __APPLE__ && HAVE_DLFCN_H */
-
/*
* Startup the server...
*/
+ httpInitialize();
+
cupsdStartServer();
/*
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...
*/
* we are up and running...
*/
-#ifdef __APPLE__
if (!fg || run_as_child)
-#else
- if (!fg)
-#endif /* __APPLE__ */
{
/*
* Send a signal to the parent process, but only if the parent is
*/
current_time = time(NULL);
- browse_time = current_time;
event_time = current_time;
expire_time = current_time;
fds = 1;
* Shutdown the server...
*/
+ DoingShutdown = 1;
+
cupsdStopServer();
/*
if (Launchd)
{
/*
- * If we were started by launchd get the listen sockets file descriptors...
+ * If we were started by launchd, get the listen socket file
+ * descriptors...
*/
launchd_checkin();
* Startup the server...
*/
+ DoingShutdown = 0;
+
cupsdStartServer();
/*
* inactivity...
*/
- if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
+ if (timeout == 86400 && Launchd && LaunchdTimeout &&
!cupsArrayCount(ActiveJobs) &&
- (!Browsing ||
- (!BrowseRemoteProtocols &&
- (!NumBrowsers || !BrowseLocalProtocols ||
- cupsArrayCount(Printers) == 0))))
+ (!Browsing || !BrowseLocalProtocols || !cupsArrayCount(Printers)))
{
timeout = LaunchdTimeout;
launchd_idle_exit = 1;
* Got an error from select!
*/
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
cupsd_printer_t *p; /* Current printer */
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
if (errno == EINTR) /* Just interrupted by a signal */
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__
job->print_pipes[0], job->print_pipes[1],
job->back_pipes[0], job->back_pipes[1]);
-#ifdef HAVE_DNSSD
+#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 */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
break;
}
cupsArrayCount(PrintingJobs) > 0)
{
SleepJobs = 0;
- cupsdStopAllJobs(CUPSD_JOB_DEFAULT, 10);
+ cupsdStopAllJobs(CUPSD_JOB_DEFAULT, 5);
}
#endif /* __APPLE__ */
expire_time = current_time;
}
- /*
- * Update the browse list as needed...
- */
-
- if (Browsing)
- {
-#ifdef HAVE_LIBSLP
- if ((BrowseRemoteProtocols & BROWSE_SLP) &&
- BrowseSLPRefresh <= current_time)
- cupsdUpdateSLPBrowse();
-#endif /* HAVE_LIBSLP */
-
-#ifdef HAVE_LDAP
- if ((BrowseRemoteProtocols & BROWSE_LDAP) &&
- BrowseLDAPRefresh <= current_time)
- cupsdUpdateLDAPBrowse();
-#endif /* HAVE_LDAP */
- }
-
- if (Browsing && current_time > browse_time)
- {
- cupsdSendBrowseList();
- browse_time = current_time;
- }
-
+#ifndef HAVE_AUTHORIZATION_H
/*
* Update the root certificate once every 5 minutes if we have client
* connections...
*/
cupsdDeleteCert(0);
- cupsdAddCert(0, "root", NULL);
+ cupsdAddCert(0, "root", cupsdDefaultAuthType());
}
+#endif /* !HAVE_AUTHORIZATION_H */
/*
* Check for new data on the client sockets...
senddoc_time = current_time;
}
+ /*
+ * Clean job history...
+ */
+
+ if (JobHistoryUpdate && current_time >= JobHistoryUpdate)
+ cupsdCleanJobs();
+
/*
* Log statistics at most once a minute when in debug mode...
*/
cupsArrayCount(ActiveJobs));
cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: printers=%d",
cupsArrayCount(Printers));
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: printers-implicit=%d",
- cupsArrayCount(ImplicitPrinters));
string_count = _cupsStrStatistics(&alloc_bytes, &total_bytes);
cupsdLogMessage(CUPSD_LOG_DEBUG,
* Close all network clients...
*/
+ DoingShutdown = 1;
+
cupsdStopServer();
#ifdef HAVE_LAUNCHD
cupsdStopSystemMonitor();
#endif /* __APPLE__ */
-#ifdef HAVE_GSSAPI
- /*
- * Free the scheduler's Kerberos context...
- */
-
-# ifdef __APPLE__
- /*
- * If the weak-linked GSSAPI/Kerberos library is not present, don't try
- * to use it...
- */
-
- if (krb5_init_context != NULL)
-# endif /* __APPLE__ */
- if (KerberosContext)
- krb5_free_context(KerberosContext);
-#endif /* HAVE_GSSAPI */
-
-#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
- /*
- * Unload Print Service quota enforcement library (X Server only)
- */
-
- PSQUpdateQuotaProc = NULL;
- if (PSQLibRef)
- {
- dlclose(PSQLibRef);
- PSQLibRef = NULL;
- }
-#endif /* __APPLE__ && HAVE_DLFCN_H */
-
-#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...
- */
-
- if (!stat("/var/spool/lp/FIFO", &statbuf))
- if (!S_ISFIFO(statbuf.st_mode))
- unlink("/var/spool/lp/SCHEDLOCK");
-#endif /* __sgi */
-
cupsdStopSelect();
return (!stop_scheduler);
/*
- * 'cupsdCheckProcess()' - Tell the main loop to check for dead children.
+ * 'cupsdAddString()' - Copy and add a string to an array.
*/
-void
-cupsdCheckProcess(void)
+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 */
{
- /*
- * Flag that we have dead children...
- */
+ 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);
- dead_children = 1;
+ return (cupsArrayAdd(*a, (char *)s));
}
/*
- * 'cupsdClosePipe()' - Close a pipe as necessary.
+ * 'cupsdCheckProcess()' - Tell the main loop to check for dead children.
*/
void
-cupsdClosePipe(int *fds) /* I - Pipe file descriptors (2) */
+cupsdCheckProcess(void)
{
/*
- * Close file descriptors as needed...
+ * Flag that we have dead children...
*/
- if (fds[0] >= 0)
- {
- close(fds[0]);
- fds[0] = -1;
- }
-
- if (fds[1] >= 0)
- {
- close(fds[1]);
- fds[1] = -1;
- }
+ dead_children = 1;
}
/*
- * 'cupsdOpenPipe()' - Create a pipe which is closed on exec.
+ * 'cupsdClearString()' - Clear a string.
*/
-int /* O - 0 on success, -1 on error */
-cupsdOpenPipe(int *fds) /* O - Pipe file descriptors (2) */
+void
+cupsdClearString(char **s) /* O - String value */
{
- /*
- * Create the pipe...
- */
-
- if (pipe(fds))
- {
- fds[0] = -1;
- fds[1] = -1;
-
- 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]);
-
- fds[0] = -1;
- fds[1] = -1;
-
- return (-1);
- }
-
- if (fcntl(fds[1], F_SETFD, fcntl(fds[1], F_GETFD) | FD_CLOEXEC))
+ if (s && *s)
{
- close(fds[0]);
- close(fds[1]);
-
- fds[0] = -1;
- fds[1] = -1;
-
- return (-1);
+ _cupsStrFree(*s);
+ *s = NULL;
}
-
- /*
- * Return 0 indicating success...
- */
-
- return (0);
}
/*
- * '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)
{
- _cupsStrFree(*s);
- *s = NULL;
+ cupsArrayDelete(*a);
+ *a = NULL;
}
}
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 */
launchd_checkin(void)
{
size_t i, /* Looping var */
- count; /* Numebr of listeners */
- int portnum; /* Port number */
+ count; /* Number of listeners */
launch_data_t ld_msg, /* Launch data message */
ld_resp, /* Launch data response */
ld_array, /* Launch data array */
if (lis)
{
- cupsdLogMessage(CUPSD_LOG_DEBUG,
+ 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,
+ 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));
+ "launchd_checkin: Unable to allocate listener - "
+ "%s.", strerror(errno));
exit(EXIT_FAILURE);
}
lis->fd = fd;
# ifdef HAVE_SSL
- portnum = 0;
-
-# ifdef AF_INET6
- if (lis->address.addr.sa_family == AF_INET6)
- portnum = ntohs(lis->address.ipv6.sin6_port);
- else
-# endif /* AF_INET6 */
- if (lis->address.addr.sa_family == AF_INET)
- portnum = ntohs(lis->address.ipv4.sin_port);
-
- if (portnum == 443)
+ if (httpAddrPort(&(lis->address)) == 443)
lis->encryption = HTTP_ENCRYPT_ALWAYS;
# endif /* HAVE_SSL */
}
/*
* Create or remove the launchd KeepAlive file based on whether
- * there are active jobs, polling, browsing for remote printers or
+ * there are active jobs, polling, browsing for remote printers or
* shared printers to advertise...
*/
- if ((cupsArrayCount(ActiveJobs) || NumPolled ||
- (Browsing &&
- (BrowseRemoteProtocols ||
- (BrowseLocalProtocols && NumBrowsers && cupsArrayCount(Printers))))))
+ if (cupsArrayCount(ActiveJobs) ||
+ (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
{
cupsdLogMessage(CUPSD_LOG_DEBUG,
- "Creating launchd keepalive file \"" CUPS_KEEPALIVE "\"...");
+ "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 "\"...");
+ "Removing launchd keepalive file \"" CUPS_KEEPALIVE
+ "\"...");
unlink(CUPS_KEEPALIVE);
}
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()");
* Handle completed job filters...
*/
- if (job_id > 0 && (job = cupsdFindJob(job_id)) != NULL)
+ 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)
*/
if (job->filters[i])
+ {
job->filters[i] = -pid;
+ type = "Filter";
+ }
else
+ {
job->backend = -pid;
+ type = "Backend";
+ }
if (status && status != SIGTERM && status != SIGKILL &&
- job->status >= 0)
+ status != SIGPIPE)
{
/*
* An error occurred; save the exit status so we know to stop
*
* 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->status = status; /* Filter failed */
- else
- job->status = -status; /* Backend failed */
+ int old_status = abs(job->status);
+
+ 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 (job->state_value == IPP_JOB_PROCESSING &&
- job->status_level > CUPSD_LOG_ERROR)
+ job->status_level > CUPSD_LOG_ERROR &&
+ (job->filters[i] || !WIFEXITED(status)))
{
char message[1024]; /* New printer-state-message */
job->status_level = CUPSD_LOG_ERROR;
- snprintf(message, sizeof(message), "%s failed", name);
+ snprintf(message, sizeof(message), "%s failed", type);
if (job->printer)
{
strlcpy(job->printer->state_message, message,
sizeof(job->printer->state_message));
- cupsdAddPrinterHistory(job->printer);
}
if (!job->attrs)
job->printer_message = ippAddString(job->attrs, IPP_TAG_JOB,
IPP_TAG_TEXT,
"job-printer-state-message",
- NULL, "");
+ NULL, NULL);
}
if (job->printer_message)
* filters are done, and if so move to the next file.
*/
- if (job->current_file < job->num_files)
+ if (job->current_file < job->num_files && job->printer)
{
for (i = 0; job->filters[i] < 0; i ++);
- if (!job->filters[i])
+ if (!job->filters[i] &&
+ (!job->printer->pc || !job->printer->pc->single_file ||
+ job->backend <= 0))
{
/*
* Process the next file...
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...
+ */
+
+ for (i = 0; job->filters[i] < 0; i++);
+
+ if (!job->filters[i] && job->backend <= 0)
+ cupsArrayRemove(ActiveJobs, job);
+ }
}
}
if (status == SIGTERM || status == SIGKILL)
{
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "PID %d (%s) was terminated normally with signal %d.",
- pid, name, status);
+ 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))
- cupsdLogMessage(CUPSD_LOG_DEBUG, "PID %d (%s) stopped with status %d!",
- pid, name, WEXITSTATUS(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
- cupsdLogMessage(CUPSD_LOG_ERROR, "PID %d (%s) crashed on signal %d!",
- pid, name, WTERMSIG(status));
+ cupsdLogJob(job, CUPSD_LOG_DEBUG, "PID %d (%s) crashed on signal %d.",
+ pid, name, WTERMSIG(status));
if (LogLevel < CUPSD_LOG_DEBUG)
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Hint: Try setting the LogLevel to \"debug\" to find "
- "out more.");
+ cupsdLogJob(job, CUPSD_LOG_INFO,
+ "Hint: Try setting the LogLevel to \"debug\" to find out "
+ "more.");
}
else
- cupsdLogMessage(CUPSD_LOG_DEBUG, "PID %d (%s) exited with no errors.",
- pid, name);
+ cupsdLogJob(job, CUPSD_LOG_DEBUG, "PID %d (%s) exited with no errors.",
+ pid, name);
}
/*
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...
why = "timeout a client connection";
}
- /*
- * Update the browse list as needed...
- */
-
- if (Browsing && BrowseLocalProtocols)
- {
-#ifdef HAVE_LIBSLP
- if ((BrowseLocalProtocols & BROWSE_SLP) && (BrowseSLPRefresh < timeout))
- {
- timeout = BrowseSLPRefresh;
- why = "update SLP browsing";
- }
-#endif /* HAVE_LIBSLP */
-
-#ifdef HAVE_LDAP
- if ((BrowseLocalProtocols & BROWSE_LDAP) && (BrowseLDAPRefresh < timeout))
- {
- timeout = BrowseLDAPRefresh;
- why = "update LDAP browsing";
- }
-#endif /* HAVE_LDAP */
-
- if ((BrowseLocalProtocols & BROWSE_CUPS) && NumBrowsers)
- {
- 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->shared && !(p->type & CUPS_PRINTER_IMPLICIT))
- {
- if (BrowseInterval && (p->browse_time + BrowseInterval) < timeout)
- {
- timeout = p->browse_time + BrowseInterval;
- why = "send browse update";
- }
- }
- }
- }
- }
-
/*
* Write out changes to configuration and state files...
*/
}
/*
- * Check for any active jobs...
+ * Check for any job activity...
*/
+ if (JobHistoryUpdate && timeout > JobHistoryUpdate)
+ {
+ timeout = JobHistoryUpdate;
+ why = "update job history";
+ }
+
for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
job;
job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
{
+ if (job->cancel_time && job->cancel_time < timeout)
+ {
+ timeout = job->cancel_time;
+ why = "cancel stuck jobs";
+ }
+
if (job->kill_time && job->kill_time < timeout)
{
timeout = job->kill_time;
timeout = job->hold_until;
why = "release held jobs";
}
- else if (job->state_value == IPP_JOB_PENDING && timeout > (now + 10))
+
+ if (job->state_value == IPP_JOB_PENDING && timeout > (now + 10))
{
timeout = now + 10;
why = "start pending jobs";
}
/*
- * 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...
*/
static void
usage(int status) /* O - Exit status */
{
- _cupsLangPuts(status ? stderr : stdout,
- _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
- "\n"
- "-c config-file Load alternate configuration file\n"
- "-f Run in the foreground\n"
- "-F Run in the foreground but detach\n"
- "-h Show this usage message\n"
- "-l Run cupsd from launchd(8)\n"));
+ 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 7925 2008-09-10 17:47:26Z mike $".
+ * End of "$Id$".
*/
projects / thirdparty / cups.git / blobdiff