From: Elliott Hughes <enh@google.com>
Date: Tue, 11 Oct 2016 20:03:50 +0000 (-0700)
Subject: Stop renaming the ADDR field to PC on Android.
X-Git-Tag: android-x86-8.1-r1~32^2^2^2^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a6d31707720cd51c03a722e057acab6c1b959d6;p=android-x86%2Fexternal-toybox.git

Stop renaming the ADDR field to PC on Android.

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).
---

diff --git a/toys/posix/ps.c b/toys/posix/ps.c
index cb57ecf2..15acc84f 100644
--- 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,");