Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify and check for snprintf() error.

Browse Source
This commit is contained in:
christos 2008-01-03 04:26:27 +00:00
parent 7ee4122ccd
commit aa33183605
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libc/gen/setproctitle.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: setproctitle.c,v 1.21 2003/07/26 19:24:44 salo Exp $ */
/* $NetBSD: setproctitle.c,v 1.22 2008/01/03 04:26:27 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Christopher G. Demetriou
@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: setproctitle.c,v 1.21 2003/07/26 19:24:44 salo Exp $");
__RCSID("$NetBSD: setproctitle.c,v 1.22 2008/01/03 04:26:27 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -63,19 +63,20 @@ struct ps_strings *__ps_strings;
void
setproctitle(const char *fmt, ...)
{
va_list ap;
static char buf[MAX_PROCTITLE], *bufp;
int used;
const char *pname = getprogname();
va_start(ap, fmt);
if (fmt != NULL) {
used = snprintf(buf, (size_t)MAX_PROCTITLE, "%s: ",
getprogname());
(void)vsnprintf(buf + used, (size_t)(MAX_PROCTITLE - used),
fmt, ap);
int len = snprintf(buf, sizeof(buf), "%s: ", pname);
if (len >= 0) {
va_list ap;
va_start(ap, fmt);
(void)vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);
va_end(ap);
}
} else
(void)snprintf(buf, MAX_PROCTITLE, "%s", getprogname());
va_end(ap);
(void)snprintf(buf, sizeof(buf), "%s", pname);
bufp = buf;