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

- Move 'showthreads' check out of fmt.c.

Browse Source 
- Update shadow copy of fmt_argv() prototype in w.c and fix calls for
  additional parameter.
This commit is contained in:
John Baldwin 2013-01-19 00:21:55 +00:00
parent c3a1bb32f4
commit 9f0b6e5e27
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ps/fmt.c
View File

@ -123,7 +123,7 @@ fmt_argv(char **argv, char *cmd, char *thread, size_t maxlen)
if (cp == NULL)
errx(1, "malloc failed");
if (ap == NULL) {
if (showthreads && thread != NULL) {
if (thread != NULL) {
asprintf(&ap, "%s/%s", cmd, thread);
sprintf(cp, "[%.*s]", (int)maxlen, ap);
free(ap);

2
bin/ps/ps.c
View File

@ -1168,7 +1168,7 @@ fmt(char **(*fn)(kvm_t *, const struct kinfo_proc *, int), KINFO *ki,
const char *s;
s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm,
ki->ki_p->ki_numthreads > 1 ? thread : NULL, maxlen);
showthreads && ki->ki_p->ki_numthreads > 1 ? thread : NULL, maxlen);
return (s);
}

7
usr.bin/w/w.c
View File

@ -96,7 +96,6 @@ static int nflag; /* true if -n flag: don't convert addrs */
static int dflag; /* true if -d flag: output debug info */
static int sortidle; /* sort by idle time */
int use_ampm; /* use AM/PM time */
int showthreads = 0;/* will threads be shown? */
static int use_comma; /* use comma as floats separator */
static char **sel_users; /* login array of particular users selected */
@ -124,7 +123,7 @@ static struct stat *ttystat(char *);
static void usage(int);
static int this_is_uptime(const char *s);
char *fmt_argv(char **, char *, int); /* ../../bin/ps/fmt.c */
char *fmt_argv(char **, char *, char *, size_t); /* ../../bin/ps/fmt.c */
int
main(int argc, char *argv[])
@ -321,7 +320,7 @@ main(int argc, char *argv[])
continue;
}
ep->args = fmt_argv(kvm_getargv(kd, ep->kp, argwidth),
ep->kp->ki_comm, MAXCOMLEN);
ep->kp->ki_comm, NULL, MAXCOMLEN);
if (ep->args == NULL)
err(1, NULL);
}
@ -405,7 +404,7 @@ main(int argc, char *argv[])
const char *ptr;
ptr = fmt_argv(kvm_getargv(kd, dkp, argwidth),
dkp->ki_comm, MAXCOMLEN);
dkp->ki_comm, NULL, MAXCOMLEN);
if (ptr == NULL)
ptr = "-";
(void)printf("\t\t%-9d %s\n",