aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-26 20:19:22 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-26 20:19:22 +0000
commit01d23ade577b94a1ab1fde54f69a3ce5f7399f3c (patch)
tree4071ca983cbd5a3912501bd1467dc063b3592aa9 /util-linux
parentd29337580e6ad49ca3353a22b9099e9e47a4bd17 (diff)
downloadbusybox-01d23ade577b94a1ab1fde54f69a3ce5f7399f3c.tar.gz
busybox-01d23ade577b94a1ab1fde54f69a3ce5f7399f3c.tar.bz2
- 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 'util-linux')
-rw-r--r--util-linux/Config.in4
-rw-r--r--util-linux/hwclock.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/Config.in b/util-linux/Config.in
index 6bc366531..a493fbfb4 100644
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -199,10 +199,10 @@ config CONFIG_HWCLOCK
shutdown in the hardware clock, so the hardware will keep the
correct time when Linux is _not_ running.
-config CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
+config CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS
bool "Support long options (--hctosys,...)"
default n
- depends on CONFIG_HWCLOCK
+ depends on CONFIG_HWCLOCK && CONFIG_GETOPT_LONG
help
By default, the hwclock utility only uses short options. If you
are overly fond of its long options, such as --hctosys, --utc, etc)
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 2fe57b2fc..3d7f40026 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -37,7 +37,7 @@ struct linux_rtc_time {
#define RTC_SET_TIME _IOW('p', 0x0a, struct linux_rtc_time) /* Set RTC time */
#define RTC_RD_TIME _IOR('p', 0x09, struct linux_rtc_time) /* Read RTC time */
-#ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
+#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
# ifndef _GNU_SOURCE
# define _GNU_SOURCE
# endif
@@ -186,7 +186,7 @@ int hwclock_main ( int argc, char **argv )
unsigned long opt;
int utc;
-#ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
+#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
static const struct option hwclock_long_options[] = {
{ "localtime", 0, 0, 'l' },
{ "utc", 0, 0, 'u' },