cgi-fcgi-interp: prefork: Make name variable

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 96a78ce8ce4a213c1cf7244381846ebefb86a4d5..9cbdcec3f554477d714df0b4ad1be7d92f3b6ddd 100644 (file)
--- a/cprogs/cgi-fcgi-interp.c
+++ b/cprogs/cgi-fcgi-interp.c
@@ -126,6 +126,8 @@
 
 static const char *stage2;
 
+const char our_name[] = "cgi-fcgi-interp";
+
 const struct cmdinfo cmdinfos[]= {
   { "help",   0, .call=of_help                                         },
   { 0, 'g',   1,                    .sassignto= &ident                 },

diff --git a/cprogs/prefork.c b/cprogs/prefork.c
index 5b6c75ba7434ad71ae74a750bf2b43b03aff00af..e352238973e6736c3f24560728d2047ff84748f7 100644 (file)
--- a/cprogs/prefork.c
+++ b/cprogs/prefork.c
@@ -33,7 +33,7 @@ void vmsgcore(int estatus, int errnoval, const char *fmt, va_list al) {
     vsyslog(LOG_ERR, fmt_use, al);
     free(fmt_free);
   } else {
-    fputs("cgi-fcgi-interp: ",stderr);
+    fprintf(stderr, "%s: ", our_name);
     vfprintf(stderr,fmt,al);
     if (errnoval!=-1) fprintf(stderr,": %s",strerror(errnoval));
     fputc('\n',stderr);
@@ -102,7 +102,7 @@ bool find_run_base_var_run(void) {
     warning("%s writeable by group or other, falling back to ~\n", try);
     return 0;
   }
-  run_base = m_asprintf("%s/%s", try, "cgi-fcgi-interp");
+  run_base = m_asprintf("%s/%s", try, our_name);
   return 1;
 }
 
@@ -120,7 +120,7 @@ static bool find_run_base_home(void) {
   if (sizeof(ut.nodename) > 32)
     ut.nodename[32] = 0;
 
-  run_base_mkdir_p = m_asprintf("%s/%s", pw->pw_dir, ".cgi-fcgi-interp");
+  run_base_mkdir_p = m_asprintf("%s/.%s", pw->pw_dir, our_name);
   try = m_asprintf("%s/%s", run_base_mkdir_p, ut.nodename);
   run_base = try;
   return 1;

diff --git a/cprogs/prefork.h b/cprogs/prefork.h
index ef78418c18862aa5c686b5e96cefc195310829b3..a7e1b8373e83b19a12a71c8c61a00c4eda7ee999 100644 (file)
--- a/cprogs/prefork.h
+++ b/cprogs/prefork.h
@@ -41,6 +41,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;