From: Jim Meyering <jim@meyering.net>
Date: Wed, 20 Feb 2002 16:06:20 +0000 (+0000)
Subject: Include posixver.h.
X-Git-Tag: FILEUTILS-4_1_6~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69e21274854c69662b92865912d8ec9d5c82e864;p=thirdparty%2Fcoreutils.git

Include posixver.h.
(usage): Document only the intersection of the old and new behaviors,
to encourage portability.
(main): Use `posix2_version ()' in place of POSIX2_VERSION.
---

diff --git a/src/touch.c b/src/touch.c
index e4666f03fc..9ede5dd1e9 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -28,6 +28,7 @@
 #include "error.h"
 #include "getdate.h"
 #include "posixtm.h"
+#include "posixver.h"
 #include "quote.h"
 #include "safe-read.h"
 
@@ -226,9 +227,6 @@ usage (int status)
   else
     {
       printf (_("Usage: %s [OPTION]... FILE...\n"), program_name);
-      if (POSIX2_VERSION < 200112)
-	printf (_("  or:  %s [-acm] MMDDhhmm[YY] FILE... (obsolete)\n"),
-		program_name);
       fputs (_("\
 Update the access and modification times of each FILE to the current time.\n\
 \n\
@@ -254,10 +252,6 @@ Mandatory arguments to long options are mandatory for short options too.\n\
       fputs (_("\
 \n\
 Note that the -d and -t options accept different time-date formats.\n\
-"), stdout);
-      if (POSIX2_VERSION < 200112)
-	fputs (_("\
-Also, the obsolete time-date format differs from both other formats.\n\
 "), stdout);
       puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
     }
@@ -358,8 +352,8 @@ main (int argc, char **argv)
 
   /* The obsolete `MMDDhhmm[YY]' form is valid IFF there are
      two or more non-option arguments.  */
-  if (POSIX2_VERSION < 200112
-      && !date_set && 2 <= argc - optind && !STREQ (argv[optind - 1], "--"))
+  if (!date_set && 2 <= argc - optind && !STREQ (argv[optind - 1], "--")
+      && posix2_version () < 200112)
     {
       newtime = posixtime (argv[optind], PDS_TRAILING_YEAR);
       if (newtime != (time_t) -1)