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

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index 591493e50..fea6c4801 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -1,16 +1,31 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+/* A more useful interface to strtol.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 
-#include "xstrtol.h" /* Get definition for __P before use. */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#else
-__unsigned long int __strtol __P ((const char *, char **, int base));
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
-#ifdef HAVE_STRING_H
+#if STDC_HEADERS
+# include <stdlib.h>
+#endif
+
+#if HAVE_STRING_H
 # include <string.h>
 #else
 # include <strings.h>
@@ -28,17 +43,19 @@ extern int errno;
 #endif
 
 #if HAVE_LIMITS_H
-#include <limits.h>
+# include <limits.h>
 #endif
 
 #ifndef ULONG_MAX
-#define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
+# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
 #endif
 
 #ifndef LONG_MAX
-#define LONG_MAX ((long int) (ULONG_MAX >> 1))
+# define LONG_MAX ((long int) (ULONG_MAX >> 1))
 #endif
 
+#include "xstrtol.h"
+
 #define BKM_SCALE(x, scale_factor, error_return)			\
       do								\
 	{								\
@@ -85,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':
@@ -126,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;
 
@@ -155,4 +175,5 @@ main (int argc, char** argv)
     }
   exit (0);
 }
+
 #endif /* TESTING_XSTRTO */