Add support for _POSIX2_VERSION, which lets you pick which POSIX

version you want the utilities to conform to.  Remove warnings about
failure to conform to a future POSIX version.

(usage): Document only the intersection of the
old and new behaviors, to encourage portability.
(main): Parse options using POSIX 1003.1-2001 rules if
conforming to that standard.  Do not warn of obsolete options.

diff --git a/src/nice.c b/src/nice.c
index 4bb6d10fdfbebded123ca4322e3ab6085871a157..72ce9e3c5b6ac58522c5078967fa94ee8d16c5c9 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -70,7 +70,6 @@ With no COMMAND, print the current scheduling priority.  ADJUST is 10\n\
 by default.  Range goes from -20 (highest priority) to 19 (lowest).\n\
 \n\
   -n, --adjustment=ADJUST   increment priority by ADJUST first\n\
-  -ADJUST                   (obsolete) same as -n ADJUST\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -102,30 +101,24 @@ main (int argc, char **argv)
     {
       char *s = argv[i];
 
-      if (POSIX2_VERSION < 200112
-         && s[0] == '-' && s[1] == '-' && ISDIGIT (s[2]))
+      if (s[0] == '-' && s[1] == '-' && ISDIGIT (s[2])
+         && posix2_version () < 200112)
        {
          if (xstrtol (&s[2], NULL, 10, &adjustment, "") != LONGINT_OK)
            error (1, 0, _("invalid option `%s'"), s);
-         if (OBSOLETE_OPTION_WARNINGS && ! getenv ("POSIXLY_CORRECT"))
-           error (0, 0, _("warning: `%s' option is obsolete; use `-n %s'"),
-                  s, s + 1);
 
          minusflag = 1;
          adjustment_given = 1;
          ++i;
        }
-      else if (POSIX2_VERSION < 200112
-              && s[0] == '-' && (ISDIGIT (s[1])
-                                 || (s[1] == '+' && ISDIGIT (s[2]))))
+      else if (s[0] == '-'
+              && (ISDIGIT (s[1]) || (s[1] == '+' && ISDIGIT (s[2])))
+              && posix2_version () < 200112)
        {
          if (s[1] == '+')
            ++s;
          if (xstrtol (&s[1], NULL, 10, &adjustment, "") != LONGINT_OK)
            error (1, 0, _("invalid option `%s'"), s);
-         if (OBSOLETE_OPTION_WARNINGS && ! getenv ("POSIXLY_CORRECT"))
-           error (0, 0, _("warning: `%s' option is obsolete; use `-n %s'"),
-                  argv[i], s + 1);
 
          minusflag = 0;
          adjustment_given = 1;