aboutsummaryrefslogtreecommitdiff
path: root/debianutils
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2017-08-06 20:55:56 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2017-08-06 20:55:56 +0200
commit184c738582eb190489dd2e9d120b1e036df65401 (patch)
treec12ad562b1ecff416ed4bc48e0ccb4c1a0fc35c1 /debianutils
parent035e71578e98744acba2394bb03686d08f60d956 (diff)
downloadbusybox-184c738582eb190489dd2e9d120b1e036df65401.tar.gz
busybox-184c738582eb190489dd2e9d120b1e036df65401.tar.bz2
stty: fix bb_common_bufsiz1 use in NOEXEC
function old new delta stty_main 1211 1221 +10 do_display 379 370 -9 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'debianutils')
-rw-r--r--debianutils/start_stop_daemon.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 07c104baa..9effdc80b 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -79,6 +79,7 @@ Misc options:
//config: -N|--nicelevel N
//applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
+/* not NOEXEC: uses bb_common_bufsiz1 */
//kbuild:lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o
@@ -409,11 +410,11 @@ static const char start_stop_daemon_longopts[] ALIGN1 =
"quiet\0" No_argument "q"
"test\0" No_argument "t"
"make-pidfile\0" No_argument "m"
-#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
+# if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
"oknodo\0" No_argument "o"
"verbose\0" No_argument "v"
"nicelevel\0" Required_argument "N"
-#endif
+# endif
"startas\0" Required_argument "a"
"name\0" Required_argument "n"
"signal\0" Required_argument "s"
@@ -421,9 +422,9 @@ static const char start_stop_daemon_longopts[] ALIGN1 =
"chuid\0" Required_argument "c"
"exec\0" Required_argument "x"
"pidfile\0" Required_argument "p"
-#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
+# if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
"retry\0" Required_argument "R"
-#endif
+# endif
;
#endif