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 /util-linux | |
parent | d29337580e6ad49ca3353a22b9099e9e47a4bd17 (diff) | |
download | busybox-w32-01d23ade577b94a1ab1fde54f69a3ce5f7399f3c.tar.gz busybox-w32-01d23ade577b94a1ab1fde54f69a3ce5f7399f3c.tar.bz2 busybox-w32-01d23ade577b94a1ab1fde54f69a3ce5f7399f3c.zip |
- 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.in | 4 | ||||
-rw-r--r-- | util-linux/hwclock.c | 4 |
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 | |||
199 | shutdown in the hardware clock, so the hardware will keep the | 199 | shutdown in the hardware clock, so the hardware will keep the |
200 | correct time when Linux is _not_ running. | 200 | correct time when Linux is _not_ running. |
201 | 201 | ||
202 | config CONFIG_FEATURE_HWCLOCK_LONGOPTIONS | 202 | config CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS |
203 | bool "Support long options (--hctosys,...)" | 203 | bool "Support long options (--hctosys,...)" |
204 | default n | 204 | default n |
205 | depends on CONFIG_HWCLOCK | 205 | depends on CONFIG_HWCLOCK && CONFIG_GETOPT_LONG |
206 | help | 206 | help |
207 | By default, the hwclock utility only uses short options. If you | 207 | By default, the hwclock utility only uses short options. If you |
208 | are overly fond of its long options, such as --hctosys, --utc, etc) | 208 | 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 { | |||
37 | #define RTC_SET_TIME _IOW('p', 0x0a, struct linux_rtc_time) /* Set RTC time */ | 37 | #define RTC_SET_TIME _IOW('p', 0x0a, struct linux_rtc_time) /* Set RTC time */ |
38 | #define RTC_RD_TIME _IOR('p', 0x09, struct linux_rtc_time) /* Read RTC time */ | 38 | #define RTC_RD_TIME _IOR('p', 0x09, struct linux_rtc_time) /* Read RTC time */ |
39 | 39 | ||
40 | #ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS | 40 | #if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS |
41 | # ifndef _GNU_SOURCE | 41 | # ifndef _GNU_SOURCE |
42 | # define _GNU_SOURCE | 42 | # define _GNU_SOURCE |
43 | # endif | 43 | # endif |
@@ -186,7 +186,7 @@ int hwclock_main ( int argc, char **argv ) | |||
186 | unsigned long opt; | 186 | unsigned long opt; |
187 | int utc; | 187 | int utc; |
188 | 188 | ||
189 | #ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS | 189 | #if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS |
190 | static const struct option hwclock_long_options[] = { | 190 | static const struct option hwclock_long_options[] = { |
191 | { "localtime", 0, 0, 'l' }, | 191 | { "localtime", 0, 0, 'l' }, |
192 | { "utc", 0, 0, 'u' }, | 192 | { "utc", 0, 0, 'u' }, |