/* A more useful interface to strtol.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+
+ Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003, 2004 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 <config.h>
#endif
-#if STDC_HEADERS
-# include <stdlib.h>
+#ifndef __strtol
+# define __strtol strtol
+# define __strtol_t long int
+# define __xstrtol xstrtol
+# define STRTOL_T_MINIMUM LONG_MIN
+# define STRTOL_T_MAXIMUM LONG_MAX
#endif
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-# define strchr index
-# endif
-#endif
+/* Some pre-ANSI implementations (e.g. SunOS 4)
+ need stderr defined if assertion checking is enabled. */
+#include <stdio.h>
-#define NDEBUG
#include <assert.h>
-
+#include <ctype.h>
#include <errno.h>
-#ifndef errno
-extern int errno;
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* The extra casts work around common compiler bugs. */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
+ ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) \
+ : (t) 0))
+#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t)))
+
+#ifndef STRTOL_T_MINIMUM
+# define STRTOL_T_MINIMUM TYPE_MINIMUM (__strtol_t)
+# define STRTOL_T_MAXIMUM TYPE_MAXIMUM (__strtol_t)
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
+#else
+# define IN_CTYPE_DOMAIN(c) isascii(c)
#endif
-#ifndef ULONG_MAX
-# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
-#endif
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
+
+#include "xstrtol.h"
-#ifndef LONG_MAX
-# define LONG_MAX ((long int) (ULONG_MAX >> 1))
+#if !HAVE_DECL_STRTOIMAX && !defined strtoimax
+intmax_t strtoimax ();
#endif
-#include "xstrtol.h"
+#if !HAVE_DECL_STRTOUMAX && !defined strtoumax
+uintmax_t strtoumax ();
+#endif
-#define BKM_SCALE(x, scale_factor, error_return) \
- do \
- { \
- if ((x) > (double) __ZLONG_MAX / (scale_factor)) \
- return (error_return); \
- (x) *= (scale_factor); \
- } \
- while (0)
+static strtol_error
+bkm_scale (__strtol_t *x, int scale_factor)
+{
+ if (TYPE_SIGNED (__strtol_t) && *x < STRTOL_T_MINIMUM / scale_factor)
+ {
+ *x = STRTOL_T_MINIMUM;
+ return LONGINT_OVERFLOW;
+ }
+ if (STRTOL_T_MAXIMUM / scale_factor < *x)
+ {
+ *x = STRTOL_T_MAXIMUM;
+ return LONGINT_OVERFLOW;
+ }
+ *x *= scale_factor;
+ return LONGINT_OK;
+}
-__unsigned long int __strtol ();
+static strtol_error
+bkm_scale_by_power (__strtol_t *x, int base, int power)
+{
+ strtol_error err = LONGINT_OK;
+ while (power--)
+ err |= bkm_scale (x, base);
+ return err;
+}
/* FIXME: comment. */
strtol_error
-__xstrtol (s, ptr, base, val, valid_suffixes)
- const char *s;
- char **ptr;
- int base;
- __unsigned long int *val;
- const char *valid_suffixes;
+__xstrtol (const char *s, char **ptr, int strtol_base,
+ __strtol_t *val, const char *valid_suffixes)
{
char *t_ptr;
char **p;
- __unsigned long int tmp;
+ __strtol_t tmp;
+ strtol_error err = LONGINT_OK;
- assert (0 <= base && base <= 36);
+ assert (0 <= strtol_base && strtol_base <= 36);
p = (ptr ? ptr : &t_ptr);
+ if (! TYPE_SIGNED (__strtol_t))
+ {
+ const char *q = s;
+ unsigned char ch = *q;
+ while (ISSPACE (ch))
+ ch = *++q;
+ if (ch == '-')
+ return LONGINT_INVALID;
+ }
+
errno = 0;
- tmp = __strtol (s, p, base);
- if (errno != 0)
- return LONGINT_OVERFLOW;
+ tmp = __strtol (s, p, strtol_base);
+
if (*p == s)
- return LONGINT_INVALID;
+ {
+ /* If there is no number but there is a valid suffix, assume the
+ number is 1. The string is invalid otherwise. */
+ if (valid_suffixes && **p && strchr (valid_suffixes, **p))
+ tmp = 1;
+ else
+ return LONGINT_INVALID;
+ }
+ else if (errno != 0)
+ {
+ if (errno != ERANGE)
+ return LONGINT_INVALID;
+ err = LONGINT_OVERFLOW;
+ }
/* Let valid_suffixes == NULL mean `allow any suffix'. */
- /* FIXME: update all callers except the one in tail.c changing
- last parameter NULL to `""'. */
+ /* FIXME: update all callers except the ones that allow suffixes
+ after the number, changing last parameter NULL to `""'. */
if (!valid_suffixes)
{
*val = tmp;
- return LONGINT_OK;
+ return err;
}
if (**p != '\0')
{
+ int base = 1024;
+ int suffixes = 1;
+ strtol_error overflow;
+
if (!strchr (valid_suffixes, **p))
- return LONGINT_INVALID_SUFFIX_CHAR;
+ {
+ *val = tmp;
+ return err | LONGINT_INVALID_SUFFIX_CHAR;
+ }
+
+ if (strchr (valid_suffixes, '0'))
+ {
+ /* The ``valid suffix'' '0' is a special flag meaning that
+ an optional second suffix is allowed, which can change
+ the base. A suffix "B" (e.g. "100MB") stands for a power
+ of 1000, whereas a suffix "iB" (e.g. "100MiB") stands for
+ a power of 1024. If no suffix (e.g. "100M"), assume
+ power-of-1024. */
+
+ switch (p[0][1])
+ {
+ case 'i':
+ if (p[0][2] == 'B')
+ suffixes += 2;
+ break;
+
+ case 'B':
+ case 'D': /* 'D' is obsolescent */
+ base = 1000;
+ suffixes++;
+ break;
+ }
+ }
switch (**p)
{
case 'b':
- BKM_SCALE (tmp, 512, LONGINT_OVERFLOW);
- ++(*p);
+ overflow = bkm_scale (&tmp, 512);
+ break;
+
+ case 'B':
+ overflow = bkm_scale (&tmp, 1024);
break;
case 'c':
- ++(*p);
+ overflow = 0;
break;
- case 'B':
- case 'k':
- BKM_SCALE (tmp, 1024, LONGINT_OVERFLOW);
- ++(*p);
+ case 'E': /* exa or exbi */
+ overflow = bkm_scale_by_power (&tmp, base, 6);
+ break;
+
+ case 'G': /* giga or gibi */
+ case 'g': /* 'g' is undocumented; for compatibility only */
+ overflow = bkm_scale_by_power (&tmp, base, 3);
break;
- case 'm':
- BKM_SCALE (tmp, 1024 * 1024, LONGINT_OVERFLOW);
- ++(*p);
+ case 'k': /* kilo */
+ case 'K': /* kibi */
+ overflow = bkm_scale_by_power (&tmp, base, 1);
+ break;
+
+ case 'M': /* mega or mebi */
+ case 'm': /* 'm' is undocumented; for compatibility only */
+ overflow = bkm_scale_by_power (&tmp, base, 2);
+ break;
+
+ case 'P': /* peta or pebi */
+ overflow = bkm_scale_by_power (&tmp, base, 5);
+ break;
+
+ case 'T': /* tera or tebi */
+ case 't': /* 't' is undocumented; for compatibility only */
+ overflow = bkm_scale_by_power (&tmp, base, 4);
break;
case 'w':
- BKM_SCALE (tmp, 2, LONGINT_OVERFLOW);
- ++(*p);
+ overflow = bkm_scale (&tmp, 2);
break;
- default:
- return LONGINT_INVALID_SUFFIX_CHAR;
+ case 'Y': /* yotta or 2**80 */
+ overflow = bkm_scale_by_power (&tmp, base, 8);
break;
+
+ case 'Z': /* zetta or 2**70 */
+ overflow = bkm_scale_by_power (&tmp, base, 7);
+ break;
+
+ default:
+ *val = tmp;
+ return err | LONGINT_INVALID_SUFFIX_CHAR;
}
+
+ err |= overflow;
+ *p += suffixes;
+ if (**p)
+ err |= LONGINT_INVALID_SUFFIX_CHAR;
}
*val = tmp;
- return LONGINT_OK;
+ return err;
}
#ifdef TESTING_XSTRTO
char *program_name;
int
-main (int argc, char** argv)
+main (int argc, char **argv)
{
strtol_error s_err;
int i;
for (i=1; i<argc; i++)
{
char *p;
- __unsigned long int val;
+ __strtol_t val;
s_err = __xstrtol (argv[i], &p, 0, &val, "bckmw");
if (s_err == LONGINT_OK)