commit 359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5
author Dmitriy Ivanov <dimitry@google.com> Mon Nov 03 09:27:47 2014 -0800
committer Dmitriy Ivanov <dimitry@google.com> Mon Nov 03 09:27:47 2014 -0800
tree 3f6ac361eb39d3f4135547593aab55cf04846aa4
parent 24dfaac494de3a31e1cd106becc2b2ad38e13bbe
parent cb8c583d493a98cd1499c64e7c68f3ac37ebb7cd

resolved conflicts for merge of cb8c583d to stage-aosp-master

Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed

toolbox/ps.c

diff --git a/toolbox/ps.c b/toolbox/ps.c
index 5458f6b..4f001b8 100644
--- a/toolbox/ps.c
+++ b/toolbox/ps.c
@@ -147,7 +147,7 @@
         strcpy(user,pw->pw_name);
     }
 
-    if(!namefilter || !strncmp(name, namefilter, strlen(namefilter))) {
+    if(!namefilter || !strncmp(cmdline[0] ? cmdline : name, namefilter, strlen(namefilter))) {
         if (display_flags & SHOW_MACLABEL) {
             fd = open(macline, O_RDONLY);
             strcpy(macline, "-");