diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-17 18:39:36 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-17 18:39:36 +0000 |
| commit | 3b3ca113ed00a6781a28172bb3a6860a5f79ea02 (patch) | |
| tree | 7834909b21af2b0fdbb7c3c52dc3fef12ba0c051 /procps/pgrep.c | |
| parent | 18875bf772d72c9c543be8f9ab46dec451f547ea (diff) | |
| download | busybox-w32-3b3ca113ed00a6781a28172bb3a6860a5f79ea02.tar.gz busybox-w32-3b3ca113ed00a6781a28172bb3a6860a5f79ea02.tar.bz2 busybox-w32-3b3ca113ed00a6781a28172bb3a6860a5f79ea02.zip | |
pidof/killall: allow find_pid_by_name to find running
processes started as scripts_with_name_longer_than_15_bytes.sh
closes bug 4054 (and is generally neat)
Diffstat (limited to 'procps/pgrep.c')
| -rw-r--r-- | procps/pgrep.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/procps/pgrep.c b/procps/pgrep.c index 7b3cd8e50..0e8e5294e 100644 --- a/procps/pgrep.c +++ b/procps/pgrep.c | |||
| @@ -111,8 +111,15 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv) | |||
| 111 | if (proc->pid == pid) | 111 | if (proc->pid == pid) |
| 112 | continue; | 112 | continue; |
| 113 | cmd = proc->argv0; | 113 | cmd = proc->argv0; |
| 114 | if (!cmd) | 114 | if (!cmd) { |
| 115 | cmd = proc->comm; | 115 | cmd = proc->comm; |
| 116 | } else { | ||
| 117 | int i = proc->argv_len; | ||
| 118 | while (i) { | ||
| 119 | if (!cmd[i]) cmd[i] = ' '; | ||
| 120 | i--; | ||
| 121 | } | ||
| 122 | } | ||
| 116 | /* NB: OPT_INVERT is always 0 or 1 */ | 123 | /* NB: OPT_INVERT is always 0 or 1 */ |
| 117 | if ((regexec(&re_buffer, cmd, 1, re_match, 0) == 0 /* match found */ | 124 | if ((regexec(&re_buffer, cmd, 1, re_match, 0) == 0 /* match found */ |
| 118 | && (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == (regoff_t)strlen(cmd)))) ^ OPT_INVERT | 125 | && (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == (regoff_t)strlen(cmd)))) ^ OPT_INVERT |