d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the format string passed to setproctitle begins with a '-'

Browse Source 
character, skip the program name when setting the process title.
Ansified with extreme prejudice.

Reviewed by:	peter
This commit is contained in:
Paul Saab 2000-08-01 06:37:09 +00:00
parent b09b009594
commit 305ad8f908
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=64094
4 changed files with 28 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libc/gen/setproctitle.3
View File

@ -47,6 +47,11 @@ result of a
style expansion of the arguments as specified by the
.Va fmt
argument.
If the
.Va fmt
argument begins with a
.Dq -
character, the executable's name is skipped.
.Pp
If
.Va fmt

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

@ -49,24 +49,13 @@ struct old_ps_strings {
#define OLD_PS_STRINGS ((struct old_ps_strings *) \
(USRSTACK - SPARE_USRSPACE - sizeof(struct old_ps_strings)))
#if defined(__STDC__) /* from other parts of sendmail */
#include <stdarg.h>
#else
#include <varargs.h>
#endif
#define SPT_BUFSIZE 2048 /* from other parts of sendmail */
extern char * __progname; /* is this defined in a .h anywhere? */
void
#if defined(__STDC__)
setproctitle(const char *fmt, ...)
#else
setproctitle(fmt, va_alist)
const char *fmt;
va_dcl
#endif
{
static struct ps_strings *ps_strings;
static char buf[SPT_BUFSIZE];
@ -81,24 +70,20 @@ setproctitle(fmt, va_alist)
unsigned long ul_ps_strings;
int oid[4];
#if defined(__STDC__)
va_start(ap, fmt);
#else
va_start(ap);
#endif
if (fmt) {
buf[sizeof(buf) - 1] = '\0';
/* print program name heading for grep */
(void) snprintf(buf, sizeof(buf), "%s: ", __progname);
/*
* can't use return from sprintf, as that is the count of how
* much it wanted to write, not how much it actually did.
*/
len = strlen(buf);
if (fmt[0] == '-') {
/* skip program name prefix */
fmt++;
len = 0;
} else {
/* print program name heading for grep */
(void) snprintf(buf, sizeof(buf), "%s: ", __progname);
len = strlen(buf);
}
/* print the argument string */
(void) vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);

5
lib/libutil/setproctitle.3
View File

@ -47,6 +47,11 @@ result of a
style expansion of the arguments as specified by the
.Va fmt
argument.
If the
.Va fmt
argument begins with a
.Dq -
character, the executable's name is skipped.
.Pp
If
.Va fmt

33
lib/libutil/setproctitle.c
View File

@ -49,24 +49,13 @@ struct old_ps_strings {
#define OLD_PS_STRINGS ((struct old_ps_strings *) \
(USRSTACK - SPARE_USRSPACE - sizeof(struct old_ps_strings)))
#if defined(__STDC__) /* from other parts of sendmail */
#include <stdarg.h>
#else
#include <varargs.h>
#endif
#define SPT_BUFSIZE 2048 /* from other parts of sendmail */
extern char * __progname; /* is this defined in a .h anywhere? */
void
#if defined(__STDC__)
setproctitle(const char *fmt, ...)
#else
setproctitle(fmt, va_alist)
const char *fmt;
va_dcl
#endif
{
static struct ps_strings *ps_strings;
static char buf[SPT_BUFSIZE];
@ -81,24 +70,20 @@ setproctitle(fmt, va_alist)
unsigned long ul_ps_strings;
int oid[4];
#if defined(__STDC__)
va_start(ap, fmt);
#else
va_start(ap);
#endif
if (fmt) {
buf[sizeof(buf) - 1] = '\0';
/* print program name heading for grep */
(void) snprintf(buf, sizeof(buf), "%s: ", __progname);
/*
* can't use return from sprintf, as that is the count of how
* much it wanted to write, not how much it actually did.
*/
len = strlen(buf);
if (fmt[0] == '-') {
/* skip program name prefix */
fmt++;
len = 0;
} else {
/* print program name heading for grep */
(void) snprintf(buf, sizeof(buf), "%s: ", __progname);
len = strlen(buf);
}
/* print the argument string */
(void) vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);