diff options
author | Rob Landley <rob@landley.net> | 2016-05-24 16:17:55 -0500 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2016-05-24 16:17:55 -0500 |
commit | f82c739dee7fc3015b704d5d045726c3e70b02aa (patch) | |
tree | bc03b95e50d5974473e1b3d55e403b85472b3032 /toys/posix | |
parent | e2ea4fc86b67b70b18df8bc27fcf4ec160d3ff7d (diff) | |
download | toybox-f82c739dee7fc3015b704d5d045726c3e70b02aa.tar.gz |
The "show parent command path" commit changed the criteria for active nodes,
and the collate logic wasn't updated. (Oops.)
Diffstat (limited to 'toys/posix')
-rw-r--r-- | toys/posix/ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toys/posix/ps.c b/toys/posix/ps.c index 4f8d75a9..b204962b 100644 --- a/toys/posix/ps.c +++ b/toys/posix/ps.c @@ -1075,8 +1075,8 @@ static struct carveup **collate_leaves(struct carveup **tb, struct dirtree *dt) while (dt) { struct dirtree *next = dt->next; + if (dt->extra) *(tb++) = (void *)dt->extra; if (dt->child) tb = collate_leaves(tb, dt->child); - else *(tb++) = (void *)dt->extra; free(dt); dt = next; } |