Load cups into easysw/current.

[thirdparty/cups.git] / scheduler / cupsd.h

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index 7380c3dcd50c32877686bf444b5886fc0ee50402..dbdca8bef2c5b414cd0c93363d46966e1ffbbaa6 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsd.h 5007 2006-01-27 18:25:42Z mike $"
+ * "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $"
  *
  *   Main header file for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -65,6 +65,9 @@
  */
 
 #ifndef HAVE_HSTRERROR
+#  ifdef hstrerror
+#    undef hstrerror
+#  endif /* hstrerror */
 #  define hstrerror cups_hstrerror
 
 extern const char *cups_hstrerror(int);
@@ -85,6 +88,7 @@ extern const char *cups_hstrerror(int);
  * Implementation limits...
  */
 
+#define MAX_ENV                        100     /* Maximum number of environment strings */
 #define MAX_USERPASS           33      /* Maximum size of username/password */
 #define MAX_FILTERS            20      /* Maximum number of filters */
 #define MAX_SYSTEM_GROUPS      32      /* Maximum number of system groups */
@@ -159,16 +163,18 @@ VAR time_t                ReloadTime      VALUE(0);
                                        /* Time of reload request... */
 VAR int                        NeedReload      VALUE(RELOAD_ALL);
                                        /* Need to load configuration? */
+#ifdef HAVE_LAUNCH_H
+VAR int                        Launchd         VALUE(0);
+                                       /* Running from launchd */
+#endif /* HAVE_LAUNCH_H */
 
 
 /*
  * Prototypes...
  */
 
-extern void    cupsdCatchChildSignals(void);
 extern void    cupsdClearString(char **s);
 extern void    cupsdHoldSignals(void);
-extern void    cupsdIgnoreChildSignals(void);
 extern void    cupsdReleaseSignals(void);
 extern void    cupsdSetString(char **s, const char *v);
 extern void    cupsdSetStringf(char **s, const char *f, ...)
@@ -181,7 +187,6 @@ extern void cupsdStopServer(void);
 extern void    cupsdClosePipe(int *fds);
 extern int     cupsdOpenPipe(int *fds);
 
-extern void    cupsdClearEnv(void);
 extern void    cupsdInitEnv(void);
 extern int     cupsdLoadEnv(char *envp[], int envmax);
 extern void    cupsdSetEnv(const char *name, const char *value);
@@ -192,11 +197,12 @@ __attribute__ ((__format__ (__printf__, 2, 3)))
 ;
 
 extern int     cupsdEndProcess(int pid, int force);
+extern const char *cupsdFinishProcess(int pid, char *name, int namelen);
 extern int     cupsdStartProcess(const char *command, char *argv[],
                                  char *envp[], int infd, int outfd,
                                  int errfd, int backfd, int root, int *pid);
 
 
 /*
- * End of "$Id: cupsd.h 5007 2006-01-27 18:25:42Z mike $".
+ * End of "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $".
  */