From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Jul 2022 12:04:50 +0000 (+0100)
Subject: prefork: Allow script not to be set
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=9dfe8fc57cd3d0163134411e5e059a5b22826697;hp=0c2dc9043521b581951ba05d15c6c3905ce47916;p=chiark-utils.git

prefork: Allow script not to be set

Do the check in cgi-fcgi-interp.  prefork-interp is going to want this
to be optional.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/cprogs/cgi-fcgi-interp.c b/cprogs/cgi-fcgi-interp.c
index a2c3371..1c160e2 100644
--- a/cprogs/cgi-fcgi-interp.c
+++ b/cprogs/cgi-fcgi-interp.c
@@ -195,6 +195,7 @@ int main(int unused_argc, const char *const *argv) {
   }
 
   process_opts(&argv);
+  if (!script) badusage("need script argument");
 
   if (!stage2) {
     
diff --git a/cprogs/prefork.c b/cprogs/prefork.c
index b2769d7..3c6bc6a 100644
--- a/cprogs/prefork.c
+++ b/cprogs/prefork.c
@@ -338,6 +338,6 @@ void process_opts(const char *const **argv_io) {
     shbang_opts(argv_io, cmdinfos);
   }
 
-  script = *(*argv_io)++;
-  if (!script) badusage("need script argument");
+  if (**argv_io)
+    script = *(*argv_io)++;
 }