midfavila
/
ubase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

pidof: match on full name and basename 

busybox doesn't do this, but procps does.
This commit is contained in:
Hiltjo Posthuma 2014-07-05 12:50:18 +00:00 committed by sin
parent 55dd1076fe
commit 5a06a9f7e1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pidof.c
View File

@ -33,7 +33,7 @@ main(int argc, char *argv[])
struct dirent *entry; struct dirent *entry;
pid_t pid; pid_t pid;
struct procstat ps; struct procstat ps;
char cmdline[BUFSIZ], *cmd, *p, *arg = NULL; char cmdline[BUFSIZ], *cmd, *cmdbase = NULL, *p, *arg = NULL;
int i, found = 0; int i, found = 0;
int sflag = 0, oflag = 0; int sflag = 0, oflag = 0;
struct pidentry *pe, *tmp; struct pidentry *pe, *tmp;
@ -83,16 +83,19 @@ main(int argc, char *argv[])
if (parsecmdline(ps.pid, cmdline, if (parsecmdline(ps.pid, cmdline,
sizeof(cmdline)) < 0) { sizeof(cmdline)) < 0) {
cmd = ps.comm; cmd = ps.comm;
cmdbase = cmd;
} else { } else {
if ((p = strchr(cmdline, ' '))) if ((p = strchr(cmdline, ' ')))
*p = '\0'; *p = '\0';
cmd = basename(cmdline); cmd = cmdline;
cmdbase = basename(cmdline);
} }
/* Workaround for login shells */ /* Workaround for login shells */
if (cmd[0] == '-') if (cmd[0] == '-')
cmd++; cmd++;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
if (strcmp(cmd, argv[i]) == 0) { if (strcmp(cmd, argv[i]) == 0 ||
strcmp(cmdbase, argv[0]) == 0) {
putword(entry->d_name); putword(entry->d_name);
found++; found++;
if (sflag) if (sflag)