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 /libbb/getopt32.c | |
| parent | e2e4cc249dc1bd4b280846f55a36208674eadd55 (diff) | |
| download | busybox-f3b92d385695aecefd93d5f199be1f64270c2687.tar.gz | |
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 'libbb/getopt32.c')
| -rw-r--r-- | libbb/getopt32.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libbb/getopt32.c b/libbb/getopt32.c index 1eb868c97..17b8dd1a4 100644 --- a/libbb/getopt32.c +++ b/libbb/getopt32.c @@ -314,7 +314,7 @@ typedef struct { } t_complementary; /* You can set applet_long_options for parse called long options */ -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG static const struct option bb_null_long_options[1] = { { 0, 0, 0, 0 } }; @@ -335,7 +335,7 @@ getopt32(char **argv, const char *applet_opts, ...) const unsigned char *s; t_complementary *on_off; va_list p; -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG const struct option *l_o; struct option *long_options = (struct option *) &bb_null_long_options; #endif @@ -384,7 +384,7 @@ getopt32(char **argv, const char *applet_opts, ...) c++; } -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG if (applet_long_options) { const char *optstr; unsigned i, count; @@ -424,7 +424,7 @@ getopt32(char **argv, const char *applet_opts, ...) next_long: ; } } -#endif /* ENABLE_GETOPT_LONG */ +#endif /* ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG */ for (s = (const unsigned char *)opt_complementary; s && *s; s++) { t_complementary *pair; unsigned *pair_switch; @@ -543,7 +543,7 @@ getopt32(char **argv, const char *applet_opts, ...) * "fake" short options, like this one: * wget $'-\203' "Test: test" http://kernel.org/ * (supposed to act as --header, but doesn't) */ -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG while ((c = getopt_long(argc, argv, applet_opts, long_options, NULL)) != -1) { #else |