prefork: Have process_opts not return script, just set a global

This is going to be more convenient.

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 da1c2fa943240a8f7d03392a4b161f4292e65234..a2c3371820933908235804127d3b05839fecb782 100644 (file)
--- a/cprogs/cgi-fcgi-interp.c
+++ b/cprogs/cgi-fcgi-interp.c
@@ -194,7 +194,7 @@ int main(int unused_argc, const char *const *argv) {
     if (r) diee("close saved stderr fd");
   }
 
-  script = process_opts(&argv);
+  process_opts(&argv);
 
   if (!stage2) {
     

diff --git a/cprogs/prefork.c b/cprogs/prefork.c
index 607cdb72afcb14b3d1b6d0ddb50c7950a03b49e7..b2769d7c7d70caef1bf506d3f8a358106b203aa5 100644 (file)
--- a/cprogs/prefork.c
+++ b/cprogs/prefork.c
@@ -302,7 +302,7 @@ static void shbang_opts(const char *const **argv_io,
   if (!interp) badusage("need interpreter argument");
 }
 
-const char *process_opts(const char *const **argv_io) {
+void process_opts(const char *const **argv_io) {
   const char *smashedopt;
 
   sha256_init(&identsc);
@@ -340,6 +340,4 @@ const char *process_opts(const char *const **argv_io) {
 
   script = *(*argv_io)++;
   if (!script) badusage("need script argument");
-
-  return script;
 }

diff --git a/cprogs/prefork.h b/cprogs/prefork.h
index adeb8b4ab9e6841baa7336bc171dc3768b1315d4..895a9de4afeffc64cc9f8c851c4d8c81d1f6f8dd 100644 (file)
--- a/cprogs/prefork.h
+++ b/cprogs/prefork.h
@@ -59,8 +59,7 @@ void tidy_garbage(void);
 
 extern const struct cmdinfo cmdinfos[];
 
-// returns script pathname
-const char *process_opts(const char *const **argv_io);
+void process_opts(const char *const **argv_io);
 
 void vmsgcore(int estatus, int errnoval, const char *fmt, va_list al);