projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(jm_ICONV): Recommend GNU libiconv.
[gnulib.git]
/
lib
/
xstrtol.c
diff --git
a/lib/xstrtol.c
b/lib/xstrtol.c
index
00d4b11
..
7bc7335
100644
(file)
--- a/
lib/xstrtol.c
+++ b/
lib/xstrtol.c
@@
-1,5
+1,5
@@
/* A more useful interface to strtol.
/* A more useful interface to strtol.
- Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1998
-2000
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
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,12
@@
# include <config.h>
#endif
# 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>
/* Some pre-ANSI implementations (e.g. SunOS 4)
need stderr defined if assertion checking is enabled. */
#include <stdio.h>
@@
-39,6
+45,7
@@
#endif
#include <assert.h>
#endif
#include <assert.h>
+#include <ctype.h>
#include <errno.h>
#ifndef errno
#include <errno.h>
#ifndef errno
@@
-61,22
+68,32
@@
extern int errno;
? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
#define TYPE_MAXIMUM(t) (~ (t) 0 - TYPE_MINIMUM (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)
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
+#else
+# define IN_CTYPE_DOMAIN(c) isascii(c)
#endif
#endif
-#ifndef LONG_MAX
-# define LONG_MAX TYPE_MAXIMUM (long int)
-#endif
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
#include "xstrtol.h"
#include "xstrtol.h"
-__unsigned long int __strtol ();
+#ifndef strtol
+long int strtol ();
+#endif
+
+#ifndef strtoul
+unsigned long int strtoul ();
+#endif
+
+#ifndef strtoumax
+uintmax_t strtoumax ();
+#endif
static int
static int
-bkm_scale (__
unsigned long in
t *x, int scale_factor)
+bkm_scale (__
strtol_
t *x, int scale_factor)
{
{
- __
unsigned long in
t product = *x * scale_factor;
+ __
strtol_
t product = *x * scale_factor;
if (*x != product / scale_factor)
return 1;
*x = product;
if (*x != product / scale_factor)
return 1;
*x = product;
@@
-84,7
+101,7
@@
bkm_scale (__unsigned long int *x, int scale_factor)
}
static int
}
static int
-bkm_scale_by_power (__
unsigned long in
t *x, int base, int power)
+bkm_scale_by_power (__
strtol_
t *x, int base, int power)
{
while (power--)
if (bkm_scale (x, base))
{
while (power--)
if (bkm_scale (x, base))
@@
-97,16
+114,25
@@
bkm_scale_by_power (__unsigned long int *x, int base, int power)
strtol_error
__xstrtol (const char *s, char **ptr, int strtol_base,
strtol_error
__xstrtol (const char *s, char **ptr, int strtol_base,
- __
unsigned long in
t *val, const char *valid_suffixes)
+ __
strtol_
t *val, const char *valid_suffixes)
{
char *t_ptr;
char **p;
{
char *t_ptr;
char **p;
- __
unsigned long in
t tmp;
+ __
strtol_
t tmp;
assert (0 <= strtol_base && strtol_base <= 36);
p = (ptr ? ptr : &t_ptr);
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)
errno = 0;
tmp = __strtol (s, p, strtol_base);
if (errno != 0)
@@
-115,8
+141,8
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
return LONGINT_INVALID;
/* Let valid_suffixes == NULL mean `allow any suffix'. */
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 one
s that allow suffixes
+
after the number, changing
last parameter NULL to `""'. */
if (!valid_suffixes)
{
*val = tmp;
if (!valid_suffixes)
{
*val = tmp;
@@
-130,7
+156,10
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
int overflow;
if (!strchr (valid_suffixes, **p))
int overflow;
if (!strchr (valid_suffixes, **p))
- return LONGINT_INVALID_SUFFIX_CHAR;
+ {
+ *val = tmp;
+ return LONGINT_INVALID_SUFFIX_CHAR;
+ }
if (strchr (valid_suffixes, '0'))
{
if (strchr (valid_suffixes, '0'))
{
@@
-170,6
+199,7
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
break;
case 'G': /* Giga */
break;
case 'G': /* Giga */
+ case 'g': /* 'g' is undocumented; for compatibility only */
overflow = bkm_scale_by_power (&tmp, base, 3);
break;
overflow = bkm_scale_by_power (&tmp, base, 3);
break;
@@
-178,7
+208,7
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
break;
case 'M': /* Mega */
break;
case 'M': /* Mega */
- case 'm': /* 'm' is undocumented; for
backward
compatibility only */
+ case 'm': /* 'm' is undocumented; for compatibility only */
overflow = bkm_scale_by_power (&tmp, base, 2);
break;
overflow = bkm_scale_by_power (&tmp, base, 2);
break;
@@
-187,6
+217,7
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
break;
case 'T': /* Tera */
break;
case 'T': /* Tera */
+ case 't': /* 't' is undocumented; for compatibility only */
overflow = bkm_scale_by_power (&tmp, base, 4);
break;
overflow = bkm_scale_by_power (&tmp, base, 4);
break;
@@
-203,6
+234,7
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
break;
default:
break;
default:
+ *val = tmp;
return LONGINT_INVALID_SUFFIX_CHAR;
break;
}
return LONGINT_INVALID_SUFFIX_CHAR;
break;
}
@@
-234,7
+266,7
@@
main (int argc, char** argv)
for (i=1; i<argc; i++)
{
char *p;
for (i=1; i<argc; i++)
{
char *p;
- __
unsigned long in
t val;
+ __
strtol_
t val;
s_err = __xstrtol (argv[i], &p, 0, &val, "bckmw");
if (s_err == LONGINT_OK)
s_err = __xstrtol (argv[i], &p, 0, &val, "bckmw");
if (s_err == LONGINT_OK)