-#ifdef HAVE_CONFIG_H
-#include <config.h>
+/* A more useful interface to strtol.
+ Copyright (C) 1995, 1996 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.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ 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. */
+
+/* Written by Jim Meyering. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
#endif
-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+#endif
+
+#if HAVE_STRING_H
+# include <string.h>
#else
-long int __strtol (const char *, char **, int base);
+# include <strings.h>
+# ifndef strchr
+# define strchr index
+# endif
#endif
+#define NDEBUG
#include <assert.h>
-/* FIXME: define NDEBUG before release. */
#include <errno.h>
#ifndef errno
#endif
#if HAVE_LIMITS_H
-#include <limits.h>
+# include <limits.h>
#endif
#ifndef ULONG_MAX
-#define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
+# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
#endif
#ifndef LONG_MAX
-#define LONG_MAX ((long int) (ULONG_MAX >> 1))
+# define LONG_MAX ((long int) (ULONG_MAX >> 1))
#endif
#include "xstrtol.h"
+#define BKM_SCALE(x, scale_factor, error_return) \
+ do \
+ { \
+ if ((x) > (double) __ZLONG_MAX / (scale_factor)) \
+ return (error_return); \
+ (x) *= (scale_factor); \
+ } \
+ while (0)
+
__unsigned long int __strtol ();
/* FIXME: comment. */
strtol_error
-__xstrtol (s, ptr, base, val, allow_bkm_suffix)
+__xstrtol (s, ptr, base, val, valid_suffixes)
const char *s;
char **ptr;
int base;
__unsigned long int *val;
- int allow_bkm_suffix;
+ const char *valid_suffixes;
{
char *t_ptr;
char **p;
return LONGINT_OVERFLOW;
if (*p == s)
return LONGINT_INVALID;
- if (!allow_bkm_suffix)
+
+ /* Let valid_suffixes == NULL mean `allow any suffix'. */
+ /* FIXME: update all callers except the one in tail.c changing
+ last parameter NULL to `""'. */
+ if (!valid_suffixes)
{
- if (**p == '\0')
- {
- *val = tmp;
- return LONGINT_OK;
- }
- else
- return LONGINT_INVALID_SUFFIX_CHAR;
+ *val = tmp;
+ return LONGINT_OK;
}
- switch (**p)
+ if (**p != '\0')
{
- case '\0':
- break;
-
-#define BKM_SCALE(x, scale_factor, error_return) \
- do \
- { \
- if ((x) > (double) __ZLONG_MAX / (scale_factor)) \
- return (error_return); \
- (x) *= (scale_factor); \
- } \
- while (0)
-
- case 'b':
- BKM_SCALE (tmp, 512, LONGINT_OVERFLOW);
- ++(*p);
- break;
-
- case 'k':
- BKM_SCALE (tmp, 1024, LONGINT_OVERFLOW);
- ++(*p);
- break;
-
- case 'm':
- BKM_SCALE (tmp, 1024 * 1024, LONGINT_OVERFLOW);
- ++(*p);
- break;
+ if (!strchr (valid_suffixes, **p))
+ return LONGINT_INVALID_SUFFIX_CHAR;
- default:
- return LONGINT_INVALID_SUFFIX_CHAR;
- break;
+ switch (**p)
+ {
+ case 'b':
+ BKM_SCALE (tmp, 512, LONGINT_OVERFLOW);
+ ++(*p);
+ break;
+
+ case 'c':
+ ++(*p);
+ break;
+
+ case 'B':
+ case 'k':
+ BKM_SCALE (tmp, 1024, LONGINT_OVERFLOW);
+ ++(*p);
+ break;
+
+ case 'm':
+ BKM_SCALE (tmp, 1024 * 1024, LONGINT_OVERFLOW);
+ ++(*p);
+ break;
+
+ case 'w':
+ BKM_SCALE (tmp, 2, LONGINT_OVERFLOW);
+ ++(*p);
+ break;
+
+ default:
+ return LONGINT_INVALID_SUFFIX_CHAR;
+ break;
+ }
}
*val = tmp;
#ifdef TESTING_XSTRTO
-#include <stdio.h>
-#include "error.h"
+# include <stdio.h>
+# include "error.h"
char *program_name;
char *p;
__unsigned long int val;
- s_err = __xstrtol (argv[i], &p, 0, &val, 1);
+ s_err = __xstrtol (argv[i], &p, 0, &val, "bckmw");
if (s_err == LONGINT_OK)
{
printf ("%s->%lu (%s)\n", argv[i], val, p);
}
exit (0);
}
+
#endif /* TESTING_XSTRTO */