OSDN Git Service
(root)
/
android-x86
/
external-toybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4e867b8
)
Stop renaming the ADDR field to PC on Android.
author
Elliott Hughes
<enh@google.com>
Tue, 11 Oct 2016 20:03:50 +0000
(13:03 -0700)
committer
Rob Landley
<rob@landley.net>
Wed, 12 Oct 2016 21:16:01 +0000
(16:16 -0500)
It's causing confusion, and it's not obvious that anyone's relying on
it (and even if they are, let's try to find and fix them first).
toys/posix/ps.c
patch
|
blob
|
history
diff --git
a/toys/posix/ps.c
b/toys/posix/ps.c
index
cb57ecf
..
15acc84
100644
(file)
--- a/
toys/posix/ps.c
+++ b/
toys/posix/ps.c
@@
-1185,7
+1185,7
@@
void ps_main(void)
not_o = "F,S,UID,%sPPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD";
else if (CFG_TOYBOX_ON_ANDROID)
sprintf(not_o = toybuf+128,
- "USER,%%sPPID,VSIZE,RSS,WCHAN:10,ADDR:10
=PC
,S,%s",
+ "USER,%%sPPID,VSIZE,RSS,WCHAN:10,ADDR:10,S,%s",
(toys.optflags&FLAG_T) ? "CMD" : "NAME");
sprintf(toybuf, not_o, (toys.optflags & FLAG_T) ? "PID,TID," : "PID,");