commit d5d8407a5b780b98e186ae1e7397563c548e0f5c
author Jorge Lucangeli Obes <jorgelo@google.com> Mon Apr 25 23:21:56 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 25 23:21:56 2016 +0000
tree b0ae01fd776e0915684991bacdf72ac2bb1b906a
parent 12a0bd2164045af969720471f1098acf0ec19b09
parent 8d2d8eab860d2595328deb7b99cd2ef1d71d9b27

Merge "Fix 'ps --ppid'."

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