diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-05-26 20:19:22 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-05-26 20:19:22 +0000 |
| commit | 01d23ade577b94a1ab1fde54f69a3ce5f7399f3c (patch) | |
| tree | 4071ca983cbd5a3912501bd1467dc063b3592aa9 /debianutils | |
| parent | d29337580e6ad49ca3353a22b9099e9e47a4bd17 (diff) | |
| download | busybox-01d23ade577b94a1ab1fde54f69a3ce5f7399f3c.tar.gz | |
- add central knob to turn off getopt_long everywhere. EXPERIMENTAL!
Adds "Enable getopt long" under "General options", default y.
Send patches to fix getopt_ulflags and run_parts.c if you turn this off..
See http://busybox.net/lists/busybox/2006-May/021828.html for a start to run-parts
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/Config.in | 14 | ||||
| -rw-r--r-- | debianutils/start_stop_daemon.c | 5 |
2 files changed, 18 insertions, 1 deletions
diff --git a/debianutils/Config.in b/debianutils/Config.in index 146a24e61..626272474 100644 --- a/debianutils/Config.in +++ b/debianutils/Config.in @@ -46,6 +46,13 @@ config CONFIG_RUN_PARTS Unless you know that run-parts is used in some of your scripts you can safely say N here. +config CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS + bool "Enable long options" + default n + depends on CONFIG_RUN_PARTS && CONFIG_GETOPT_LONG + help + Support long options for the run-parts applet. + config CONFIG_START_STOP_DAEMON bool "start-stop-daemon" default y @@ -54,6 +61,13 @@ config CONFIG_START_STOP_DAEMON termination of system-level processes, usually the ones started during the startup of the system. +config CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS + bool "Enable long options" + default n + depends on CONFIG_START_STOP_DAEMON && CONFIG_GETOPT_LONG + help + Support long options for the start-stop-daemon applet. + config CONFIG_WHICH bool "which" default n diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index b44a23b4b..5c596c40a 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c @@ -200,7 +200,7 @@ do_stop(void) } } - +#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS static const struct option ssd_long_options[] = { { "stop", 0, NULL, 'K' }, { "start", 0, NULL, 'S' }, @@ -215,6 +215,7 @@ static const struct option ssd_long_options[] = { { "pidfile", 1, NULL, 'p' }, { 0, 0, 0, 0 } }; +#endif #define SSD_CTX_STOP 1 #define SSD_CTX_START 2 @@ -229,7 +230,9 @@ start_stop_daemon_main(int argc, char **argv) char *signame = NULL; char *startas = NULL; +#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS bb_applet_long_options = ssd_long_options; +#endif /* Check required one context option was given */ bb_opt_complementally = "K:S:?:K--S:S--K"; |