diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-19 12:10:38 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-19 12:10:38 +0200 |
commit | f3b92d385695aecefd93d5f199be1f64270c2687 (patch) | |
tree | 5d6b2308ceafea6040bd78ea8401a91eb65d376b /networking | |
parent | e2e4cc249dc1bd4b280846f55a36208674eadd55 (diff) | |
download | busybox-w32-f3b92d385695aecefd93d5f199be1f64270c2687.tar.gz busybox-w32-f3b92d385695aecefd93d5f199be1f64270c2687.tar.bz2 busybox-w32-f3b92d385695aecefd93d5f199be1f64270c2687.zip |
getopt: FEATURE_GETOPT_LONG for -l; rename GETOPT_LONG to LONG_OPTS
Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r-- | networking/Config.in | 6 | ||||
-rw-r--r-- | networking/ifenslave.c | 2 | ||||
-rw-r--r-- | networking/udhcp/dhcpc.c | 4 | ||||
-rw-r--r-- | networking/udhcp/dumpleases.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/networking/Config.in b/networking/Config.in index 861d96346..83522ffb1 100644 --- a/networking/Config.in +++ b/networking/Config.in | |||
@@ -132,7 +132,7 @@ config FTPPUT | |||
132 | config FEATURE_FTPGETPUT_LONG_OPTIONS | 132 | config FEATURE_FTPGETPUT_LONG_OPTIONS |
133 | bool "Enable long options in ftpget/ftpput" | 133 | bool "Enable long options in ftpget/ftpput" |
134 | default n | 134 | default n |
135 | depends on GETOPT_LONG && (FTPGET || FTPPUT) | 135 | depends on LONG_OPTS && (FTPGET || FTPPUT) |
136 | help | 136 | help |
137 | Support long options for the ftpget/ftpput applet. | 137 | Support long options for the ftpget/ftpput applet. |
138 | 138 | ||
@@ -578,7 +578,7 @@ config FEATURE_IPCALC_FANCY | |||
578 | config FEATURE_IPCALC_LONG_OPTIONS | 578 | config FEATURE_IPCALC_LONG_OPTIONS |
579 | bool "Enable long options" | 579 | bool "Enable long options" |
580 | default n | 580 | default n |
581 | depends on IPCALC && GETOPT_LONG | 581 | depends on IPCALC && LONG_OPTS |
582 | help | 582 | help |
583 | Support long options for the ipcalc applet. | 583 | Support long options for the ipcalc applet. |
584 | 584 | ||
@@ -910,7 +910,7 @@ config FEATURE_WGET_AUTHENTICATION | |||
910 | config FEATURE_WGET_LONG_OPTIONS | 910 | config FEATURE_WGET_LONG_OPTIONS |
911 | bool "Enable long options" | 911 | bool "Enable long options" |
912 | default n | 912 | default n |
913 | depends on WGET && GETOPT_LONG | 913 | depends on WGET && LONG_OPTS |
914 | help | 914 | help |
915 | Support long options for the wget applet. | 915 | Support long options for the wget applet. |
916 | 916 | ||
diff --git a/networking/ifenslave.c b/networking/ifenslave.c index fa226425a..16fcd54f1 100644 --- a/networking/ifenslave.c +++ b/networking/ifenslave.c | |||
@@ -457,7 +457,7 @@ int ifenslave_main(int argc UNUSED_PARAM, char **argv) | |||
457 | OPT_d = (1 << 1), | 457 | OPT_d = (1 << 1), |
458 | OPT_f = (1 << 2), | 458 | OPT_f = (1 << 2), |
459 | }; | 459 | }; |
460 | #if ENABLE_GETOPT_LONG | 460 | #if ENABLE_LONG_OPTS |
461 | static const char ifenslave_longopts[] ALIGN1 = | 461 | static const char ifenslave_longopts[] ALIGN1 = |
462 | "change-active\0" No_argument "c" | 462 | "change-active\0" No_argument "c" |
463 | "detach\0" No_argument "d" | 463 | "detach\0" No_argument "d" |
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 2f8cee3b5..fca5c2a03 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c | |||
@@ -152,7 +152,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | |||
152 | struct dhcp_packet packet; | 152 | struct dhcp_packet packet; |
153 | fd_set rfds; | 153 | fd_set rfds; |
154 | 154 | ||
155 | #if ENABLE_GETOPT_LONG | 155 | #if ENABLE_LONG_OPTS |
156 | static const char udhcpc_longopts[] ALIGN1 = | 156 | static const char udhcpc_longopts[] ALIGN1 = |
157 | "clientid\0" Required_argument "c" | 157 | "clientid\0" Required_argument "c" |
158 | "clientid-none\0" No_argument "C" | 158 | "clientid-none\0" No_argument "C" |
@@ -223,7 +223,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | |||
223 | ":vv" | 223 | ":vv" |
224 | #endif | 224 | #endif |
225 | ; | 225 | ; |
226 | IF_GETOPT_LONG(applet_long_options = udhcpc_longopts;) | 226 | IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) |
227 | opt = getopt32(argv, "c:CV:H:h:F:i:np:qRr:s:T:t:SA:O:of" | 227 | opt = getopt32(argv, "c:CV:H:h:F:i:np:qRr:s:T:t:SA:O:of" |
228 | USE_FOR_MMU("b") | 228 | USE_FOR_MMU("b") |
229 | IF_FEATURE_UDHCPC_ARPING("a") | 229 | IF_FEATURE_UDHCPC_ARPING("a") |
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c index d6176fb6b..cbf9f587a 100644 --- a/networking/udhcp/dumpleases.c +++ b/networking/udhcp/dumpleases.c | |||
@@ -33,7 +33,7 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv) | |||
33 | OPT_r = 0x2, // -r | 33 | OPT_r = 0x2, // -r |
34 | OPT_f = 0x4, // -f | 34 | OPT_f = 0x4, // -f |
35 | }; | 35 | }; |
36 | #if ENABLE_GETOPT_LONG | 36 | #if ENABLE_LONG_OPTS |
37 | static const char dumpleases_longopts[] ALIGN1 = | 37 | static const char dumpleases_longopts[] ALIGN1 = |
38 | "absolute\0" No_argument "a" | 38 | "absolute\0" No_argument "a" |
39 | "remaining\0" No_argument "r" | 39 | "remaining\0" No_argument "r" |