aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2018-01-24 21:10:44 (GMT)
committerRob Landley <rob@landley.net>2018-01-24 21:10:44 (GMT)
commit03b83ee148b62fe56aa834a0e0c96352d34ef587 (patch)
tree82bc90ae36971034a4ceab1f28666a0060e3fdeb
parent1fec45a2a57f431bef990b7a17449f7ff96cac30 (diff)
downloadandroid_external_toybox-03b83ee148b62fe56aa834a0e0c96352d34ef587.zip
android_external_toybox-03b83ee148b62fe56aa834a0e0c96352d34ef587.tar.gz
android_external_toybox-03b83ee148b62fe56aa834a0e0c96352d34ef587.tar.bz2
Revert the ps -T thing until I understand what Elliott wants.
-rw-r--r--toys/posix/ps.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/toys/posix/ps.c b/toys/posix/ps.c
index 7741dcd..fd9b54b 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;