lib: Move addition of program_name to proctitle_set

Signed-off-by: Ed Maste <emaste@adaranet.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/command-line.c b/lib/command-line.c
index 76a4e748e25b764ba6519d69966e7fdbb8836956..07935d6ae376107669c669639922da763ca9c7bb 100644 (file)
--- a/lib/command-line.c
+++ b/lib/command-line.c
@@ -140,8 +140,8 @@ proctitle_init(int argc, char **argv)
     }
 }
 
-/* Changes the name of the process, as shown by "ps", to 'format', which is
- * formatted as if by printf(). */
+/* Changes the name of the process, as shown by "ps", to the program name
+ * followed by 'format', which is formatted as if by printf(). */
 void
 proctitle_set(const char *format, ...)
 {
@@ -157,7 +157,10 @@ proctitle_set(const char *format, ...)
     }
 
     va_start(args, format);
-    n = vsnprintf(argv_start, argv_size, format, args);
+    n = snprintf(argv_start, argv_size, "%s: ", program_name);
+    if (n < argv_size) {
+        n += vsnprintf(argv_start + n, argv_size - n, format, args);
+    }
     if (n >= argv_size) {
         /* The name is too long, so add an ellipsis at the end. */
         strcpy(&argv_start[argv_size - 4], "...");

diff --git a/lib/daemon.c b/lib/daemon.c
index 84ed6147169e6bddf57cda35f28cd591c2046ee3..71f6f81158542a957405827e0f2b7947c3492536 100644 (file)
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -385,9 +385,8 @@ monitor_daemon(pid_t daemon_pid)
         int retval;
         int status;
 
-        proctitle_set("%s: monitoring pid %lu (%s)",
-                      program_name, (unsigned long int) daemon_pid,
-                      status_msg);
+        proctitle_set("monitoring pid %lu (%s)",
+                      (unsigned long int) daemon_pid, status_msg);
 
         do {
             retval = waitpid(daemon_pid, &status, 0);

diff --git a/lib/worker.c b/lib/worker.c
index bc448855921d2133b76efa9073eda47ffe1da2fb..f2b896e881f64b7ea8962b134a9ea62317dd874a 100644 (file)
--- a/lib/worker.c
+++ b/lib/worker.c
@@ -335,8 +335,7 @@ worker_main(int fd)
     server_sock = fd;
 
     subprogram_name = "worker";
-    proctitle_set("%s: worker process for pid %lu",
-                  program_name, (unsigned long int) getppid());
+    proctitle_set("worker process for pid %lu", (unsigned long int) getppid());
     VLOG_INFO("worker process started");
 
     rxbuf_init(&rx);