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

start_stop_daemon: fix normally disabled OLDER_VERSION_OF_X code

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-04-14 01:23:40 +02:00
parent dd56921e2d
commit 837913fc54
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debianutils/start_stop_daemon.c
View File

@ -157,6 +157,9 @@ struct globals {
unsigned execname_sizeof; unsigned execname_sizeof;
int user_id; int user_id;
smallint signal_nr; smallint signal_nr;
#ifdef OLDER_VERSION_OF_X
struct stat execstat;
#endif
} FIX_ALIASING; } FIX_ALIASING;
#define G (*(struct globals*)bb_common_bufsiz1) #define G (*(struct globals*)bb_common_bufsiz1)
#define userspec (G.userspec ) #define userspec (G.userspec )
@ -184,8 +187,8 @@ static int pid_is_exec(pid_t pid)
sprintf(buf, "/proc/%u/exe", (unsigned)pid); sprintf(buf, "/proc/%u/exe", (unsigned)pid);
if (stat(buf, &st) < 0) if (stat(buf, &st) < 0)
return 0; return 0;
if (st.st_dev == execstat.st_dev if (st.st_dev == G.execstat.st_dev
&& st.st_ino == execstat.st_ino) && st.st_ino == G.execstat.st_ino)
return 1; return 1;
return 0; return 0;
} }
@ -408,9 +411,6 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
char *signame; char *signame;
char *startas; char *startas;
char *chuid; char *chuid;
#ifdef OLDER_VERSION_OF_X
struct stat execstat;
#endif
#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
// char *retry_arg = NULL; // char *retry_arg = NULL;
// int retries = -1; // int retries = -1;
@ -479,7 +479,7 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
#ifdef OLDER_VERSION_OF_X #ifdef OLDER_VERSION_OF_X
if (execname) if (execname)
xstat(execname, &execstat); xstat(execname, &G.execstat);
#endif #endif
*--argv = startas; *--argv = startas;