prefork: Insist on script (separately) with combined options

[chiark-utils.git] / cprogs / prefork.c

diff --git a/cprogs/prefork.c b/cprogs/prefork.c
index e352238973e6736c3f24560728d2047ff84748f7..425974c0ad5979aa6628aa20aee7dd661bd07407 100644 (file)
--- a/cprogs/prefork.c
+++ b/cprogs/prefork.c
@@ -2,16 +2,13 @@
 
 #include "prefork.h"
 
-const char *interp, *ident;
-int numservers=4, debugmode;
-int check_interval=300;
-
+const char *interp, *ident, *script, *socket_path, *lock_path;
+bool logging;
 struct sha256_ctx identsc;
 
-uid_t us;
-const char *run_base, *script, *socket_path, *lock_path;
-const char *run_base_mkdir_p;
-bool logging;
+static uid_t us;
+static const char *run_base;
+static const char *run_base_mkdir_p;
 
 void common_diee(const char *m) { diee("%s", m); }
 void common_die (const char *m) { die ("%s", m); }
@@ -180,82 +177,6 @@ void find_socket_path(void) {
   socket_path = m_asprintf("%s/s%s",run_base,ident);
 }  
 
-#ifdef st_mtime
-
-bool stab_isnewer(const struct stat *a, const struct stat *b) {
-  if (debugmode)
-    fprintf(stderr,"stab_isnewer mtim %lu.%06lu %lu.06%lu\n",
-           (unsigned long)a->st_mtim.tv_sec,
-           (unsigned long)a->st_mtim.tv_nsec,
-           (unsigned long)b->st_mtim.tv_sec,
-           (unsigned long)b->st_mtim.tv_nsec);
-  return timespeccmp(&a->st_mtim, &b->st_mtim, >);
-}
-
-void stab_mtimenow(struct stat *out) {
-  int r = clock_gettime(CLOCK_REALTIME, &out->st_mtim);
-  if (r) diee("(stage2) clock_gettime");
-  if (debugmode)
-    fprintf(stderr,"stab_mtimenow mtim %lu.%06lu\n",
-           (unsigned long)out->st_mtim.tv_sec,
-           (unsigned long)out->st_mtim.tv_nsec);
-}
-
-#else /* !defined(st_mtime) */
-
-bool stab_isnewer(const struct stat *a, const struct stat *b) {
-  if (debugmode)
-    fprintf(stderr,"stab_isnewer mtime %lu %lu\n",
-           (unsigned long)a->st_mtime,
-           (unsigned long)b->st_mtime);
-  return a->st_mtime > b->st_mtime;
-}
-
-void stab_mtimenow(struct stat *out) {
-  out->st_mtime = time(NULL);
-  if (out->st_mtime == (time_t)-1) diee("(stage2) time()");
-  if (debugmode)
-    fprintf(stderr,"stab_mtimenow mtime %lu\n",
-           (unsigned long)out->st_mtime);
-}
-
-#endif /* !defined(st_mtime) */
-
-bool check_garbage_vs(const struct stat *started) {
-  struct stat script_stab;
-  int r;
-
-  r = lstat(script, &script_stab);
-  if (r) diee("lstat script (%s)",script);
-
-  if (stab_isnewer(&script_stab, started))
-    return 1;
-
-  if (S_ISLNK(script_stab.st_mode)) {
-    r = stat(script, &script_stab);
-    if (r) diee("stat script (%s0",script);
-
-    if (stab_isnewer(&script_stab, started))
-      return 1;
-  }
-
-  return 0;
-}
-
-bool check_garbage(void) {
-  struct stat sock_stab;
-  int r;
-
-  r = lstat(socket_path, &sock_stab);
-  if (r) {
-    if ((errno == ENOENT))
-      return 0; /* well, no garbage then */
-    diee("stat socket (%s)",socket_path);
-  }
-
-  return check_garbage_vs(&sock_stab);
-}
-
 // Returns fd
 int acquire_lock(void) {
   int r;
@@ -272,28 +193,6 @@ int acquire_lock(void) {
   return lockfd;
 }
 
-void tidy_garbage(void) {
-  /* We lock l<ident> and re-check.  The effect of this is that each
-   * stale socket is removed only once.  So unless multiple updates to
-   * the script happen rapidly, we can't be racing with the cgi-fcgi
-   * (which is recreating the socket */
-  int lockfd = -1;
-  int r;
-
-  lockfd = acquire_lock();
-
-  if (check_garbage()) {
-    r = unlink(socket_path);
-    if (r) {
-      if (!(errno == ENOENT))
-       diee("remove out-of-date socket (%s)", socket_path);
-    }
-  }
-
-  r = close(lockfd);
-  if (r) diee("close lock (%s)", lock_path);
-}
-
 static void shbang_opts(const char *const **argv_io,
                        const struct cmdinfo *cmdinfos) {
   myopt(argv_io, cmdinfos);
@@ -302,20 +201,20 @@ static void shbang_opts(const char *const **argv_io,
   if (!interp) badusage("need interpreter argument");
 }
 
-const char *process_opts(int argc, const char *const *argv) {
+void process_opts(const char *const **argv_io) {
   const char *smashedopt;
 
   sha256_init(&identsc);
 
-  if (argc>=2 &&
-      (smashedopt = argv[1]) &&
+  if ((*argv_io)[0] &&
+      (smashedopt = (*argv_io)[1]) &&
       smashedopt[0]=='-' &&
       (strchr(smashedopt,' ') || strchr(smashedopt,','))) {
     /* single argument containg all the options and <interp> */
-    argv += 2; /* eat argv[0] and smashedopt */
+    *argv_io += 2; /* eat argv[0] and smashedopt */
     const char *split_args[MAX_OPTS+1];
     int split_argc = 0;
-    split_args[split_argc++] = argv[0];
+    split_args[split_argc++] = (*argv_io)[0];
     for (;;) {
       if (split_argc >= MAX_OPTS) die("too many options in combined arg");
       split_args[split_argc++] = smashedopt;
@@ -334,13 +233,13 @@ const char *process_opts(int argc, const char *const *argv) {
 
     shbang_opts(&split_argv, cmdinfos);
     /* sets interp */
-    if (!split_argv) badusage("combined arg too many non-option arguments");
+
+    if (!**argv_io)
+      badusage("no script argument (expected after combined #! options)");
   } else {
-    shbang_opts(&argv, cmdinfos);
+    shbang_opts(argv_io, cmdinfos);
   }
 
-  script = *argv++;
-  if (!script) badusage("need script argument");
-
-  return script;
+  if (**argv_io)
+    script = *(*argv_io)++;
 }