From 9dfe8fc57cd3d0163134411e5e059a5b22826697 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jul 2022 13:04:50 +0100 Subject: [PATCH 1/1] 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 --- cprogs/cgi-fcgi-interp.c | 1 + cprogs/prefork.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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)++; } -- 2.30.2