prefork: Move STAGE2_VAR back to cgi-fcgi-interp

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

diff --git a/cprogs/prefork.h b/cprogs/prefork.h
index 4cde7770ba077348e22ddb5cfbd0fb0b8e11c04f..ed8e60954b0507189f52b2222b538a11c1a15614 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,8 +40,10 @@ 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;
+extern const char *run_base, *script, *socket_path, *lock_path;
 extern const char *run_base_mkdir_p;
 extern bool logging;
 
@@ -51,6 +52,7 @@ void find_socket_path(void);
 
 bool stab_isnewer(const struct stat *a, const struct stat *b);
 void stab_mtimenow(struct stat *out);
+int acquire_lock(void);
 bool check_garbage_vs(const struct stat *started);
 bool check_garbage(void);
 void tidy_garbage(void);