/* A more useful interface to strtol.
- Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+
+ Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003 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
+#ifndef __strtol
+# define __strtol strtol
+# define __strtol_t long int
+# define __xstrtol xstrtol
+#endif
+
+/* Some pre-ANSI implementations (e.g. SunOS 4)
+ need stderr defined if assertion checking is enabled. */
+#include <stdio.h>
+
#if STDC_HEADERS
# include <stdlib.h>
#endif
#endif
#include <assert.h>
+#include <ctype.h>
#include <errno.h>
#ifndef errno
extern int errno;
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
+#include <limits.h>
/* 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 TYPE_MAXIMUM (unsigned long int)
-#endif
-#ifndef LONG_MAX
-# define LONG_MAX TYPE_MAXIMUM (long int)
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
+#else
+# define IN_CTYPE_DOMAIN(c) isascii(c)
#endif
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
+
#include "xstrtol.h"
-__unsigned long int __strtol ();
+#if !HAVE_DECL_STRTOL && !defined strtol
+long int strtol ();
+#endif
+
+#if !HAVE_DECL_STRTOUL && !defined strtoul
+unsigned long int strtoul ();
+#endif
+
+#if !HAVE_DECL_STRTOIMAX && !defined strtoimax
+intmax_t strtoimax ();
+#endif
+
+#if !HAVE_DECL_STRTOUMAX && !defined strtoumax
+uintmax_t strtoumax ();
+#endif
static int
-bkm_scale (__unsigned long int *x, int scale_factor)
+bkm_scale (__strtol_t *x, int scale_factor)
{
- __unsigned long int product = *x * scale_factor;
+ __strtol_t product = *x * scale_factor;
if (*x != product / scale_factor)
return 1;
*x = product;
}
static int
-bkm_scale_by_power (__unsigned long int *x, int base, int power)
+bkm_scale_by_power (__strtol_t *x, int base, int power)
{
while (power--)
if (bkm_scale (x, base))
strtol_error
__xstrtol (const char *s, char **ptr, int strtol_base,
- __unsigned long int *val, const char *valid_suffixes)
+ __strtol_t *val, const char *valid_suffixes)
{
char *t_ptr;
char **p;
- __unsigned long int tmp;
+ __strtol_t tmp;
assert (0 <= strtol_base && strtol_base <= 36);
p = (ptr ? ptr : &t_ptr);
+ if (! TYPE_SIGNED (__strtol_t))
+ {
+ const char *q = s;
+ while (ISSPACE ((unsigned char) *q))
+ ++q;
+ if (*q == '-')
+ return LONGINT_INVALID;
+ }
+
errno = 0;
tmp = __strtol (s, p, strtol_base);
if (errno != 0)
return LONGINT_OVERFLOW;
+
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;
+ }
/* 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;
int overflow;
if (!strchr (valid_suffixes, **p))
- return LONGINT_INVALID_SUFFIX_CHAR;
+ {
+ *val = tmp;
+ return 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, e.g. "100MD" for 100 megabytes decimal. */
+ 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 'B':
- suffixes++;
+ case 'i':
+ if (p[0][2] == 'B')
+ suffixes += 2;
break;
- case 'D':
+ case 'B':
+ case 'D': /* 'D' is obsolescent */
base = 1000;
suffixes++;
break;
overflow = 0;
break;
- case 'E': /* Exa */
+ case 'E': /* exa or exbi */
overflow = bkm_scale_by_power (&tmp, base, 6);
break;
- case 'G': /* Giga */
+ case 'G': /* giga or gibi */
+ case 'g': /* 'g' is undocumented; for compatibility only */
overflow = bkm_scale_by_power (&tmp, base, 3);
break;
case 'k': /* kilo */
+ case 'K': /* kibi */
overflow = bkm_scale_by_power (&tmp, base, 1);
break;
- case 'M': /* Mega */
- case 'm': /* 'm' is undocumented; for backward compatibility only */
+ 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 */
+ case 'P': /* peta or pebi */
overflow = bkm_scale_by_power (&tmp, base, 5);
break;
- case 'T': /* Tera */
+ case 'T': /* tera or tebi */
+ case 't': /* 't' is undocumented; for compatibility only */
overflow = bkm_scale_by_power (&tmp, base, 4);
break;
overflow = bkm_scale (&tmp, 2);
break;
- case 'Y': /* Yotta */
+ case 'Y': /* yotta or 2**80 */
overflow = bkm_scale_by_power (&tmp, base, 8);
break;
- case 'Z': /* Zetta */
+ case 'Z': /* zetta or 2**70 */
overflow = bkm_scale_by_power (&tmp, base, 7);
break;
default:
+ *val = tmp;
return LONGINT_INVALID_SUFFIX_CHAR;
break;
}
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)