diff options
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/fold.c | 3 | ||||
-rw-r--r-- | coreutils/head.c | 3 | ||||
-rw-r--r-- | coreutils/tail.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/coreutils/fold.c b/coreutils/fold.c index 8f74ed88d..ee0fdc250 100644 --- a/coreutils/fold.c +++ b/coreutils/fold.c | |||
@@ -52,6 +52,8 @@ extern int fold_main(int argc, char **argv) | |||
52 | int i; | 52 | int i; |
53 | int errs = 0; | 53 | int errs = 0; |
54 | 54 | ||
55 | |||
56 | #ifdef CONFIG_FEATURE_SUSv2_OBSOLETE | ||
55 | /* Turn any numeric options into -w options. */ | 57 | /* Turn any numeric options into -w options. */ |
56 | for (i = 1; i < argc; i++) { | 58 | for (i = 1; i < argc; i++) { |
57 | char const *a = argv[i]; | 59 | char const *a = argv[i]; |
@@ -69,6 +71,7 @@ extern int fold_main(int argc, char **argv) | |||
69 | } | 71 | } |
70 | } | 72 | } |
71 | } | 73 | } |
74 | #endif | ||
72 | 75 | ||
73 | flags = bb_getopt_ulflags(argc, argv, "bsw:", &w_opt); | 76 | flags = bb_getopt_ulflags(argc, argv, "bsw:", &w_opt); |
74 | if (flags & FLAG_WIDTH) | 77 | if (flags & FLAG_WIDTH) |
diff --git a/coreutils/head.c b/coreutils/head.c index dab4de11b..a20873333 100644 --- a/coreutils/head.c +++ b/coreutils/head.c | |||
@@ -56,6 +56,7 @@ int head_main(int argc, char **argv) | |||
56 | int c; | 56 | int c; |
57 | int retval = EXIT_SUCCESS; | 57 | int retval = EXIT_SUCCESS; |
58 | 58 | ||
59 | #if defined CONFIG_FEATURE_SUSv2 || defined CONFIG_FEATURE_FANCY_HEAD | ||
59 | /* Allow legacy syntax of an initial numeric option without -n. */ | 60 | /* Allow legacy syntax of an initial numeric option without -n. */ |
60 | if ((argc > 1) && (argv[1][0] == '-') | 61 | if ((argc > 1) && (argv[1][0] == '-') |
61 | /* && (isdigit)(argv[1][1]) */ | 62 | /* && (isdigit)(argv[1][1]) */ |
@@ -66,7 +67,9 @@ int head_main(int argc, char **argv) | |||
66 | p = (*argv) + 1; | 67 | p = (*argv) + 1; |
67 | goto GET_COUNT; | 68 | goto GET_COUNT; |
68 | } | 69 | } |
70 | #endif | ||
69 | 71 | ||
72 | /* No size benefit in converting this to bb_getopt_ulflags */ | ||
70 | while ((opt = getopt(argc, argv, head_opts)) > 0) { | 73 | while ((opt = getopt(argc, argv, head_opts)) > 0) { |
71 | switch(opt) { | 74 | switch(opt) { |
72 | #ifdef CONFIG_FEATURE_FANCY_HEAD | 75 | #ifdef CONFIG_FEATURE_FANCY_HEAD |
diff --git a/coreutils/tail.c b/coreutils/tail.c index 1db1e2b0f..cc1517a7e 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c | |||
@@ -121,6 +121,7 @@ int tail_main(int argc, char **argv) | |||
121 | char *s, *buf; | 121 | char *s, *buf; |
122 | const char *fmt; | 122 | const char *fmt; |
123 | 123 | ||
124 | #ifdef CONFIG_FEATURE_SUSv2 | ||
124 | /* Allow legacy syntax of an initial numeric option without -n. */ | 125 | /* Allow legacy syntax of an initial numeric option without -n. */ |
125 | if (argc >=2 && ((argv[1][0] == '+') || ((argv[1][0] == '-') | 126 | if (argc >=2 && ((argv[1][0] == '+') || ((argv[1][0] == '-') |
126 | /* && (isdigit)(argv[1][1]) */ | 127 | /* && (isdigit)(argv[1][1]) */ |
@@ -130,6 +131,7 @@ int tail_main(int argc, char **argv) | |||
130 | optarg = argv[1]; | 131 | optarg = argv[1]; |
131 | goto GET_COUNT; | 132 | goto GET_COUNT; |
132 | } | 133 | } |
134 | #endif | ||
133 | 135 | ||
134 | while ((opt = getopt(argc, argv, tail_opts)) > 0) { | 136 | while ((opt = getopt(argc, argv, tail_opts)) > 0) { |
135 | switch (opt) { | 137 | switch (opt) { |