X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.c;h=446d62ec1f52091181868a369f3c27ab3e183975;hb=ff32653598f7eb683c2a65c2d6e5cd15c7e5e73d;hp=6c11f7f841af698dd1ff9e482bf128eef2618f40;hpb=70f6f1add8066c0e7d7f5f218536e9db75b60037;p=gnulib.git diff --git a/lib/xstrtol.c b/lib/xstrtol.c index 6c11f7f84..446d62ec1 100644 --- a/lib/xstrtol.c +++ b/lib/xstrtol.c @@ -1,5 +1,5 @@ /* A more useful interface to strtol. - Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1998-2001 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 @@ -21,6 +21,16 @@ # include #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 + #if STDC_HEADERS # include #endif @@ -34,8 +44,8 @@ # endif #endif -#define NDEBUG #include +#include #include #ifndef errno @@ -58,24 +68,36 @@ extern int errno; ? ~ (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) +#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 LONG_MAX -# define LONG_MAX TYPE_MAXIMUM (long int) -#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 (x, scale_factor) - __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; @@ -83,10 +105,7 @@ bkm_scale (x, scale_factor) } static int -bkm_scale_by_power (x, base, 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)) @@ -99,26 +118,43 @@ bkm_scale_by_power (x, base, power) 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; @@ -132,21 +168,29 @@ __xstrtol (const char *s, char **ptr, int strtol_base, 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; @@ -167,28 +211,31 @@ __xstrtol (const char *s, char **ptr, int strtol_base, 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; @@ -196,15 +243,16 @@ __xstrtol (const char *s, char **ptr, int strtol_base, 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; } @@ -236,7 +284,7 @@ main (int argc, char** argv) for (i=1; i