diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-11-03 17:38:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-03 17:38:04 +0000 |
| commit | e4d7eaab9750bd194d756a36d154b1b8fff8d5f9 (patch) | |
| tree | 312c171cc5afc429c410ff580b77a423ef4d0aa0 /toolbox | |
| parent | 1935663248f9c84ce3f1fd8f9a9b15b0e38ddc70 (diff) | |
| parent | 359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5 (diff) | |
| download | system_core-e4d7eaab9750bd194d756a36d154b1b8fff8d5f9.zip system_core-e4d7eaab9750bd194d756a36d154b1b8fff8d5f9.tar.gz system_core-e4d7eaab9750bd194d756a36d154b1b8fff8d5f9.tar.bz2 | |
am 359d58dc: resolved conflicts for merge of cb8c583d to stage-aosp-master
* commit '359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5':
Fix ps <process name>
Diffstat (limited to 'toolbox')
| -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, "-"); |