diff options
author | Rob Landley <rob@landley.net> | 2018-01-24 15:10:44 -0600 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2018-01-24 15:10:44 -0600 |
commit | 03b83ee148b62fe56aa834a0e0c96352d34ef587 (patch) | |
tree | 82bc90ae36971034a4ceab1f28666a0060e3fdeb /toys/posix | |
parent | 1fec45a2a57f431bef990b7a17449f7ff96cac30 (diff) | |
download | toybox-03b83ee148b62fe56aa834a0e0c96352d34ef587.tar.gz |
Revert the ps -T thing until I understand what Elliott wants.
Diffstat (limited to 'toys/posix')
-rw-r--r-- | toys/posix/ps.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/toys/posix/ps.c b/toys/posix/ps.c index 7741dcd3..fd9b54bc 100644 --- a/toys/posix/ps.c +++ b/toys/posix/ps.c @@ -680,11 +680,8 @@ static int get_ps(struct dirtree *new) memset(slot, 0, sizeof(tb->slot)); tb->slot[SLOT_tid] = *slot = atol(new->name); - if (TT.threadparent && TT.threadparent->extra) { - *slot = *(((struct carveup *)TT.threadparent->extra)->slot); - // Parent also shows up as a thread, discard duplicate - if (*slot == tb->slot[SLOT_tid]) return 0; - } + if (TT.threadparent && TT.threadparent->extra) + if (*slot == *(((struct carveup *)TT.threadparent->extra)->slot)) return 0; fd = dirtree_parentfd(new); len = 2048; |