prefork: Have process_opts update argv and not take argc

[chiark-utils.git] / cprogs / prefork.h

diff --git a/cprogs/prefork.h b/cprogs/prefork.h
index ef78418c18862aa5c686b5e96cefc195310829b3..adeb8b4ab9e6841baa7336bc171dc3768b1315d4 100644 (file)
--- a/cprogs/prefork.h
+++ b/cprogs/prefork.h
@@ -33,7 +33,6 @@
 #include "timespeccmp.h"
 
 #define MINHEXHASH 33
-#define STAGE2_VAR "CHIARKUTILS_CGIFCGIINTERP_STAGE2"
 
 extern const char *interp, *ident;
 extern int numservers, debugmode;
@@ -41,6 +40,8 @@ extern int check_interval;
 
 extern struct sha256_ctx identsc;
 
+extern const char our_name[];
+
 extern uid_t us;
 extern const char *run_base, *script, *socket_path, *lock_path;
 extern const char *run_base_mkdir_p;
@@ -59,7 +60,7 @@ void tidy_garbage(void);
 extern const struct cmdinfo cmdinfos[];
 
 // returns script pathname
-const char *process_opts(int argc, const char *const *argv);
+const char *process_opts(const char *const **argv_io);
 
 void vmsgcore(int estatus, int errnoval, const char *fmt, va_list al);