X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.c;h=3947b5fdc3d6b54e39f0b3725a5a94617a70a897;hb=0eeff3be000687cfd5aa94daba426c383e2c6950;hp=b0b6a082eb62d2e4fce843d035a568c3cc7d5b45;hpb=f318d7fc6ea14a8bbc10226c2d87e6edef576b91;p=gnulib.git

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index b0b6a082e..3947b5fdc 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -1,5 +1,5 @@
 /* A more useful interface to strtol.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
 
    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
@@ -15,14 +15,14 @@
    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. */
 
 #if HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #if STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 
 #if HAVE_STRING_H
@@ -46,27 +46,45 @@ extern int errno;
 # include <limits.h>
 #endif
 
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
+
+/* The extra casts work around common compiler bugs.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
+   It is necessary at least when t == time_t.  */
+#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
+			      ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
+#define TYPE_MAXIMUM(t) (~ (t) 0 - TYPE_MINIMUM (t))
+
 #ifndef ULONG_MAX
-# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
+# define ULONG_MAX TYPE_MAXIMUM (unsigned long int)
 #endif
 
 #ifndef LONG_MAX
-# define LONG_MAX ((long int) (ULONG_MAX >> 1))
+# define LONG_MAX TYPE_MAXIMUM (long int)
 #endif
 
 #include "xstrtol.h"
 
-#define BKM_SCALE(x, scale_factor, error_return)			\
-      do								\
-	{								\
-	  if ((x) > (double) __ZLONG_MAX / (scale_factor))		\
-	    return (error_return);					\
-	  (x) *= (scale_factor);					\
-	}								\
-      while (0)
-
 __unsigned long int __strtol ();
 
+static int
+bkm_scale (x, scale_factor)
+     __unsigned long int *x;
+     int scale_factor;
+{
+  /* The cast to `__unsigned long int' before the cast to double is
+     required to work around a bug in SunOS's /bin/cc.  */
+  if (*x > (double) ((__unsigned long int) __ZLONG_MAX) / scale_factor)
+    {
+      return 1;
+    }
+  *x *= scale_factor;
+  return 0;
+}
+
 /* FIXME: comment.  */
 
 strtol_error
@@ -91,15 +109,14 @@ __xstrtol (s, ptr, base, val, valid_suffixes)
     return LONGINT_OVERFLOW;
   if (*p == s)
     return LONGINT_INVALID;
+
+  /* Let valid_suffixes == NULL mean `allow any suffix'.  */
+  /* FIXME: update all callers except the one in tail.c changing
+     last parameter NULL to `""'.  */
   if (!valid_suffixes)
     {
-      if (**p == '\0')
-	{
-	  *val = tmp;
-	  return LONGINT_OK;
-	}
-      else
-	return LONGINT_INVALID_SUFFIX_CHAR;
+      *val = tmp;
+      return LONGINT_OK;
     }
 
   if (**p != '\0')
@@ -110,7 +127,8 @@ __xstrtol (s, ptr, base, val, valid_suffixes)
       switch (**p)
 	{
 	case 'b':
-	  BKM_SCALE (tmp, 512, LONGINT_OVERFLOW);
+	  if (bkm_scale (&tmp, 512))
+	    return LONGINT_OVERFLOW;
 	  ++(*p);
 	  break;
 
@@ -120,17 +138,20 @@ __xstrtol (s, ptr, base, val, valid_suffixes)
 
 	case 'B':
 	case 'k':
-	  BKM_SCALE (tmp, 1024, LONGINT_OVERFLOW);
+	  if (bkm_scale (&tmp, 1024))
+	    return LONGINT_OVERFLOW;
 	  ++(*p);
 	  break;
 
 	case 'm':
-	  BKM_SCALE (tmp, 1024 * 1024, LONGINT_OVERFLOW);
+	  if (bkm_scale (&tmp, 1024 * 1024))
+	    return LONGINT_OVERFLOW;
 	  ++(*p);
 	  break;
 
 	case 'w':
-	  BKM_SCALE (tmp, 2, LONGINT_OVERFLOW);
+	  if (bkm_scale (&tmp, 2))
+	    return LONGINT_OVERFLOW;
 	  ++(*p);
 	  break;
 
@@ -146,8 +167,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;
 
@@ -175,4 +196,5 @@ main (int argc, char** argv)
     }
   exit (0);
 }
+
 #endif /* TESTING_XSTRTO */