prefork: Remove a wrong check

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

diff --git a/cprogs/prefork.c b/cprogs/prefork.c
index 5b6c75ba7434ad71ae74a750bf2b43b03aff00af..f306ffc9a2653196fd068787436367cab09cb06b 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;
@@ -334,7 +334,6 @@ const char *process_opts(int argc, const char *const *argv) {
 
     shbang_opts(&split_argv, cmdinfos);
     /* sets interp */
-    if (!split_argv) badusage("combined arg too many non-option arguments");
   } else {
     shbang_opts(&argv, cmdinfos);
   }