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 /coreutils/od_bloaty.c | |
| 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 'coreutils/od_bloaty.c')
| -rw-r--r-- | coreutils/od_bloaty.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index eb4579857..00efec51c 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c | |||
| @@ -832,7 +832,7 @@ format_address_std(off_t address, char c) | |||
| 832 | printf(address_fmt, address); | 832 | printf(address_fmt, address); |
| 833 | } | 833 | } |
| 834 | 834 | ||
| 835 | #if ENABLE_GETOPT_LONG | 835 | #if ENABLE_LONG_OPTS |
| 836 | /* only used with --traditional */ | 836 | /* only used with --traditional */ |
| 837 | static void | 837 | static void |
| 838 | format_address_paren(off_t address, char c) | 838 | format_address_paren(off_t address, char c) |
| @@ -953,7 +953,7 @@ get_lcm(void) | |||
| 953 | return l_c_m; | 953 | return l_c_m; |
| 954 | } | 954 | } |
| 955 | 955 | ||
| 956 | #if ENABLE_GETOPT_LONG | 956 | #if ENABLE_LONG_OPTS |
| 957 | /* If S is a valid traditional offset specification with an optional | 957 | /* If S is a valid traditional offset specification with an optional |
| 958 | leading '+' return nonzero and set *OFFSET to the offset it denotes. */ | 958 | leading '+' return nonzero and set *OFFSET to the offset it denotes. */ |
| 959 | 959 | ||
| @@ -1199,9 +1199,9 @@ int od_main(int argc, char **argv) | |||
| 1199 | OPT_s = 1 << 15, | 1199 | OPT_s = 1 << 15, |
| 1200 | OPT_S = 1 << 16, | 1200 | OPT_S = 1 << 16, |
| 1201 | OPT_w = 1 << 17, | 1201 | OPT_w = 1 << 17, |
| 1202 | OPT_traditional = (1 << 18) * ENABLE_GETOPT_LONG, | 1202 | OPT_traditional = (1 << 18) * ENABLE_LONG_OPTS, |
| 1203 | }; | 1203 | }; |
| 1204 | #if ENABLE_GETOPT_LONG | 1204 | #if ENABLE_LONG_OPTS |
| 1205 | static const char od_longopts[] ALIGN1 = | 1205 | static const char od_longopts[] ALIGN1 = |
| 1206 | "skip-bytes\0" Required_argument "j" | 1206 | "skip-bytes\0" Required_argument "j" |
| 1207 | "address-radix\0" Required_argument "A" | 1207 | "address-radix\0" Required_argument "A" |
| @@ -1235,7 +1235,7 @@ int od_main(int argc, char **argv) | |||
| 1235 | 1235 | ||
| 1236 | /* Parse command line */ | 1236 | /* Parse command line */ |
| 1237 | opt_complementary = "w+:t::"; /* -w N, -t is a list */ | 1237 | opt_complementary = "w+:t::"; /* -w N, -t is a list */ |
| 1238 | #if ENABLE_GETOPT_LONG | 1238 | #if ENABLE_LONG_OPTS |
| 1239 | applet_long_options = od_longopts; | 1239 | applet_long_options = od_longopts; |
| 1240 | #endif | 1240 | #endif |
| 1241 | opt = getopt32(argv, "A:N:abcdfhij:lot:vxsS:" | 1241 | opt = getopt32(argv, "A:N:abcdfhij:lot:vxsS:" |
| @@ -1306,7 +1306,7 @@ int od_main(int argc, char **argv) | |||
| 1306 | * FIXME: POSIX 1003.1-2001 with XSI requires support for the | 1306 | * FIXME: POSIX 1003.1-2001 with XSI requires support for the |
| 1307 | * traditional syntax even if --traditional is not given. */ | 1307 | * traditional syntax even if --traditional is not given. */ |
| 1308 | 1308 | ||
| 1309 | #if ENABLE_GETOPT_LONG | 1309 | #if ENABLE_LONG_OPTS |
| 1310 | if (opt & OPT_traditional) { | 1310 | if (opt & OPT_traditional) { |
| 1311 | off_t o1, o2; | 1311 | off_t o1, o2; |
| 1312 | 1312 | ||