Implement sendmail semantics for setproctitle()

Prefix the title with "progname: ", and skip it if the format string
starts with '-' (which gets skipped on output too).

diff --git a/src/setproctitle.c b/src/setproctitle.c
index 18177399879c9110d418e1ab2b65285a23c86dc7..969f2665ebb8f6e3ecce351b83f1253dc64c54ab 100644 (file)
--- a/src/setproctitle.c
+++ b/src/setproctitle.c
@@ -203,8 +203,18 @@ setproctitle(const char *fmt, ...)
                return;
 
        if (fmt) {
+               if (fmt[0] == '-') {
+                       /* Skip program name prefix. */
+                       fmt++;
+                       len = 0;
+               } else {
+                       /* Print program name heading for grep. */
+                       snprintf(buf, sizeof(buf), "%s: ", getprogname());
+                       len = strlen(buf);
+               }
+
                va_start(ap, fmt);
-               len = vsnprintf(buf, sizeof(buf), fmt, ap);
+               len += vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);
                va_end(ap);
        } else {
                len = snprintf(buf, sizeof(buf), "%s", SPT.arg0);