convert "negaite" config option into reversed (INCLUDE_SUSv2)

diff --git a/Config.in b/Config.in
index fb07c681bb1630f08da8e24dfc2a9c72e68fcc8c..a4d442dd8244b05e13439d435a1767ece39813fb 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -397,14 +397,14 @@ config EFENCE
 
 endchoice
 
-config DEBUG_YANK_SUSv2
-       bool "Disable obsolete features removed before SUSv3?"
+config INCLUDE_SUSv2
+       bool "Enable obsolete features removed before SUSv3?"
        default y
        help
-         This option will disable backwards compatibility with SuSv2,
+         This option will enable backwards compatibility with SuSv2,
          specifically, old-style numeric options ('command -1 <file>')
-         will not be supported in head, tail, and fold.  (Note: should
-         yank from renice too.)
+         will be supported in head, tail, and fold.  (Note: should
+         affect renice too.)
 
 endmenu
 

diff --git a/coreutils/fold.c b/coreutils/fold.c
index 9ca693dffc21626c5f849d0faf9f997b81b766c6..fd7298169bf97bd51c000eb01a459164a7bafa44 100644 (file)
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -45,7 +45,7 @@ int fold_main(int argc, char **argv)
        int i;
        int errs = 0;
 
-       if(!ENABLE_DEBUG_YANK_SUSv2) {
+       if (ENABLE_INCLUDE_SUSv2) {
                /* Turn any numeric options into -w options.  */
                for (i = 1; i < argc; i++) {
                        char const *a = argv[i];

diff --git a/coreutils/head.c b/coreutils/head.c
index f2c948300308cd0601b46c7c0d1d43b2d080c887..56e7a960cde2e710943a4683643fc2aca4f3e383 100644 (file)
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -47,7 +47,7 @@ int head_main(int argc, char **argv)
        int c;
        int retval = EXIT_SUCCESS;
 
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
+#if ENABLE_INCLUDE_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])
@@ -75,8 +75,8 @@ int head_main(int argc, char **argv)
 #endif
                case 'n':
                        p = optarg;
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
-               GET_COUNT:
+#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
+ GET_COUNT:
 #endif
 
 #if !ENABLE_FEATURE_FANCY_HEAD

diff --git a/coreutils/tail.c b/coreutils/tail.c
index 2182b0936d353e7db1233b494773ad36ab6345fe..b690b370ede35d8959d8d578b7eec039bf9f39ab 100644 (file)
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -101,7 +101,7 @@ int tail_main(int argc, char **argv)
        char *s, *buf;
        const char *fmt;
 
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
+#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
        /* Allow legacy syntax of an initial numeric option without -n. */
        if (argc >= 2 && (argv[1][0] == '+' || argv[1][0] == '-')
         && isdigit(argv[1][1])
@@ -121,7 +121,7 @@ int tail_main(int argc, char **argv)
                                count_bytes = 1;
                                /* FALLS THROUGH */
                        case 'n':
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
+#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
  GET_COUNT:
 #endif
                                from_top = 0;

diff --git a/scripts/defconfig b/scripts/defconfig
index 61aca8792e43f88b9a437c70e2c43eda033b2307..1c6dc9891cbea6adf2d5320298506e97ec0e3167 100644 (file)
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -47,7 +47,7 @@ CONFIG_LFS=y
 # CONFIG_NO_DEBUG_LIB is not set
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
-CONFIG_DEBUG_YANK_SUSv2=y
+CONFIG_INCLUDE_SUSv2=y
 
 #
 # Installation Options