From 0c2dc9043521b581951ba05d15c6c3905ce47916 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jul 2022 13:03:46 +0100 Subject: [PATCH] prefork: Have process_opts not return script, just set a global This is going to be more convenient. Signed-off-by: Ian Jackson --- cprogs/cgi-fcgi-interp.c | 2 +- cprogs/prefork.c | 4 +--- cprogs/prefork.h | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cprogs/cgi-fcgi-interp.c b/cprogs/cgi-fcgi-interp.c index da1c2fa..a2c3371 100644 --- 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 607cdb7..b2769d7 100644 --- 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 adeb8b4..895a9de 100644 --- 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); -- 2.30.2