aboutsummaryrefslogtreecommitdiff
path: root/toys/posix
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-11-07 10:32:13 -0800
committerRob Landley <rob@landley.net>2015-11-09 17:37:43 -0600
commit86cef660e4a5a2d9e764486bc62c37a1c75fac6d (patch)
tree3998715540d1e3938e1a598e2b755506fbfd5df5 /toys/posix
parent5c2e1f60d38d6dd389d4b4910ef420d7da87b98a (diff)
downloadtoybox-86cef660e4a5a2d9e764486bc62c37a1c75fac6d.tar.gz
On Android, ps' default output should match toolbox.
Diffstat (limited to 'toys/posix')
-rw-r--r--toys/posix/ps.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/toys/posix/ps.c b/toys/posix/ps.c
index 1e9b54c5..f3ff39bf 100644
--- a/toys/posix/ps.c
+++ b/toys/posix/ps.c
@@ -630,6 +630,8 @@ void ps_main(void)
al.arg = "USER:8=UID,PID,PPID,C,STIME,TTY,TIME,CMD";
else if (toys.optflags&FLAG_l)
al.arg = "F,S,UID,PID,PPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD";
+ else if (CFG_TOYBOX_ON_ANDROID)
+ al.arg = "USER,PID,PPID,VSIZE,RSS,WCHAN:10,ADDR:10=PC,S,CMDLINE";
else al.arg = "PID,TTY,TIME,CMD";
comma_args(&al, 0, parse_o);