Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4d7eaab authored by Dmitriy Ivanov's avatar Dmitriy Ivanov Committed by Android Git Automerger
Browse files

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

* commit '359d58dc':
  Fix ps <process name>
parents 19356632 359d58dc

toolbox/ps.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ static int ps_line(int pid, int tid, char *namefilter) 
        strcpy(user,pw->pw_name);

        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) {

        if (display_flags & SHOW_MACLABEL) {

            fd = open(macline, O_RDONLY);

            fd = open(macline, O_RDONLY);

            strcpy(macline, "-");

            strcpy(macline, "-");