ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed
This commit is contained in:
Dmitriy Ivanov 2014-11-03 09:27:47 -08:00
commit 359d58dc0f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toolbox/ps.c
View file

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