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 a2c3371820933908235804127d3b05839fecb782..1c160e29c35bd6a2f4b8e6adb263c6013e2d958b 100644 (file)
--- 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 b2769d7c7d70caef1bf506d3f8a358106b203aa5..3c6bc6af8af1f106e27fb75d32303c8d7d81a0f3 100644 (file)
--- 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)++;
 }