diff options
| author | Elliott Hughes <enh@google.com> | 2018-01-25 16:21:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-25 16:21:17 +0000 |
| commit | 50fab4edc6dfa4f1182908aa83ad1a1ffffb0e00 (patch) | |
| tree | fef59256674c677e0018b90edf6eca86cb1daabc | |
| parent | 3c9362b1a007653a1bf8be250e6d17e93cfea831 (diff) | |
| parent | ba229b4bff5f4a9ebef4a35539911f01706c0b13 (diff) | |
| download | toybox-50fab4edc6dfa4f1182908aa83ad1a1ffffb0e00.tar.gz | |
Merge remote-tracking branch 'toybox/master' into HEAD am: e77711bf80
am: ba229b4bff
Change-Id: Icb9e8e4fea3873aa764b1b329dbcb71da59cdc03
| -rwxr-xr-x | tests/losetup.test | 4 | ||||
| -rw-r--r-- | toys/posix/ps.c | 7 |
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; |