From f3b92d385695aecefd93d5f199be1f64270c2687 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 19 Jun 2009 12:10:38 +0200 Subject: getopt: FEATURE_GETOPT_LONG for -l; rename GETOPT_LONG to LONG_OPTS Signed-off-by: Colin Watson Signed-off-by: Denys Vlasenko --- networking/Config.in | 6 +++--- networking/ifenslave.c | 2 +- networking/udhcp/dhcpc.c | 4 ++-- networking/udhcp/dumpleases.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'networking') 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 config FEATURE_FTPGETPUT_LONG_OPTIONS bool "Enable long options in ftpget/ftpput" default n - depends on GETOPT_LONG && (FTPGET || FTPPUT) + depends on LONG_OPTS && (FTPGET || FTPPUT) help Support long options for the ftpget/ftpput applet. @@ -578,7 +578,7 @@ config FEATURE_IPCALC_FANCY config FEATURE_IPCALC_LONG_OPTIONS bool "Enable long options" default n - depends on IPCALC && GETOPT_LONG + depends on IPCALC && LONG_OPTS help Support long options for the ipcalc applet. @@ -910,7 +910,7 @@ config FEATURE_WGET_AUTHENTICATION config FEATURE_WGET_LONG_OPTIONS bool "Enable long options" default n - depends on WGET && GETOPT_LONG + depends on WGET && LONG_OPTS help Support long options for the wget applet. 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) OPT_d = (1 << 1), OPT_f = (1 << 2), }; -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS static const char ifenslave_longopts[] ALIGN1 = "change-active\0" No_argument "c" "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) struct dhcp_packet packet; fd_set rfds; -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS static const char udhcpc_longopts[] ALIGN1 = "clientid\0" Required_argument "c" "clientid-none\0" No_argument "C" @@ -223,7 +223,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) ":vv" #endif ; - IF_GETOPT_LONG(applet_long_options = udhcpc_longopts;) + IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) opt = getopt32(argv, "c:CV:H:h:F:i:np:qRr:s:T:t:SA:O:of" USE_FOR_MMU("b") 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) OPT_r = 0x2, // -r OPT_f = 0x4, // -f }; -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS static const char dumpleases_longopts[] ALIGN1 = "absolute\0" No_argument "a" "remaining\0" No_argument "r" -- cgit v1.2.3