diff options
| -rw-r--r-- | toys/posix/ps.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/toys/posix/ps.c b/toys/posix/ps.c index def81c55..6a9676c0 100644 --- a/toys/posix/ps.c +++ b/toys/posix/ps.c @@ -443,13 +443,24 @@ static char *string_field(struct carveup *tb, struct strawberry *field) sl *= -1; // First string slot has offset 0, others are offset[-slot-2] if (--sl) out += tb->offset[--sl]; + // If TNAME is blank, show ARGS instead + if (which==PS_ARGS && !*out) + out = tb->str+tb->offset[-2-typos[which = PS_ARGS].slot]; if (which==PS_ARGS || which==PS_NAME) { - int i; + int i, j; s = out; for (i = 0; (which==PS_ARGS) ? i < slot[SLOT_argv0len] : out[i]; i++) if (out[i] == '/') s = out+i+1; + i = s - out; out = s; + if (which != field->which) { + j = slot[SLOT_argv0len]-i; + if (j > 259) j = 259; + memcpy(buf, out+i, j); + buf[j] = 0; + out = buf; + } } if (which>=PS_COMM && !*out) sprintf(out = buf, "[%s]", tb->str); |