commit 44f831b3db6a6428918d1011bfc689bfd3e81411
author Dmitriy Ivanov <dimitry@google.com> Mon Nov 03 17:46:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 03 17:46:57 2014 +0000
tree 7d56e04e178b6b652bfb0e152a8f005fc2e31546
parent 043cfc08c56c6aba496f149a55ddff2e9212f332
parent e4d7eaab9750bd194d756a36d154b1b8fff8d5f9

am e4d7eaab: am 359d58dc: resolved conflicts for merge of cb8c583d to stage-aosp-master

* commit 'e4d7eaab9750bd194d756a36d154b1b8fff8d5f9':
  Fix ps <process name>

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, "-");