compat: Fix setproctitle on Solaris

diff --git a/compat/setproctitle.c b/compat/setproctitle.c
index 9350e5eedb9ce7e2017ba87ef7df3084d6990179..c1d4d705026900677c62357611c4d9f5d7942611 100644 (file)
--- a/compat/setproctitle.c
+++ b/compat/setproctitle.c
@@ -30,24 +30,28 @@
 #include <string.h>
 
 #include "config.h"
+#include "dhcpcd.h"
 
 #ifdef __sun
 #define SETPROCTITLE_PAD       ' '
+extern const char **environ;
 #else
 #define        SETPROCTITLE_PAD        '\0'
 #endif
 
+static struct dhcpcd_ctx *setproctitle_ctx;
 static int setproctitle_argc;
-static char *setproctitle_argv_last;
+static const char *setproctitle_argv_last;
 static char **setproctitle_argv;
 static char *setproctitle_buf;
 
 int
-setproctitle_init(int argc, char **argv)
+setproctitle_init(struct dhcpcd_ctx *ctx, int argc, char **argv)
 {
        size_t i, len;
        char *p;
 
+       setproctitle_ctx = ctx;
        len = 0;
        for (i = 0; environ[i] != NULL; i++)
                 len += strlen(environ[i]) + 1;
@@ -119,16 +123,20 @@ setproctitle(const char *fmt, ...)
        int i;
 
        len = 0;
-       for (i = 0; i < setproctitle_argc; i++)
-               len += strlen(setproctitle_argv[i]) + 1;
+       for (i = 0; i < setproctitle_ctx->argc; i++) {
+               len += strlen(setproctitle_ctx->argv[i]) + 1;
+       }
 
        if (len > (size_t)(p - setproctitle_argv[0])) {
                p += strlcpy(p, " (", LAST_SIZE);
                for (i = 0; i < setproctitle_argc; i++) {
-                       p += strlcpy(p, setproctitle_argv[i], LAST_SIZE);
+                       p += strlcpy(p, setproctitle_ctx->argv[i], LAST_SIZE);
                        p += strlcpy(p, " ", LAST_SIZE);
                }
        }
+
+       if (*(p - 1) == ' ')
+               *(p - 1) = ')';
 #endif
 
        if (setproctitle_argv_last - p > 0)

diff --git a/compat/setproctitle.h b/compat/setproctitle.h
index 1824994780d7ae7f27238b3453698258a50f3ee2..ede1265078eb284c52726ea82fa8aef04fd1f57c 100644 (file)
--- a/compat/setproctitle.h
+++ b/compat/setproctitle.h
@@ -28,6 +28,8 @@
 #ifndef SETPROCTITLE_H
 #define SETPROCTITLE_H
 
+#include "dhcpcd.h"
+
 #ifndef __printflike
 #if __GNUC__ > 2 || defined(__INTEL_COMPILER)
 #define        __printflike(a, b) __attribute__((format(printf, a, b)))
@@ -36,7 +38,7 @@
 #endif
 #endif /* !__printflike */
 
-int setproctitle_init(int, char **);
+int setproctitle_init(struct dhcpcd_ctx *ctx, int, char **);
 void setproctitle_free(void);
 __printflike(1, 2) void setproctitle(const char *, ...);
 #endif

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index 85d9081f56298460e64e4b58dcdb68f9f32d5e24..0349b14838c7fceac31804850069f8534e52ae2e 100644 (file)
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -2026,7 +2026,7 @@ printpidfile:
        ctx.options |= DHCPCD_STARTED;
 
 #ifdef SETPROCTITLE_H
-       setproctitle_init(argc, argv);
+       setproctitle_init(&ctx, argc, argv);
 #endif
        setproctitle("%s%s%s",
            ctx.options & DHCPCD_MASTER ? "[master]" : argv[optind],