/* 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
# 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
switch (**p)
{
case 'b':
- BKM_SCALE (tmp, 512, LONGINT_OVERFLOW);
+ if (bkm_scale (&tmp, 512))
+ return LONGINT_OVERFLOW;
++(*p);
break;
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;