Update.
1999-06-14 Geoff Keating <geoffk@ozemail.com.au> * stdlib/tst-strtoll.c: New file. * stdlib/Makefile (tests): Add tst-strtoll.c * stdlib/strtol.c: It is not generally true that if (unsigned)a*(unsigned)b overflows, then the result is less than 'a'.
This commit is contained in:
Ulrich Drepper
parent
540009244c
commit
61464e3e73
@ -1,3 +1,11 @@
|
||||
1999-06-14 Geoff Keating <geoffk@ozemail.com.au>
|
||||
|
||||
* stdlib/tst-strtoll.c: New file.
|
||||
* stdlib/Makefile (tests): Add tst-strtoll.c
|
||||
* stdlib/strtol.c: It is not generally true that if
|
||||
(unsigned)a*(unsigned)b overflows, then the result is
|
||||
less than 'a'.
|
||||
|
||||
1999-06-14 Thorsten Kukuk <kukuk@suse.de>
|
||||
|
||||
* nscd/connections.c (handle_request): Only root is allowed to
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
|
||||
# The GNU C Library is free software; you can redistribute it and/or
|
||||
@ -51,7 +51,7 @@ routines := \
|
||||
|
||||
distribute := exit.h grouping.h abort-instr.h isomac.c
|
||||
tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
|
||||
test-canon test-canon2
|
||||
test-canon test-canon2 tst-strtoll
|
||||
|
||||
|
||||
# Several mpn functions from GNU MP are used by the strtod function.
|
||||
|
||||
173
stdlib/tst-strtoll.c
Normal file
173
stdlib/tst-strtoll.c
Normal file
@ -0,0 +1,173 @@
|
||||
/* My bet is this was written by Chris Torek.
|
||||
I reformatted and ansidecl-ized it, and tweaked it a little. */
|
||||
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
|
||||
struct ltest
|
||||
{
|
||||
const char *str; /* Convert this. */
|
||||
unsigned long long int expect; /* To get this. */
|
||||
int base; /* Use this base. */
|
||||
char left; /* With this left over. */
|
||||
int err; /* And this in errno. */
|
||||
};
|
||||
static const struct ltest tests[] =
|
||||
{
|
||||
/* First, signed numbers: */
|
||||
/* simple... */
|
||||
{"123", 123, 0, 0, 0},
|
||||
{"+123", 123, 0, 0, 0},
|
||||
{" 123", 123, 0, 0, 0},
|
||||
{" 123 ", 123, 0, ' ', 0},
|
||||
{" -17", -17, 0, 0, 0},
|
||||
|
||||
/* implicit base... */
|
||||
{"0123", 0123, 0, 0, 0},
|
||||
{"0123a", 0123, 0, 'a', 0},
|
||||
{"01239", 0123, 0, '9', 0},
|
||||
{"0x123", 0x123, 0, 0, 0},
|
||||
{"-0x123", -0x123, 0, 0, 0},
|
||||
{"0x0xc", 0, 0, 'x', 0},
|
||||
{" +0x123fg", 0x123f, 0, 'g', 0},
|
||||
|
||||
/* explicit base... */
|
||||
{"123", 0x123, 16, 0, 0},
|
||||
{"0x123", 0x123, 16, 0, 0},
|
||||
{"123", 0123, 8, 0, 0},
|
||||
{"0123", 0123, 8, 0, 0},
|
||||
{"0123", 123, 10, 0, 0},
|
||||
{"0x123", 0, 10, 'x', 0},
|
||||
|
||||
/* case insensitivity... */
|
||||
{"abcd", 0xabcd, 16, 0, 0},
|
||||
{"AbCd", 0xabcd, 16, 0, 0},
|
||||
{"0xABCD", 0xabcd, 16, 0, 0},
|
||||
{"0Xabcd", 0xabcd, 16, 0, 0},
|
||||
|
||||
/* odd bases... */
|
||||
{"0xyz", 33 * 35 + 34, 35, 'z', 0},
|
||||
{"yz!", 34 * 36 + 35, 36, '!', 0},
|
||||
{"-yz", -(34*36 + 35), 36, 0, 0},
|
||||
{"GhI4", ((16*20 + 17)*20 + 18)*20 + 4, 20, 0, 0},
|
||||
|
||||
/* special case for the 32-bit version of strtoll,
|
||||
from a ncftp configure test */
|
||||
{"99000000001", 1000000000ll * 99ll + 1ll, 0, 0},
|
||||
|
||||
/* extremes... */
|
||||
{"9223372036854775807", 9223372036854775807ll, 0, 0, 0},
|
||||
{"9223372036854775808", 9223372036854775807ll, 0, 0, ERANGE},
|
||||
{"922337203685477580777", 9223372036854775807ll, 0, 0, ERANGE},
|
||||
{"9223372036854775810", 9223372036854775807ll, 0, 0, ERANGE},
|
||||
{"-2147483648", -2147483648ll, 0, 0, 0},
|
||||
{"-9223372036854775808", -9223372036854775808ll, 0, 0, 0},
|
||||
{"-9223372036854775809", -9223372036854775808ll, 0, 0, ERANGE},
|
||||
{"0x112233445566778899z", 9223372036854775807ll, 16, 'z', ERANGE},
|
||||
{NULL, 0, 0, 0, 0},
|
||||
|
||||
/* Then unsigned. */
|
||||
{" 0", 0, 0, 0, 0},
|
||||
{"0xffffffffg", 0xffffffff, 0, 'g', 0},
|
||||
{"0xffffffffffffffffg", 0xffffffffffffffffull, 0, 'g', 0},
|
||||
{"-0xfedcba987654321", 0xf0123456789abcdfull, 0, 0, 0},
|
||||
{"0xf1f2f3f4f5f6f7f8f9", 0xffffffffffffffffull, 0, 0, ERANGE},
|
||||
{"-0x123456789abcdef01", 0xffffffffffffffffull, 0, 0, ERANGE},
|
||||
{NULL, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
static void expand __P ((char *dst, int c));
|
||||
|
||||
int
|
||||
main (int argc, char ** argv)
|
||||
{
|
||||
register const struct ltest *lt;
|
||||
char *ep;
|
||||
int status = 0;
|
||||
int save_errno;
|
||||
|
||||
for (lt = tests; lt->str != NULL; ++lt)
|
||||
{
|
||||
register long long int l;
|
||||
|
||||
errno = 0;
|
||||
l = strtoll (lt->str, &ep, lt->base);
|
||||
save_errno = errno;
|
||||
printf ("strtoll(\"%s\", , %d) test %u",
|
||||
lt->str, lt->base, (unsigned int) (lt - tests));
|
||||
if (l == (long long int) lt->expect && *ep == lt->left
|
||||
&& save_errno == lt->err)
|
||||
puts("\tOK");
|
||||
else
|
||||
{
|
||||
puts("\tBAD");
|
||||
if (l != (long long int) lt->expect)
|
||||
printf(" returns %lld, expected %lld\n",
|
||||
l, (long long int) lt->expect);
|
||||
if (lt->left != *ep)
|
||||
{
|
||||
char exp1[5], exp2[5];
|
||||
expand (exp1, *ep);
|
||||
expand (exp2, lt->left);
|
||||
printf (" leaves '%s', expected '%s'\n", exp1, exp2);
|
||||
}
|
||||
if (save_errno != lt->err)
|
||||
printf (" errno %d (%s) instead of %d (%s)\n",
|
||||
save_errno, strerror (save_errno),
|
||||
lt->err, strerror (lt->err));
|
||||
status = 1;
|
||||
}
|
||||
}
|
||||
|
||||
for (++lt; lt->str != NULL; lt++)
|
||||
{
|
||||
register unsigned long long int ul;
|
||||
|
||||
errno = 0;
|
||||
ul = strtoull (lt->str, &ep, lt->base);
|
||||
save_errno = errno;
|
||||
printf ("strtoull(\"%s\", , %d) test %u",
|
||||
lt->str, lt->base, (unsigned int) (lt - tests));
|
||||
if (ul == lt->expect && *ep == lt->left && save_errno == lt->err)
|
||||
puts("\tOK");
|
||||
else
|
||||
{
|
||||
puts ("\tBAD");
|
||||
if (ul != lt->expect)
|
||||
printf (" returns %llu, expected %llu\n",
|
||||
ul, lt->expect);
|
||||
if (lt->left != *ep)
|
||||
{
|
||||
char exp1[5], exp2[5];
|
||||
expand (exp1, *ep);
|
||||
expand (exp2, lt->left);
|
||||
printf (" leaves '%s', expected '%s'\n", exp1, exp2);
|
||||
}
|
||||
if (save_errno != lt->err)
|
||||
printf (" errno %d (%s) instead of %d (%s)\n",
|
||||
save_errno, strerror (save_errno),
|
||||
lt->err, strerror (lt->err));
|
||||
status = 1;
|
||||
}
|
||||
}
|
||||
|
||||
exit (status ? EXIT_FAILURE : EXIT_SUCCESS);
|
||||
}
|
||||
|
||||
static void
|
||||
expand (dst, c)
|
||||
char *dst;
|
||||
int c;
|
||||
{
|
||||
if (isprint (c))
|
||||
{
|
||||
dst[0] = c;
|
||||
dst[1] = '\0';
|
||||
}
|
||||
else
|
||||
(void) sprintf (dst, "%#.3o", (unsigned int) c);
|
||||
}
|
||||
@ -348,6 +348,7 @@ INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM)
|
||||
if (sizeof (long int) != sizeof (LONG int))
|
||||
{
|
||||
unsigned long int j = 0;
|
||||
unsigned long int jmax = ULONG_MAX / base;
|
||||
|
||||
for (;c != L_('\0'); c = *++s)
|
||||
{
|
||||
@ -362,18 +363,14 @@ INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM)
|
||||
if ((int) c >= base)
|
||||
break;
|
||||
/* Note that we never can have an overflow. */
|
||||
else
|
||||
else if (j >= jmax)
|
||||
{
|
||||
unsigned long int jj = j * (unsigned long int) base;
|
||||
if (jj < j)
|
||||
{
|
||||
/* We have an overflow. Now use the long representation. */
|
||||
i = (unsigned LONG int) j;
|
||||
goto use_long;
|
||||
}
|
||||
j = jj;
|
||||
j += c;
|
||||
/* We have an overflow. Now use the long representation. */
|
||||
i = (unsigned LONG int) j;
|
||||
goto use_long;
|
||||
}
|
||||
else
|
||||
j = j * (unsigned long int) base + c;
|
||||
}
|
||||
|
||||
i = (unsigned LONG int) j;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user