commit 29ea5654e3a13a0cedd759c97df22dd70027cb8c
author Jorge Lucangeli Obes <jorgelo@google.com> Mon Apr 25 23:27:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 25 23:27:00 2016 +0000
tree b0ae01fd776e0915684991bacdf72ac2bb1b906a
parent e5100e66775df8895e90588f203074ca405ea97e
parent 47f808d09f3f2ecfff62dfb6ff57090ff106469a

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

* commit '47f808d09f3f2ecfff62dfb6ff57090ff106469a':
  Fix 'ps --ppid'.

Change-Id: I13711e1883a65ccb0833644f34fa9921b50ee5ba

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