aboutsummaryrefslogtreecommitdiff
path: root/debianutils
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2018-04-14 01:23:40 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2018-04-14 01:27:05 +0200
commit837913fc548fe752e3a1bc13af9b43f50d8f278a (patch)
treea3b50deb011e4d5ee8a0f5ccd5bf87217dc2eb70 /debianutils
parentdd56921e2d404c8fc9484290a36411a13d14df1a (diff)
downloadbusybox-837913fc548fe752e3a1bc13af9b43f50d8f278a.tar.gz
busybox-837913fc548fe752e3a1bc13af9b43f50d8f278a.tar.bz2
start_stop_daemon: fix normally disabled OLDER_VERSION_OF_X code
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'debianutils')
-rw-r--r--debianutils/start_stop_daemon.c12
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 {
unsigned execname_sizeof;
int user_id;
smallint signal_nr;
+#ifdef OLDER_VERSION_OF_X
+ struct stat execstat;
+#endif
} FIX_ALIASING;
#define G (*(struct globals*)bb_common_bufsiz1)
#define userspec (G.userspec )
@@ -184,8 +187,8 @@ static int pid_is_exec(pid_t pid)
sprintf(buf, "/proc/%u/exe", (unsigned)pid);
if (stat(buf, &st) < 0)
return 0;
- if (st.st_dev == execstat.st_dev
- && st.st_ino == execstat.st_ino)
+ if (st.st_dev == G.execstat.st_dev
+ && st.st_ino == G.execstat.st_ino)
return 1;
return 0;
}
@@ -408,9 +411,6 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
char *signame;
char *startas;
char *chuid;
-#ifdef OLDER_VERSION_OF_X
- struct stat execstat;
-#endif
#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
// char *retry_arg = NULL;
// int retries = -1;
@@ -479,7 +479,7 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
#ifdef OLDER_VERSION_OF_X
if (execname)
- xstat(execname, &execstat);
+ xstat(execname, &G.execstat);
#endif
*--argv = startas;