1999-06-15 12:07:01 +00:00
|
|
|
/* 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},
|
Update.
1999-06-18 Thorsten Kukuk <kukuk@suse.de>
* sysdeps/alpha/atomicity.h: Correct counting of subsections.
1999-06-17 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* stdlib/tst-strtoll.c: Avoid warning about huge constant.
1999-06-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* stdio-common/vfprintf.c (group_member): Make parameters and
return types pointers to CHAR_T instead of UCHAR_T.
(vfprintf): Change type of work_buffer, workend and string to
CHAR_T pointer/array.
(process_arg, process_string_arg): Adjust/remove casts. Add
missing use of L_ macro.
(printf_unknown): Add missing uses of L_ macro.
1999-06-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* wcsmbs/wcschrnul.c: Explicitly cast return value to avoid
warning.
1999-06-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* libio/wgenops.c (__wuflow): Fix use of WEOF vs. EOF. Call
_IO_switch_to_wget_mode instead of _IO_switch_to_get_mode.
(__wunderflow): Likewise.
(_IO_switch_to_wget_mode): Likewise.
(_IO_init_wmarker): Likewise.
* libio/wfileops.c (_IO_wfile_seekoff): Call
_IO_switch_to_wget_mode, not _IO_switch_to_get_mode.
(_IO_wfile_jumps): Fix pbackfail entry.
* libio/iosetvbuf.c (_IO_setvbuf): Only call wide char setbuf
function if the stream is currently unoriented.
1999-06-19 Zack Weinberg <zack@rabi.columbia.edu>
* wcsmbs/wchar.h: Define __need___va_list before including stdarg.h.
Wrap all wide stream functions with #ifdef __USE_ISOC9X. Use
__gnuc_va_list in v*w(printf|scanf) prototypes.
1999-06-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* libio/oldiopopen.c (_IO_old_proc_open): Apply change from
1999-03-29 to iopopen also here.
Reported by Richard Braakman <dark@xs4all.nl>.
1999-06-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* include/features.h: Use __GNUC_PREREQ.
* sysdeps/i386/fpu/bits/mathinline.h: Likewise
1999-06-19 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* stdio-common/vfscanf.c (ungetc, inchar) [COMPILE_WPRINTF]:
Change EOF to WEOF and remove cast.
(UNGETC): Remove macro.
(_IO_vfwscanf): Change isspace to ISSPACE and UNGETC to ungetc.
* stdio-common/printf-parse.h (find_spec) [!COMPILE_WPRINTF]:
Change ISASCII to isascii and MBRLEN to mbrlen.
(parse_one_spec): Compare info.spec always against wchar_t
values.
* stdio-common/vfprintf.c: Remove unused ISASCII and MBRLEN.
(_itoa, _itoa_word) [COMPILE_WRPINTF]: Don't cast second argument.
(NOT_IN_JUMP_RANGE, CHAR_CLASS): Change (int) to (INT_T), use L_.
1999-06-19 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* libio/Makefile (shared-only-routines): Add oldiofgetpos,
oldiofgetpos64, oldiofsetpos and oldiofsetpos64.
(routines): Include oldiofgetpos, oldiofgetpos64, oldiofsetpos and
oldiofsetpos64 only if doing versioning.
1999-06-21 13:38:44 +00:00
|
|
|
{"-9223372036854775808", -9223372036854775807ll - 1, 0, 0, 0},
|
|
|
|
{"-9223372036854775809", -9223372036854775807ll - 1, 0, 0, ERANGE},
|
1999-06-15 12:07:01 +00:00
|
|
|
{"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},
|
|
|
|
};
|
|
|
|
|
2000-05-23 08:43:26 +00:00
|
|
|
/* Prototypes for local functions. */
|
|
|
|
static void expand (char *dst, int c);
|
1999-06-15 12:07:01 +00:00
|
|
|
|
|
|
|
int
|
2000-05-23 08:43:26 +00:00
|
|
|
main (void)
|
1999-06-15 12:07:01 +00:00
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|