From: Jim Meyering <jim@meyering.net>
Date: Sun, 21 Apr 1996 04:45:12 +0000 (+0000)
Subject: (decode_switches): Replace two more atoi uses with xstrtol.
X-Git-Tag: FILEUTILS-3_12l~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0126f749361738a03078f179ee3388be78aa3dbb;p=thirdparty%2Fcoreutils.git

(decode_switches): Replace two more atoi uses with xstrtol.
---

diff --git a/src/ls.c b/src/ls.c
index 5f56e857e3..ad4e691320 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -727,10 +727,10 @@ decode_switches (int argc, char **argv)
   }
 #endif
 
-  /* TABSIZE is not POSIX-approved.
+  /* Using the TABSIZE environment variable is not POSIX-approved.
      Ignore it when POSIXLY_CORRECT is set.  */
   tabsize = 8;
-  if (getenv ("POSIXLY_CORRECT") == 0 && (p = getenv ("TABSIZE")))
+  if (!getenv ("POSIXLY_CORRECT") && (p = getenv ("TABSIZE")))
     {
       if (xstrtol (p, NULL, 0, &tmp_long, NULL) == LONGINT_OK
 	  && 0 < tmp_long && tmp_long <= INT_MAX)
@@ -839,9 +839,10 @@ decode_switches (int argc, char **argv)
 	  break;
 
 	case 'w':
-	  line_length = atoi (optarg);
-	  if (line_length < 1)
+	  if (xstrtol (optarg, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+	      || tmp_long <= 0 || tmp_long > INT_MAX)
 	    error (1, 0, _("invalid line width: %s"), optarg);
+	  line_length = (int) tmp_long;
 	  break;
 
 	case 'x':
@@ -901,9 +902,10 @@ decode_switches (int argc, char **argv)
 	  break;
 
 	case 'T':
-	  tabsize = atoi (optarg);
-	  if (tabsize < 1)
+	  if (xstrtol (optarg, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+	      || tmp_long <= 0 || tmp_long > INT_MAX)
 	    error (1, 0, _("invalid tab size: %s"), optarg);
+	  tabsize = (int) tmp_long;
 	  break;
 
 	case 'U':