diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-11-03 09:27:47 -0800 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-11-03 09:27:47 -0800 |
| commit | 359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5 (patch) | |
| tree | 3f6ac361eb39d3f4135547593aab55cf04846aa4 | |
| parent | 24dfaac494de3a31e1cd106becc2b2ad38e13bbe (diff) | |
| parent | cb8c583d493a98cd1499c64e7c68f3ac37ebb7cd (diff) | |
| download | system_core-359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5.zip system_core-359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5.tar.gz system_core-359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5.tar.bz2 | |
resolved conflicts for merge of cb8c583d to stage-aosp-master
Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed
| -rw-r--r-- | toolbox/ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ static int ps_line(int pid, int tid, char *namefilter) 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, "-"); |