X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxstrtol.c;h=97ebd9078bd19e1250be74213ceba4483b73e487;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=3947b5fdc3d6b54e39f0b3725a5a94617a70a897;hpb=fa39892bfc254f6d5190e5cd1102294cd785b1d6;p=gnulib.git
diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index 3947b5fdc..97ebd9078 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -1,10 +1,12 @@
/* A more useful interface to strtol.
- Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2011 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,189 +14,215 @@
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. */
+ along with this program. If not, see . */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
-# include
+#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 STDC_HEADERS
-# include
-#endif
+#include
-#if HAVE_STRING_H
-# include
-#else
-# include
-# ifndef strchr
-# define strchr index
-# endif
-#endif
+#include "xstrtol.h"
-#define NDEBUG
-#include
+/* Some pre-ANSI implementations (e.g. SunOS 4)
+ need stderr defined if assertion checking is enabled. */
+#include
+#include
+#include
#include
-#ifndef errno
-extern int errno;
-#endif
-
-#if HAVE_LIMITS_H
-# include
-#endif
+#include
+#include
+#include
-#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))
+#include "intprops.h"
-#ifndef ULONG_MAX
-# define ULONG_MAX TYPE_MAXIMUM (unsigned long int)
-#endif
-
-#ifndef LONG_MAX
-# define LONG_MAX TYPE_MAXIMUM (long int)
-#endif
-
-#include "xstrtol.h"
-
-__unsigned long int __strtol ();
-
-static int
-bkm_scale (x, scale_factor)
- __unsigned long int *x;
- int scale_factor;
+static strtol_error
+bkm_scale (__strtol_t *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)
+ if (TYPE_SIGNED (__strtol_t) && *x < STRTOL_T_MINIMUM / scale_factor)
{
- return 1;
+ *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 0;
+ return LONGINT_OK;
+}
+
+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':
- if (bkm_scale (&tmp, 512))
- return LONGINT_OVERFLOW;
- ++(*p);
- break;
-
- case 'c':
- ++(*p);
- break;
-
- case 'B':
- case 'k':
- if (bkm_scale (&tmp, 1024))
- return LONGINT_OVERFLOW;
- ++(*p);
- break;
-
- case 'm':
- if (bkm_scale (&tmp, 1024 * 1024))
- return LONGINT_OVERFLOW;
- ++(*p);
- break;
-
- case 'w':
- if (bkm_scale (&tmp, 2))
- return LONGINT_OVERFLOW;
- ++(*p);
- break;
-
- default:
- return LONGINT_INVALID_SUFFIX_CHAR;
- break;
- }
+ {
+ case 'b':
+ overflow = bkm_scale (&tmp, 512);
+ break;
+
+ case 'B':
+ overflow = bkm_scale (&tmp, 1024);
+ break;
+
+ case 'c':
+ overflow = 0;
+ break;
+
+ 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 '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':
+ overflow = bkm_scale (&tmp, 2);
+ break;
+
+ 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
-
-# include
-# include "error.h"
-
-char *program_name;
-
-int
-main (int argc, char** argv)
-{
- strtol_error s_err;
- int i;
-
- program_name = argv[0];
- for (i=1; i%lu (%s)\n", argv[i], val, p);
- }
- else
- {
- STRTOL_FATAL_ERROR (argv[i], "arg", s_err);
- }
- }
- exit (0);
-}
-
-#endif /* TESTING_XSTRTO */