diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-14 01:23:40 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-14 01:27:05 +0200 |
commit | 837913fc548fe752e3a1bc13af9b43f50d8f278a (patch) | |
tree | a3b50deb011e4d5ee8a0f5ccd5bf87217dc2eb70 | |
parent | dd56921e2d404c8fc9484290a36411a13d14df1a (diff) | |
download | busybox-w32-837913fc548fe752e3a1bc13af9b43f50d8f278a.tar.gz busybox-w32-837913fc548fe752e3a1bc13af9b43f50d8f278a.tar.bz2 busybox-w32-837913fc548fe752e3a1bc13af9b43f50d8f278a.zip |
start_stop_daemon: fix normally disabled OLDER_VERSION_OF_X code
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | debianutils/start_stop_daemon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index fa77a7e00..9fa092d66 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
@@ -157,6 +157,9 @@ struct globals { | |||
157 | unsigned execname_sizeof; | 157 | unsigned execname_sizeof; |
158 | int user_id; | 158 | int user_id; |
159 | smallint signal_nr; | 159 | smallint signal_nr; |
160 | #ifdef OLDER_VERSION_OF_X | ||
161 | struct stat execstat; | ||
162 | #endif | ||
160 | } FIX_ALIASING; | 163 | } FIX_ALIASING; |
161 | #define G (*(struct globals*)bb_common_bufsiz1) | 164 | #define G (*(struct globals*)bb_common_bufsiz1) |
162 | #define userspec (G.userspec ) | 165 | #define userspec (G.userspec ) |
@@ -184,8 +187,8 @@ static int pid_is_exec(pid_t pid) | |||
184 | sprintf(buf, "/proc/%u/exe", (unsigned)pid); | 187 | sprintf(buf, "/proc/%u/exe", (unsigned)pid); |
185 | if (stat(buf, &st) < 0) | 188 | if (stat(buf, &st) < 0) |
186 | return 0; | 189 | return 0; |
187 | if (st.st_dev == execstat.st_dev | 190 | if (st.st_dev == G.execstat.st_dev |
188 | && st.st_ino == execstat.st_ino) | 191 | && st.st_ino == G.execstat.st_ino) |
189 | return 1; | 192 | return 1; |
190 | return 0; | 193 | return 0; |
191 | } | 194 | } |
@@ -408,9 +411,6 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv) | |||
408 | char *signame; | 411 | char *signame; |
409 | char *startas; | 412 | char *startas; |
410 | char *chuid; | 413 | char *chuid; |
411 | #ifdef OLDER_VERSION_OF_X | ||
412 | struct stat execstat; | ||
413 | #endif | ||
414 | #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY | 414 | #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY |
415 | // char *retry_arg = NULL; | 415 | // char *retry_arg = NULL; |
416 | // int retries = -1; | 416 | // int retries = -1; |
@@ -479,7 +479,7 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv) | |||
479 | 479 | ||
480 | #ifdef OLDER_VERSION_OF_X | 480 | #ifdef OLDER_VERSION_OF_X |
481 | if (execname) | 481 | if (execname) |
482 | xstat(execname, &execstat); | 482 | xstat(execname, &G.execstat); |
483 | #endif | 483 | #endif |
484 | 484 | ||
485 | *--argv = startas; | 485 | *--argv = startas; |