summaryrefslogtreecommitdiff
path: root/openbsd-compat/setproctitle.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2016-08-02 09:44:25 +1000
committerDarren Tucker <dtucker@zip.com.au>2016-08-02 09:44:25 +1000
commitc20dccb5614c5714f4155dda01bcdebf97cfae7e (patch)
tree52a7fb54f19aae274f12f1c9db7eaeb1922137aa /openbsd-compat/setproctitle.c
parent30f9bd1c0963c23bfba8468dfd26aa17609ba42f (diff)
Strip trailing whitespace.
Mechanically strip trailing whitespace on files not synced with OpenBSD (or in the case of bsd-snprint.c, rsync).
Diffstat (limited to 'openbsd-compat/setproctitle.c')
-rw-r--r--openbsd-compat/setproctitle.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index 9f7ca14c2..2b15c6e00 100644
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -76,7 +76,7 @@ compat_init_setproctitle(int argc, char *argv[])
76 76
77 /* 77 /*
78 * NB: This assumes that argv has already been copied out of the 78 * NB: This assumes that argv has already been copied out of the
79 * way. This is true for sshd, but may not be true for other 79 * way. This is true for sshd, but may not be true for other
80 * programs. Beware. 80 * programs. Beware.
81 */ 81 */
82 82
@@ -92,7 +92,7 @@ compat_init_setproctitle(int argc, char *argv[])
92 } 92 }
93 93
94 /* 94 /*
95 * Find the last argv string or environment variable within 95 * Find the last argv string or environment variable within
96 * our process memory area. 96 * our process memory area.
97 */ 97 */
98 for (i = 0; i < argc; i++) { 98 for (i = 0; i < argc; i++) {
@@ -108,8 +108,8 @@ compat_init_setproctitle(int argc, char *argv[])
108 argv_start = argv[0]; 108 argv_start = argv[0];
109 argv_env_len = lastargv - argv[0] - 1; 109 argv_env_len = lastargv - argv[0] - 1;
110 110
111 /* 111 /*
112 * Copy environment 112 * Copy environment
113 * XXX - will truncate env on strdup fail 113 * XXX - will truncate env on strdup fail
114 */ 114 */
115 for (i = 0; envp[i] != NULL; i++) 115 for (i = 0; envp[i] != NULL; i++)
@@ -156,7 +156,7 @@ setproctitle(const char *fmt, ...)
156 pst.pst_command = ptitle; 156 pst.pst_command = ptitle;
157 pstat(PSTAT_SETCMD, pst, strlen(ptitle), 0, 0); 157 pstat(PSTAT_SETCMD, pst, strlen(ptitle), 0, 0);
158#elif SPT_TYPE == SPT_REUSEARGV 158#elif SPT_TYPE == SPT_REUSEARGV
159/* debug("setproctitle: copy \"%s\" into len %d", 159/* debug("setproctitle: copy \"%s\" into len %d",
160 buf, argv_env_len); */ 160 buf, argv_env_len); */
161 len = strlcpy(argv_start, ptitle, argv_env_len); 161 len = strlcpy(argv_start, ptitle, argv_env_len);
162 for(; len < argv_env_len; len++) 162 for(; len < argv_env_len; len++)