diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-03-05 16:28:07 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-03-05 16:28:07 +0100 |
| commit | 17eedcad9406c43beddab3906c8c693626c351fb (patch) | |
| tree | 674eae9713b27346b61478ecd561dbbd586093ad /debianutils/start_stop_daemon.c | |
| parent | 11e61d5c7116cb83794a270b4fc9e2a1fadaa5cd (diff) | |
| download | busybox-w32-17eedcad9406c43beddab3906c8c693626c351fb.tar.gz busybox-w32-17eedcad9406c43beddab3906c8c693626c351fb.tar.bz2 busybox-w32-17eedcad9406c43beddab3906c8c693626c351fb.zip | |
ssd: compat: match -x EXECUTABLE by /proc/pid/exe too
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'debianutils/start_stop_daemon.c')
| -rw-r--r-- | debianutils/start_stop_daemon.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 495ed0a09..7dadc3c9e 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
| @@ -31,7 +31,8 @@ Options controlling process matching | |||
| 31 | [TODO: can PROCESS_NAME be a full pathname? Should we require full match then | 31 | [TODO: can PROCESS_NAME be a full pathname? Should we require full match then |
| 32 | with /proc/$PID/exe or argv[0] (comm can't be matched, it never contains path)] | 32 | with /proc/$PID/exe or argv[0] (comm can't be matched, it never contains path)] |
| 33 | -x,--exec EXECUTABLE Look for processes that were started with this | 33 | -x,--exec EXECUTABLE Look for processes that were started with this |
| 34 | command in /proc/$PID/cmdline. | 34 | command in /proc/$PID/exe and /proc/$PID/cmdline |
| 35 | (/proc/$PID/cmdline is a bbox extension) | ||
| 35 | Unlike -n, we match against the full path: | 36 | Unlike -n, we match against the full path: |
| 36 | "ntpd" != "./ntpd" != "/path/to/ntpd" | 37 | "ntpd" != "./ntpd" != "/path/to/ntpd" |
| 37 | -p,--pidfile PID_FILE Look for processes with PID from this file | 38 | -p,--pidfile PID_FILE Look for processes with PID from this file |
| @@ -68,7 +69,7 @@ Misc options: | |||
| 68 | //usage: "\n -n,--name NAME Match processes with NAME" | 69 | //usage: "\n -n,--name NAME Match processes with NAME" |
| 69 | //usage: "\n in comm field in /proc/PID/stat" | 70 | //usage: "\n in comm field in /proc/PID/stat" |
| 70 | //usage: "\n -x,--exec EXECUTABLE Match processes with this command" | 71 | //usage: "\n -x,--exec EXECUTABLE Match processes with this command" |
| 71 | //usage: "\n in /proc/PID/cmdline" | 72 | //usage: "\n in /proc/PID/{exe,cmdline}" |
| 72 | //usage: "\n -p,--pidfile FILE Match a process with PID from the file" | 73 | //usage: "\n -p,--pidfile FILE Match a process with PID from the file" |
| 73 | //usage: "\n All specified conditions must match" | 74 | //usage: "\n All specified conditions must match" |
| 74 | //usage: "\n-S only:" | 75 | //usage: "\n-S only:" |
| @@ -198,8 +199,18 @@ static int pid_is_exec(pid_t pid) | |||
| 198 | { | 199 | { |
| 199 | ssize_t bytes; | 200 | ssize_t bytes; |
| 200 | char buf[sizeof("/proc/%u/cmdline") + sizeof(int)*3]; | 201 | char buf[sizeof("/proc/%u/cmdline") + sizeof(int)*3]; |
| 202 | char *procname, *exelink; | ||
| 203 | int match; | ||
| 201 | 204 | ||
| 202 | sprintf(buf, "/proc/%u/cmdline", (unsigned)pid); | 205 | procname = buf + sprintf(buf, "/proc/%u/exe", (unsigned)pid) - 3; |
| 206 | |||
| 207 | exelink = xmalloc_readlink(buf); | ||
| 208 | match = (exelink && strcmp(execname, exelink) == 0); | ||
| 209 | free(exelink); | ||
| 210 | if (match) | ||
| 211 | return match; | ||
| 212 | |||
| 213 | strcpy(procname, "cmdline"); | ||
| 203 | bytes = open_read_close(buf, G.execname_cmpbuf, G.execname_sizeof); | 214 | bytes = open_read_close(buf, G.execname_cmpbuf, G.execname_sizeof); |
| 204 | if (bytes > 0) { | 215 | if (bytes > 0) { |
| 205 | G.execname_cmpbuf[bytes] = '\0'; | 216 | G.execname_cmpbuf[bytes] = '\0'; |