Ticket #39: setproctitle-solaris.patch

frontends/ovdb_init.c

@@ -455 +455 @@
         case 0:
             setsid();
             execl(concatpath(innconf->pathbin, "ovdb_monitor"),
-                "ovdb_monitor", SPACES, NULL);
+                OVDB_M, NULL);
             syswarn("cannot exec ovdb_monitor");
             _exit(1);
         }
@@ -472 +472 @@
             case 0:
                 setsid();
                 execl(concatpath(innconf->pathbin, "ovdb_server"),
-                    "ovdb_server", SPACES, NULL);
+                    OVDB_S, NULL);
                 syswarn("cannot exec ovdb_server");
                 _exit(1);
             }

frontends/ovdb_monitor.c

@@ -283 +283 @@
 }
 
 
-int main(int argc, char **argv)
+int main(int argc, char *argv[], char *envp[])
 {
     char *pidfile;
 
-    setproctitle_init(argc, argv);
+    setproctitle_init(argc, argv, envp);
 
     openlog("ovdb_monitor", L_OPENLOG_FLAGS | LOG_PID, LOG_INN_PROG);
     message_program_name = "ovdb_monitor";
 
-    if(argc != 2 || strcmp(argv[1], SPACES))
+    if(argc != 1 || strcmp(argv[0], OVDB_M))
         die("should be started by ovdb_init");
     message_handlers_warn(1, message_log_syslog_err);
     message_handlers_die(1, message_log_syslog_err);

frontends/ovdb_server.c

@@ -607 +607 @@
 }
 
 int
-main(int argc, char *argv[])
+main(int argc, char *argv[], char *envp[])
 {
     int i, ret;
     socklen_t salen;
@@ -620 +620 @@
     struct timeval tv;
     fd_set rdset;
 
-    setproctitle_init(argc, argv);
+    setproctitle_init(argc, argv, envp);
 
     openlog("ovdb_server", L_OPENLOG_FLAGS | LOG_PID, LOG_INN_PROG);
     message_program_name = "ovdb_server";
 
-    if(argc != 2 || strcmp(argv[1], SPACES))
+    if(argc != 1 || strcmp(argv[0], OVDB_S))
         die("should be started by ovdb_init");
     message_handlers_warn(1, message_log_syslog_err);
     message_handlers_die(1, message_log_syslog_err);

include/portable/setproctitle.h

@@ -17 +17 @@
 #endif
 
 #if HAVE_SETPROCTITLE || HAVE_PSTAT
-# define setproctitle_init(argc, argv)   /* empty */
+# define setproctitle_init(argc, argv, envp)   /* empty */
 #else
-void setproctitle_init(int argc, char *argv[]);
+void setproctitle_init(int argc, char *argv[], char *envp[]);
 #endif
 
 #endif /* !PORTABLE_SETPROCTITLE_H */

innd/rc.c

@@ -448 +448 @@
 void
 RChandoff(int fd, HANDOFF h)
 {
-    const char *argv[6];
+    const char *argv[5];
     char buff[SMBUF];
     int i;
 
@@ -472 +472 @@
     case HOnnrpd:       argv[0] = RCnnrpd;      break;
     case HOnntpd:       argv[0] = RCnntpd;      break;
     }
-    argv[1] = "-s                                                ";
-    i = 2;
+    i = 1;
     if (NNRPReason) {
         snprintf(buff, sizeof(buff), "-r%s", NNRPReason);
         argv[i++] = buff;

lib/setproctitle.c

@@ -47 +47 @@
 
 static char *title_start = NULL;
 static char *title_end = NULL;
+static char **xargv = NULL;
 
 void
-setproctitle_init(int argc, char *argv[])
+setproctitle_init(int argc, char *argv[], char *envp[])
 {
+    int i;
+    char **xenv;
+    extern char **environ;
+
     title_start = argv[0];
     title_end = argv[argc - 1] + strlen(argv[argc - 1]) - 1;
+
+    xargv = argv;
+    if (!envp)
+        return;
+
+    if (environ) {
+        for (i=0; environ[i]; i++)
+            ;
+        xenv = malloc((i+1) * sizeof(char*));
+        if (!xenv)
+            return;
+        for (i=0; environ[i]; i++) {
+            xenv[i] = strdup(environ[i]);
+            if (!xenv[i]) {
+                for (i--; i >= 0; i--)
+                    free(xenv[i]);
+                free(xenv);
+                return;
+            }
+        }
+        xenv[i] = NULL;
+        environ = xenv;
+    }
+
+    for (i=0; envp[i]; i++)
+        title_end += strlen(envp[i]) + 1;
+
 }
 
 void
@@ -68 +100 @@
         return;
     }
 
+    xargv[1] = NULL;
+
     /* setproctitle prepends the program name to its arguments.  Our emulation
        should therefore do the same thing.  However, some operating systems
        seem to do that automatically even when we completely overwrite argv,

nnrpd/nnrpd.c

@@ -783 +783 @@
 
 /* ARGSUSED0 */
 int
-main(int argc, char *argv[])
+main(int argc, char *argv[], char *envp[])
 {
     const char *name;
     CMDENT              *cp;
@@ -829 +829 @@
 
     int respawn = 0;
 
-    setproctitle_init(argc, argv);
+    setproctitle_init(argc, argv, envp);
 
     /* Parse arguments.   Must xstrdup() optarg if used because setproctitle may
        clobber it! */

storage/ovdb/ovdb-private.h

@@ -112 +112 @@
 #define OVDB_LOCKFN "ovdb.sem"
 #define OVDB_MONITOR_PIDFILE "ovdb_monitor.pid"
 #define OVDB_SERVER_PIDFILE "ovdb_server.pid"
-#define SPACES "                "
+#define OVDB_M "ovdb_monitor "
+#define OVDB_S "ovdb_server "
 
 /* read server stuff */
 #define CMD_QUIT        0x01