commit d553522ea6a5729d09d1f14308c4583736012a99
author Jorge Lucangeli Obes <jorgelo@google.com> Mon Apr 25 23:33:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 25 23:33:03 2016 +0000
tree a02768a4fd46c518eda793d9a520c0d128b96981
parent 863585a4c211f230ccd76fabdb825399350f897a
parent 1a835344b7651b9bdd649672e8612cc97d1bbead

Merge "Fix \'ps --ppid\'." am: 47f808d
am: 29ea565

* commit '29ea5654e3a13a0cedd759c97df22dd70027cb8c':
  Fix 'ps --ppid'.

Change-Id: I9484c46010fd4b04de53b44903bb8e0e2a6647a6

toolbox/ps.c

diff --git a/toolbox/ps.c b/toolbox/ps.c
index d366f3e..633c48e 100644
--- a/toolbox/ps.c
+++ b/toolbox/ps.c
@@ -282,6 +282,13 @@
         } else if(!strcmp(argv[1],"--abi")) {
             display_flags |= SHOW_ABI;
         } else if(!strcmp(argv[1],"--ppid")) {
+            if (argc < 3) {
+                /* Bug 26554285: Use printf because some apps require at least
+                 * one line of output to stdout even for errors.
+                 */
+                printf("no ppid\n");
+                return 1;
+            }
             ppid_filter = atoi(argv[2]);
             if (ppid_filter == 0) {
                 /* Bug 26554285: Use printf because some apps require at least