diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2007-09-25 23:17:25 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-09-25 23:17:25 +0000 |
| commit | ab0edd43b9c6df2946e8a514b12e04db23f13c65 (patch) | |
| tree | 8a8d9658c9d0671fb55df28f9f00f323473b8417 /src/start-stop-daemon.c | |
| parent | 7d9acd968f7a0537b258f23edaca2c85a0774b47 (diff) | |
unify verbose/quiet handling
Diffstat (limited to 'src/start-stop-daemon.c')
| -rw-r--r-- | src/start-stop-daemon.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/start-stop-daemon.c b/src/start-stop-daemon.c index 1b4c7f28..20d2cec8 100644 --- a/src/start-stop-daemon.c +++ b/src/start-stop-daemon.c @@ -461,7 +461,7 @@ static void handle_signal (int sig) #include "_usage.h" -#define getoptstring "KN:R:Sbc:d:g:mn:op:s:tu:r:vx:1:2:" getoptstring_COMMON +#define getoptstring "KN:R:Sbc:d:g:mn:op:s:tu:r:x:1:2:" getoptstring_COMMON static struct option longopts[] = { { "stop", 0, NULL, 'K'}, { "nicelevel", 1, NULL, 'N'}, @@ -480,7 +480,6 @@ static struct option longopts[] = { { "test", 0, NULL, 't'}, { "user", 1, NULL, 'u'}, { "chroot", 1, NULL, 'r'}, - { "verbose", 0, NULL, 'v'}, { "exec", 1, NULL, 'x'}, { "stdout", 1, NULL, '1'}, { "stderr", 1, NULL, '2'}, @@ -508,7 +507,6 @@ static const char * const longopts_help[] = { "", "", "", - "", longopts_help_COMMON }; #include "_usage.c" @@ -670,10 +668,6 @@ int start_stop_daemon (int argc, char **argv) ch_root = optarg; break; - case 'v': /* --verbose */ - verbose = true; - break; - case 'a': case 'x': /* --exec <executable> */ exec = optarg; @@ -687,10 +681,11 @@ int start_stop_daemon (int argc, char **argv) redirect_stderr = optarg; break; - case_RC_COMMON_GETOPT + case_RC_COMMON_GETOPT } quiet = rc_is_env ("RC_QUIET", "yes"); + verbose = rc_is_env ("RC_VERBOSE", "yes"); /* Allow start-stop-daemon --signal HUP --exec /usr/sbin/dnsmasq * instead of forcing --stop --oknodo as well */ |