X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.c;h=fea6c4801ae107b78c99e4f83a80942600031e9d;hb=809464b39048da6beb7fa2c216ca8667f6799f67;hp=8755cf475dd75f2f9a5b5bebfbbf00c1a1153585;hpb=33128a4920c2f9e2a807308d0fe7af86e09d0066;p=gnulib.git

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index 8755cf475..fea6c4801 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -15,17 +15,17 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Jim Meyering (meyering@na-net.ornl.gov) */
+/* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#if STDC_HEADERS
+# include <stdlib.h>
 #endif
 
-#ifdef HAVE_STRING_H
+#if HAVE_STRING_H
 # include <string.h>
 #else
 # include <strings.h>
@@ -102,8 +102,11 @@ __xstrtol (s, ptr, base, val, valid_suffixes)
 	return LONGINT_INVALID_SUFFIX_CHAR;
     }
 
-  if (**p != '\0' && strchr (valid_suffixes, **p))
+  if (**p != '\0')
     {
+      if (!strchr (valid_suffixes, **p))
+	return LONGINT_INVALID_SUFFIX_CHAR;
+
       switch (**p)
 	{
 	case 'b':
@@ -143,8 +146,8 @@ __xstrtol (s, ptr, base, val, valid_suffixes)
 
 #ifdef TESTING_XSTRTO
 
-#include <stdio.h>
-#include "error.h"
+# include <stdio.h>
+# include "error.h"
 
 char *program_name;
 
@@ -172,4 +175,5 @@ main (int argc, char** argv)
     }
   exit (0);
 }
+
 #endif /* TESTING_XSTRTO */