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

pidof/killall: allow find_pid_by_name to find running

Browse Source 
processes started as scripts_with_name_longer_than_15_bytes.sh
 closes bug 4054 (and is generally neat)
This commit is contained in:
Denis Vlasenko
2008-07-17 18:39:36 +00:00
parent 18875bf772
commit 3b3ca113ed
5 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
procps/pgrep.c
View File

@@ -111,8 +111,15 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
if (proc->pid == pid)
continue;
cmd = proc->argv0;
if (!cmd)
if (!cmd) {
cmd = proc->comm;
} else {
int i = proc->argv_len;
while (i) {
if (!cmd[i]) cmd[i] = ' ';
i--;
}
}
/* NB: OPT_INVERT is always 0 or 1 */
if ((regexec(&re_buffer, cmd, 1, re_match, 0) == 0 /* match found */
&& (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == (regoff_t)strlen(cmd)))) ^ OPT_INVERT

4
procps/pidof.c
View File

@@ -22,7 +22,6 @@ int pidof_main(int argc UNUSED_PARAM, char **argv)
unsigned first = 1;
unsigned opt;
#if ENABLE_FEATURE_PIDOF_OMIT
char ppid_str[sizeof(int)*3 + 1];
llist_t *omits = NULL; /* list of pids to omit */
opt_complementary = "o::";
#endif
@@ -39,8 +38,7 @@ int pidof_main(int argc UNUSED_PARAM, char **argv)
while (omits_p) {
/* are we asked to exclude the parent's process ID? */
if (strcmp(omits_p->data, "%PPID") == 0) {
sprintf(ppid_str, "%u", (unsigned)getppid());
omits_p->data = ppid_str;
omits_p->data = utoa((unsigned)getppid());
}
omits_p = omits_p->link;
}