diff options
| -rw-r--r-- | coreutils/head.c | 12 | ||||
| -rw-r--r-- | coreutils/tail.c | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/coreutils/head.c b/coreutils/head.c index a20873333..628dae5ea 100644 --- a/coreutils/head.c +++ b/coreutils/head.c @@ -33,7 +33,7 @@ static const char head_opts[] = "n:" -#ifdef CONFIG_FEATURE_FANCY_HEAD +#if ENABLE_FEATURE_FANCY_HEAD "c:qv" #endif ; @@ -44,7 +44,7 @@ int head_main(int argc, char **argv) { unsigned long count = 10; unsigned long i; -#ifdef CONFIG_FEATURE_FANCY_HEAD +#if ENABLE_FEATURE_FANCY_HEAD int count_bytes = 0; int header_threshhold = 1; #endif @@ -56,7 +56,7 @@ int head_main(int argc, char **argv) int c; int retval = EXIT_SUCCESS; -#if defined CONFIG_FEATURE_SUSv2 || defined CONFIG_FEATURE_FANCY_HEAD +#if defined CONFIG_FEATURE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD /* Allow legacy syntax of an initial numeric option without -n. */ if ((argc > 1) && (argv[1][0] == '-') /* && (isdigit)(argv[1][1]) */ @@ -72,7 +72,7 @@ int head_main(int argc, char **argv) /* No size benefit in converting this to bb_getopt_ulflags */ while ((opt = getopt(argc, argv, head_opts)) > 0) { switch(opt) { -#ifdef CONFIG_FEATURE_FANCY_HEAD +#if ENABLE_FEATURE_FANCY_HEAD case 'q': header_threshhold = INT_MAX; break; @@ -85,7 +85,9 @@ int head_main(int argc, char **argv) #endif case 'n': p = optarg; +#if ENABLE_FEATURE_FANCY_HEAD GET_COUNT: +#endif count = bb_xgetularg10(p); break; default: @@ -99,7 +101,7 @@ int head_main(int argc, char **argv) } fmt = header_fmt_str + 1; -#ifdef CONFIG_FEATURE_FANCY_HEAD +#if ENABLE_FEATURE_FANCY_HEAD if (argc - optind <= header_threshhold) { header_threshhold = 0; } diff --git a/coreutils/tail.c b/coreutils/tail.c index cc1517a7e..bda8ae04f 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c @@ -96,7 +96,7 @@ static ssize_t tail_read(int fd, char *buf, size_t count) static const char tail_opts[] = "fn:c:" -#ifdef CONFIG_FEATURE_FANCY_TAIL +#if ENABLE_FEATURE_FANCY_TAIL "qs:v" #endif ; @@ -142,7 +142,9 @@ int tail_main(int argc, char **argv) count_bytes = 1; /* FALLS THROUGH */ case 'n': +#if ENABLE_FEATURE_FANCY_TAIL GET_COUNT: +#endif count = bb_xgetlarg10_sfx(optarg, tail_suffixes); /* Note: Leading whitespace is an error trapped above. */ if (*optarg == '+') { @@ -154,7 +156,7 @@ int tail_main(int argc, char **argv) count = -count; } break; -#ifdef CONFIG_FEATURE_FANCY_TAIL +#if ENABLE_FEATURE_FANCY_TAIL case 'q': header_threshhold = INT_MAX; break; |