aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-12-22 13:56:36 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-12-22 13:56:36 +0000
commit0849207ce049a4ff0287ff5c03d24611e5340e2a (patch)
treeebc86b4456711b1aa8905894432e544df28e2d63
parentc5cb38f4d9fa90fdd01ea258390d0059138616b5 (diff)
downloadbusybox-w32-0849207ce049a4ff0287ff5c03d24611e5340e2a.tar.gz
busybox-w32-0849207ce049a4ff0287ff5c03d24611e5340e2a.tar.bz2
busybox-w32-0849207ce049a4ff0287ff5c03d24611e5340e2a.zip
convert "negaite" config option into reversed (INCLUDE_SUSv2)
-rw-r--r--Config.in10
-rw-r--r--coreutils/fold.c2
-rw-r--r--coreutils/head.c6
-rw-r--r--coreutils/tail.c4
-rw-r--r--scripts/defconfig2
5 files changed, 12 insertions, 12 deletions
diff --git a/Config.in b/Config.in
index fb07c681b..a4d442dd8 100644
--- a/Config.in
+++ b/Config.in
@@ -397,14 +397,14 @@ config EFENCE
397 397
398endchoice 398endchoice
399 399
400config DEBUG_YANK_SUSv2 400config INCLUDE_SUSv2
401 bool "Disable obsolete features removed before SUSv3?" 401 bool "Enable obsolete features removed before SUSv3?"
402 default y 402 default y
403 help 403 help
404 This option will disable backwards compatibility with SuSv2, 404 This option will enable backwards compatibility with SuSv2,
405 specifically, old-style numeric options ('command -1 <file>') 405 specifically, old-style numeric options ('command -1 <file>')
406 will not be supported in head, tail, and fold. (Note: should 406 will be supported in head, tail, and fold. (Note: should
407 yank from renice too.) 407 affect renice too.)
408 408
409endmenu 409endmenu
410 410
diff --git a/coreutils/fold.c b/coreutils/fold.c
index 9ca693dff..fd7298169 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -45,7 +45,7 @@ int fold_main(int argc, char **argv)
45 int i; 45 int i;
46 int errs = 0; 46 int errs = 0;
47 47
48 if(!ENABLE_DEBUG_YANK_SUSv2) { 48 if (ENABLE_INCLUDE_SUSv2) {
49 /* Turn any numeric options into -w options. */ 49 /* Turn any numeric options into -w options. */
50 for (i = 1; i < argc; i++) { 50 for (i = 1; i < argc; i++) {
51 char const *a = argv[i]; 51 char const *a = argv[i];
diff --git a/coreutils/head.c b/coreutils/head.c
index f2c948300..56e7a960c 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -47,7 +47,7 @@ int head_main(int argc, char **argv)
47 int c; 47 int c;
48 int retval = EXIT_SUCCESS; 48 int retval = EXIT_SUCCESS;
49 49
50#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD 50#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
51 /* Allow legacy syntax of an initial numeric option without -n. */ 51 /* Allow legacy syntax of an initial numeric option without -n. */
52 if (argc > 1 && argv[1][0] == '-' 52 if (argc > 1 && argv[1][0] == '-'
53 && isdigit(argv[1][1]) 53 && isdigit(argv[1][1])
@@ -75,8 +75,8 @@ int head_main(int argc, char **argv)
75#endif 75#endif
76 case 'n': 76 case 'n':
77 p = optarg; 77 p = optarg;
78#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD 78#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
79 GET_COUNT: 79 GET_COUNT:
80#endif 80#endif
81 81
82#if !ENABLE_FEATURE_FANCY_HEAD 82#if !ENABLE_FEATURE_FANCY_HEAD
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 2182b0936..b690b370e 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -101,7 +101,7 @@ int tail_main(int argc, char **argv)
101 char *s, *buf; 101 char *s, *buf;
102 const char *fmt; 102 const char *fmt;
103 103
104#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_TAIL 104#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
105 /* Allow legacy syntax of an initial numeric option without -n. */ 105 /* Allow legacy syntax of an initial numeric option without -n. */
106 if (argc >= 2 && (argv[1][0] == '+' || argv[1][0] == '-') 106 if (argc >= 2 && (argv[1][0] == '+' || argv[1][0] == '-')
107 && isdigit(argv[1][1]) 107 && isdigit(argv[1][1])
@@ -121,7 +121,7 @@ int tail_main(int argc, char **argv)
121 count_bytes = 1; 121 count_bytes = 1;
122 /* FALLS THROUGH */ 122 /* FALLS THROUGH */
123 case 'n': 123 case 'n':
124#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_TAIL 124#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
125 GET_COUNT: 125 GET_COUNT:
126#endif 126#endif
127 from_top = 0; 127 from_top = 0;
diff --git a/scripts/defconfig b/scripts/defconfig
index 61aca8792..1c6dc9891 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -47,7 +47,7 @@ CONFIG_LFS=y
47# CONFIG_NO_DEBUG_LIB is not set 47# CONFIG_NO_DEBUG_LIB is not set
48# CONFIG_DMALLOC is not set 48# CONFIG_DMALLOC is not set
49# CONFIG_EFENCE is not set 49# CONFIG_EFENCE is not set
50CONFIG_DEBUG_YANK_SUSv2=y 50CONFIG_INCLUDE_SUSv2=y
51 51
52# 52#
53# Installation Options 53# Installation Options