Merge remote-tracking branch 'toybox/master' into HEADandroid-wear-8.0.0_r1

Change-Id: I2e776e6091f09fed27fa83715d8f46460c75b73f

2 files changed, 4 insertions, 7 deletions

diff --git a/tests/losetup.test b/tests/losetup.test
index 651c6933..c9292503 100755
--- a/tests/losetup.test
+++ b/tests/losetup.test
@@ -13,8 +13,8 @@ fi
 
 truncate -s 1M blah.img &&
 FILE="$(readlink -f blah.img)"
-DEV="$(printf '%04d' $(stat -t blah.img | awk '{print $7}'))"
-NODE="$(awk '{print $7}')"
+DEV="$(printf '%04s' $(stat -t blah.img | awk '{print $7}'))"
+NODE="$(stat -t blah.img | awk '{print $8}')"
 
 losetup -f 
 losetup -f -s
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;