emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pgrep: fix "pgrep -v -P1"; also allow matching of comm - closes 10086

Browse Source 
function                                             old     new   delta
pgrep_main                                           662     720     +58

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-21 17:43:14 +02:00
parent 67d42dfdea
commit 578008a989
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
procps/pgrep.c
View File

@ -155,15 +155,18 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
proc = NULL; proc = NULL;
while ((proc = procps_scan(proc, scan_mask)) != NULL) { while ((proc = procps_scan(proc, scan_mask)) != NULL) {
char *cmd; char *cmd;
int cmdlen; int cmdlen, match;
if (proc->pid == pid) if (proc->pid == pid)
continue; continue;
if (ppid2match >= 0 && ppid2match != proc->ppid) if (!OPT_INVERT) {
continue; /* Quickly reject -sN -PN mismatches... unless -v */
if (sid2match >= 0 && sid2match != proc->sid) if (ppid2match >= 0 && ppid2match != proc->ppid)
continue; continue;
if (sid2match >= 0 && sid2match != proc->sid)
continue;
}
cmdlen = -1; cmdlen = -1;
cmd = proc->argv0; cmd = proc->argv0;
@ -186,12 +189,36 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
} }
} }
if (OPT_INVERT) {
/* "pgrep -v -P1 firefox" means "not (ppid=1 AND name=firefox)"
* or equivalently "ppid!=1 OR name!=firefox".
* Check the first condition and if true, skip matching.
*/
if (ppid2match >= 0 && ppid2match != proc->ppid)
goto got_it;
if (sid2match >= 0 && sid2match != proc->sid)
goto got_it;
}
match = !argv[0]; /* if no PATTERN, then it's a match, else... */
if (!match) {
again:
match = (regexec(&re_buffer, cmd, 1, re_match, 0) == 0);
if (!match && cmd != proc->comm) {
/* if argv[] did not match, try comm */
cmdlen = -1;
cmd = proc->comm;
goto again;
}
if (match && OPT_ANCHOR) {
/* -x requires full string match */
match = (re_match[0].rm_so == 0 && cmd[re_match[0].rm_eo] == '\0');
}
}
/* NB: OPT_INVERT is always 0 or 1 */ /* NB: OPT_INVERT is always 0 or 1 */
if (!argv[0] if (match ^ OPT_INVERT) {
|| (regexec(&re_buffer, cmd, 1, re_match, 0) == 0 /* match found */ got_it:
&& (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == (regoff_t)strlen(cmd)))
) ^ OPT_INVERT
) {
matched_pid = proc->pid; matched_pid = proc->pid;
if (OPT_LAST) { if (OPT_LAST) {
free(cmd_last); free(cmd_last);