Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-26 10:32:02 +00:00
Code Issues Projects Releases Wiki Activity

start_stop_daemon: stop using data/bss

Browse Source 
function                                             old     new   delta
start_stop_daemon_main                               749     770     +21
do_procinit                                          184     185      +1
quiet                                                  1       -      -1
userspec                                               4       -      -4
user_id                                                4       -      -4
signal_nr                                              4       -      -4
pidfile                                                4       -      -4
found                                                  4       -      -4
execname                                               4       -      -4
cmdname                                                4       -      -4
------------------------------------------------------------------------------
(add/remove: 0/8 grow/shrink: 2/0 up/down: 22/-29)             Total: -7 bytes
This commit is contained in:
Denis Vlasenko 2008-02-26 16:08:02 +00:00
parent d4f0b9476a
commit 04bb2d2d06
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
debianutils/start_stop_daemon.c
View File

@ -18,20 +18,37 @@
#define WANT_PIDFILE 1 #define WANT_PIDFILE 1
#include "libbb.h" #include "libbb.h"
static int signal_nr = 15;
static int user_id = -1;
static char *userspec;
static char *cmdname;
static char *execname;
static char *pidfile;
static smallint quiet;
struct pid_list { struct pid_list {
struct pid_list *next; struct pid_list *next;
pid_t pid; pid_t pid;
}; };
static struct pid_list *found;
struct globals {
struct pid_list *found;
char *userspec;
char *cmdname;
char *execname;
char *pidfile;
int user_id;
smallint quiet;
smallint signal_nr;
};
#define G (*(struct globals*)&bb_common_bufsiz1)
#define found (G.found )
#define userspec (G.userspec )
#define cmdname (G.cmdname )
#define execname (G.execname )
#define pidfile (G.pidfile )
#define user_id (G.user_id )
#define quiet (G.quiet )
#define signal_nr (G.signal_nr )
#define INIT_G() \
do { \
user_id = -1; \
signal_nr = 15; \
} while (0)
static int pid_is_exec(pid_t pid, const char *name) static int pid_is_exec(pid_t pid, const char *name)
{ {
@ -43,8 +60,8 @@ static int pid_is_exec(pid_t pid, const char *name)
n = strlen(name) + 1; n = strlen(name) + 1;
execbuf = xzalloc(n + 1); execbuf = xzalloc(n + 1);
readlink(buf, execbuf, n); readlink(buf, execbuf, n);
/* if readlink fails because link target is longer than strlen(name),
/* if readlink fails, execbuf still contains "" */ * execbuf still contains "", and strcmp will return !0. */
n = strcmp(execbuf, name); n = strcmp(execbuf, name);
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
free(execbuf); free(execbuf);
@ -121,7 +138,7 @@ static void do_procinit(void)
{ {
DIR *procdir; DIR *procdir;
struct dirent *entry; struct dirent *entry;
int foundany, pid; int pid;
if (pidfile) { if (pidfile) {
do_pidfile(); do_pidfile();
@ -130,16 +147,15 @@ static void do_procinit(void)
procdir = xopendir("/proc"); procdir = xopendir("/proc");
foundany = 0; pid = 0;
while ((entry = readdir(procdir)) != NULL) { while ((entry = readdir(procdir)) != NULL) {
pid = bb_strtou(entry->d_name, NULL, 10); pid = bb_strtou(entry->d_name, NULL, 10);
if (errno) if (errno)
continue; continue;
foundany++;
check(pid); check(pid);
} }
closedir(procdir); closedir(procdir);
if (!foundany) if (!pid)
bb_error_msg_and_die("nothing in /proc - not mounted?"); bb_error_msg_and_die("nothing in /proc - not mounted?");
} }
@ -246,6 +262,9 @@ int start_stop_daemon_main(int argc, char **argv)
// int retries = -1; // int retries = -1;
char *opt_N; char *opt_N;
#endif #endif
INIT_G();
#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS #if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
applet_long_options = start_stop_daemon_longopts; applet_long_options = start_stop_daemon_longopts;
#endif #endif