From: Jim Meyering <jim@meyering.net>
Date: Sun, 9 Jul 1995 16:42:31 +0000 (+0000)
Subject: (main): When using obsolescent +pos -pos syntax, allow
X-Git-Tag: textutils-1_12_1~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dfad5e900f643e1aa85ea46f165338228aafab0;p=thirdparty%2Fcoreutils.git

(main): When using obsolescent +pos -pos syntax, allow
omission of field spec only when character offset is specified.
Otherwise, -. +. would be accepted.
---

diff --git a/src/sort.c b/src/sort.c
index 1ed071b36f..23dc11bbc8 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -1541,7 +1541,7 @@ main (argc, argv)
 	  key->skipsblanks = key->skipeblanks = 0;
 	  key->numeric = key->month = key->reverse = 0;
 	  s = argv[i] + 1;
-	  if (!digits[UCHAR (*s)] && *s != '.')
+	  if (! (digits[UCHAR (*s)] || (*s == '.' && digits[s[1]])))
 	    badfieldspec (argv[i]);
 	  for (t = 0; digits[UCHAR (*s)]; ++s)
 	    t = 10 * t + *s - '0';
@@ -1563,7 +1563,7 @@ main (argc, argv)
       else if (argv[i][0] == '-' && argv[i][1])
 	{
 	  s = argv[i] + 1;
-	  if (digits[UCHAR (*s)] || *s == '.')
+	  if (digits[UCHAR (*s)] || (*s == '.' && digits[s[1]]))
 	    {
 	      if (!key)
 		usage (2);
@@ -1612,7 +1612,7 @@ main (argc, argv)
 		    key->skipsblanks = key->skipeblanks = 0;
 		    key->numeric = key->month = key->reverse = 0;
 		    /* Get POS1. */
-		    if (!digits[UCHAR (*s)] && *s != '.')
+		    if (!digits[UCHAR (*s)])
 		      badfieldspec (argv[i]);
 		    for (t = 0; digits[UCHAR (*s)]; ++s)
 		      t = 10 * t + *s - '0';