projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
lib
/
xstrtol.c
diff --git
a/lib/xstrtol.c
b/lib/xstrtol.c
index
07023d9
..
446d62e
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-200
0
Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1998-200
1
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
@@
-78,15
+78,19
@@
extern int errno;
#include "xstrtol.h"
#include "xstrtol.h"
-#if
ndef
strtol
+#if
!HAVE_DECL_STRTOL && !defined
strtol
long int strtol ();
#endif
long int strtol ();
#endif
-#if
ndef
strtoul
+#if
!HAVE_DECL_STRTOUL && !defined
strtoul
unsigned long int strtoul ();
#endif
unsigned long int strtoul ();
#endif
-#ifndef strtoumax
+#if !HAVE_DECL_STRTOIMAX && !defined strtoimax
+intmax_t strtoimax ();
+#endif
+
+#if !HAVE_DECL_STRTOUMAX && !defined strtoumax
uintmax_t strtoumax ();
#endif
uintmax_t strtoumax ();
#endif
@@
-137,8
+141,16
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
tmp = __strtol (s, p, strtol_base);
if (errno != 0)
return LONGINT_OVERFLOW;
tmp = __strtol (s, p, strtol_base);
if (errno != 0)
return LONGINT_OVERFLOW;
+
if (*p == s)
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 ones that allow suffixes
/* Let valid_suffixes == NULL mean `allow any suffix'. */
/* FIXME: update all callers except the ones that allow suffixes
@@
-165,15
+177,20
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
{
/* The ``valid suffix'' '0' is a special flag meaning that
an optional second suffix is allowed, which can change
{
/* 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])
{
switch (p[0][1])
{
- case 'B':
- suffixes++;
+ case 'i':
+ if (p[0][2] == 'B')
+ suffixes += 2;
break;
break;
- case 'D':
+ case 'B':
+ case 'D': /* 'D' is obsolescent */
base = 1000;
suffixes++;
break;
base = 1000;
suffixes++;
break;
@@
-194,28
+211,31
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
overflow = 0;
break;
overflow = 0;
break;
- case 'E': /*
Exa
*/
+ case 'E': /*
exa or exbi
*/
overflow = bkm_scale_by_power (&tmp, base, 6);
break;
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 */
overflow = bkm_scale_by_power (&tmp, base, 3);
break;
case 'k': /* kilo */
+ case 'K': /* kibi */
overflow = bkm_scale_by_power (&tmp, base, 1);
break;
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;
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;
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_by_power (&tmp, base, 4);
break;
@@
-223,11
+243,11
@@
__xstrtol (const char *s, char **ptr, int strtol_base,
overflow = bkm_scale (&tmp, 2);
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;
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;
overflow = bkm_scale_by_power (&tmp, base, 7);
break;