diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-10 06:32:01 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-10 06:32:01 +0000 |
| commit | af99227be8882f0d1fbf5657e2c55842f26a2b77 (patch) | |
| tree | 912b229024b8f7ce94a155fff410826214e2dac2 /bin/ps | |
| parent | b651e4381337718aa610e2d6ee76d3b65f2beeb8 (diff) | |
1.36 and onwards did not print extra spaces, but sometimes skipped spaces.
we need a proper flag to keep track of space insert requirements
thanks for further testing by millert
Diffstat (limited to 'bin/ps')
| -rw-r--r-- | bin/ps/print.c | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/bin/ps/print.c b/bin/ps/print.c index d718665a737..bb56e9d955c 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.38 2005/07/06 21:41:24 millert Exp $ */ +/* $OpenBSD: print.c,v 1.39 2006/03/10 06:32:00 deraadt Exp $ */ /* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.38 2005/07/06 21:41:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.39 2006/03/10 06:32:00 deraadt Exp $"; #endif #endif /* not lint */ @@ -103,7 +103,7 @@ void command(const struct kinfo_proc2 *kp, VARENT *ve) { VAR *v; - int left; + int left, wantspace = 0; char **argv, **p; v = ve->var; @@ -120,10 +120,12 @@ command(const struct kinfo_proc2 *kp, VARENT *ve) argv = kvm_getenvv2(kd, kp, termwidth); if ((p = argv) != NULL) { while (*p) { - if (p != argv) - fmt_putc(' ', &left); fmt_puts(*p, &left); p++; + if (*p) + fmt_putc(' ', &left); + else + wantspace = 1; } } } else @@ -133,28 +135,45 @@ command(const struct kinfo_proc2 *kp, VARENT *ve) if (kd != NULL) { argv = kvm_getargv2(kd, kp, termwidth); if ((p = argv) != NULL) { + if (wantspace) { + fmt_putc(' ', &left); + wantspace = 0; + } while (*p) { - if (p != argv) - fmt_putc(' ', &left); fmt_puts(*p, &left); p++; + if (*p) + fmt_putc(' ', &left); + else + wantspace = 1; } } } if (argv == NULL || argv[0] == '\0' || strcmp(cmdpart(argv[0]), kp->p_comm)) { - if (argv != NULL && argv[0] != '\0') + if (wantspace) { fmt_putc(' ', &left); + wantspace = 0; + } fmt_putc('(', &left); fmt_puts(kp->p_comm, &left); fmt_putc(')', &left); } } else { + if (wantspace) { + fmt_putc(' ', &left); + wantspace = 0; + } fmt_puts(kp->p_comm, &left); } } - if (ve->next && left > 0) + if (ve->next && left > 0) { + if (wantspace) { + fmt_putc(' ', &left); + wantspace = 0; + } printf("%*s", left, ""); + } } void |