# HG changeset patch # User Jim Meyering # Date 795757718 0 # Node ID 2b8b9312ed335b38d359a4fe9783d376df6db1d9 # Parent e512303d74b85b2dc169e8d9a4ebac85a9f6c461 GNU text utilities diff -r e512303d74b8 -r 2b8b9312ed33 lib/error.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/error.h Tue Mar 21 03:48:38 1995 +0000 @@ -0,0 +1,14 @@ +#ifndef _error_h_ +#define _error_h_ + +#ifdef __GNUC__ +void error (int, int, const char *, ...) +#if __GNUC__ > 1 + __attribute__ ((format (printf, 3, 4))) +#endif + ; +#else +void error (); +#endif + +#endif /* _error_h_ */ diff -r e512303d74b8 -r 2b8b9312ed33 lib/memcpy.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/memcpy.c Tue Mar 21 03:48:38 1995 +0000 @@ -0,0 +1,25 @@ +/* memcpy.c -- copy memory. + Copy LENGTH bytes from SOURCE to DEST. Does not null-terminate. + The source and destination regions may not overlap. + In the public domain. + By Jim Meyering. */ + +/* FIXME: remove this before release. */ +#include +#ifndef ABS +# define ABS(x) ((x) < 0 ? (-(x)) : (x)) +#endif + +void +memcpy (dest, source, length) + char *dest; + const char *source; + unsigned length; +{ + assert (length >= 0); + /* Make sure they don't overlap. */ + assert (ABS (dest - source) >= length); + + for (; length; --length) + *dest++ = *source++; +} diff -r e512303d74b8 -r 2b8b9312ed33 lib/memmove.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/memmove.c Tue Mar 21 03:48:38 1995 +0000 @@ -0,0 +1,20 @@ +/* memmove.c -- copy memory. + Copy LENGTH bytes from SOURCE to DEST. Does not null-terminate. + In the public domain. + By David MacKenzie . */ + +void +memmove (dest, source, length) + char *dest; + const char *source; + unsigned length; +{ + if (source < dest) + /* Moving from low mem to hi mem; start at end. */ + for (source += length, dest += length; length; --length) + *--dest = *--source; + else if (source != dest) + /* Moving from hi mem to low mem; start at beginning. */ + for (; length; --length) + *dest++ = *source++; +} diff -r e512303d74b8 -r 2b8b9312ed33 lib/xstrtol.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/xstrtol.c Tue Mar 21 03:48:38 1995 +0000 @@ -0,0 +1,158 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef STDC_HEADERS +#include +#else +long int __strtol (const char *, char **, int base); +#endif + +#ifdef HAVE_STRING_H +# include +#else +# include +# ifndef strchr +# define strchr index +# endif +#endif + +#include +/* FIXME: define NDEBUG before release. */ + +#include +#ifndef errno +extern int errno; +#endif + +#if HAVE_LIMITS_H +#include +#endif + +#ifndef ULONG_MAX +#define ULONG_MAX ((unsigned long) ~(unsigned long) 0) +#endif + +#ifndef LONG_MAX +#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, valid_suffixes) + const char *s; + char **ptr; + int base; + __unsigned long int *val; + const char *valid_suffixes; +{ + char *t_ptr; + char **p; + __unsigned long int tmp; + + assert (0 <= base && base <= 36); + + p = (ptr ? ptr : &t_ptr); + + errno = 0; + tmp = __strtol (s, p, base); + if (errno != 0) + return LONGINT_OVERFLOW; + if (*p == s) + return LONGINT_INVALID; + if (!valid_suffixes) + { + if (**p == '\0') + { + *val = tmp; + return LONGINT_OK; + } + else + return LONGINT_INVALID_SUFFIX_CHAR; + } + + if (**p != '\0' && strchr (valid_suffixes, **p)) + { + 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; + return LONGINT_OK; +} + +#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 */ diff -r e512303d74b8 -r 2b8b9312ed33 lib/xstrtol.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/xstrtol.h Tue Mar 21 03:48:38 1995 +0000 @@ -0,0 +1,66 @@ +#ifndef _xstrtol_h_ +#define _xstrtol_h_ 1 + +#if STRING_TO_UNSIGNED +# define __xstrtol xstrtoul +# define __strtol strtoul +# define __unsigned unsigned +# define __ZLONG_MAX ULONG_MAX +#else +# define __xstrtol xstrtol +# define __strtol strtol +# define __unsigned /* empty */ +# define __ZLONG_MAX LONG_MAX +#endif + +#undef __P +#if defined (__STDC__) && __STDC__ +#define __P(x) x +#else +#define __P(x) () +#endif + +enum strtol_error + { + LONGINT_OK, LONGINT_INVALID, LONGINT_INVALID_SUFFIX_CHAR, LONGINT_OVERFLOW + }; +typedef enum strtol_error strtol_error; + +strtol_error + __xstrtol __P ((const char *s, char **ptr, int base, + __unsigned long int *val, const char *valid_suffixes)); + +#define _STRTOL_ERROR(exit_code, str, argument_type_string, err) \ + do \ + { \ + switch ((err)) \ + { \ + case LONGINT_OK: \ + abort (); \ + \ + case LONGINT_INVALID: \ + error ((exit_code), 0, "invalid %s `%s'", \ + (argument_type_string), (str)); \ + break; \ + \ + case LONGINT_INVALID_SUFFIX_CHAR: \ + error ((exit_code), 0, "invalid character following %s `%s'", \ + (argument_type_string), (str)); \ + break; \ + \ + case LONGINT_OVERFLOW: \ + /* FIXME: make this message dependent on STRING_TO_UNSIGNED */\ + error ((exit_code), 0, "%s `%s' larger than maximum long int",\ + (argument_type_string), (str)); \ + break; \ + } \ + } \ + while (0) + +#define STRTOL_FATAL_ERROR(str, argument_type_string, err) \ + _STRTOL_ERROR (2, str, argument_type_string, err) + +#define STRTOL_FAIL_WARN(str, argument_type_string, err) \ + _STRTOL_ERROR (0, str, argument_type_string, err) + +#endif /* _xstrtol_h_ */ diff -r e512303d74b8 -r 2b8b9312ed33 lib/xstrtoul.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/xstrtoul.c Tue Mar 21 03:48:38 1995 +0000 @@ -0,0 +1,2 @@ +#define STRING_TO_UNSIGNED 1 +#include "xstrtol.c" diff -r e512303d74b8 -r 2b8b9312ed33 lib/xstrtoul.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/xstrtoul.h Tue Mar 21 03:48:38 1995 +0000 @@ -0,0 +1,7 @@ +#ifndef _xstrtoul_h_ +#define _xstrtoul_h_ 1 + +#define STRING_TO_UNSIGNED 1 +#include "xstrtol.h" + +#endif /* _xstrtoul_h_ */