Update.

1998-09-20 18:07  Ulrich Drepper  <drepper@cygnus.com>

	* stdlib/tst-strtol.c: Add more checks.
	Patch by Zack Weinberg <zack@rabi.columbia.edu>.

diff --git a/ChangeLog b/ChangeLog
index cc83838ed5bc76fd071d268485e0c0a9f6ff939a..0593bd18c33341201d2ec0312dc0d1647749ed07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-09-20 18:07  Ulrich Drepper  <drepper@cygnus.com>
+
+       * stdlib/tst-strtol.c: Add more checks.
+       Patch by Zack Weinberg <zack@rabi.columbia.edu>.
+
 1998-09-20 09:37  Ulrich Drepper  <drepper@cygnus.com>
 
        * elf/Versions [GLIBC_2.1] (libc): Add __fpu_control.

diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c
index 483e71373927532f3a553f6c9acdd97b3c763bda..c072891ddbc4547313ac48069bcbbb23df60e1ef 100644 (file)
--- a/stdlib/tst-strtol.c
+++ b/stdlib/tst-strtol.c
@@ -18,58 +18,78 @@ struct ltest
   };
 static const struct ltest tests[] =
   {
-#if LONG_MAX == 0x7fffffff
-    /* First, signed numbers.  */
-    { "   -17",                -17,            0,      0,      0 },
-    { " +0x123fg",     0x123f,         0,      'g',    0 },
-    { "2147483647",    2147483647,     0,      0,      0 },
-    { "2147483648",    2147483647,     0,      0,      ERANGE },
-    { "214748364888",  2147483647,     0,      0,      ERANGE },
-    { "2147483650",    2147483647,     0,      0,      ERANGE },
-    { "-2147483649",   0x80000000,     0,      0,      ERANGE },
-    { "-2147483648",   0x80000000,     0,      0,      0 },
-    { "0123",          0123,           0,      0,      0 },
-    { "0x1122334455z", 2147483647,     16,     'z',    ERANGE },
-    { "0x0xc",         0,              0,      'x',    0 },
-    { "yz!",           34*36+35,       36,     '!',    0 },
-    { NULL,            0,              0,      0,      0 },
+  /* 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},
 
-    /* Then unsigned.  */
-    { "  0",           0,              0,      0,      0 },
-    { "0xffffffffg",   0xffffffff,     0,      'g',    0 },
-    { "0xf1f2f3f4f5",  0xffffffff,     0,      0,      ERANGE },
-    { "-0x123456789",  0xffffffff,     0,      0,      ERANGE },
-    { "-0xfedcba98",   0x01234568,     0,      0,      0 },
-    { NULL,            0,              0,      0,      0 },
-#else
-    /* assume 64 bit long... */
+  /* 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},
 
-    /* First, signed numbers.  */
-    { "   -17",                        -17,            0,      0,      0 },
-    { " +0x123fg",             0x123f,         0,      'g',    0 },
-    { "2147483647",            2147483647,     0,      0,      0 },
-    { "9223372036854775807",   9223372036854775807,    0,      0,      0 },
-    { "9223372036854775808",   9223372036854775807,    0,      0,      ERANGE },
-    { "922337203685477580777", 9223372036854775807,    0,      0,      ERANGE },
-    { "9223372036854775810",   9223372036854775807,    0,      0,      ERANGE },
-    { "-2147483648",           -2147483648,    0,      0,      0 },
-    { "-9223372036854775808",  -9223372036854775808,   0,      0,      0 },
-    { "-9223372036854775809",  -9223372036854775808,   0,      0,      ERANGE },
-    { "0123",          0123,           0,      0,      0 },
-    { "0x112233445566778899z", 9223372036854775807,    16,     'z',    ERANGE },
-    { "0x0xc",         0,              0,      'x',    0 },
-    { "yz!",           34*36+35,       36,     '!',    0 },
-    { NULL,            0,              0,      0,      0 },
+  /* case insensitivity... */
+  {"abcd", 0xabcd, 16, 0, 0},
+  {"AbCd", 0xabcd, 16, 0, 0},
+  {"0xABCD", 0xabcd, 16, 0, 0},
+  {"0Xabcd", 0xabcd, 16, 0, 0},
 
-    /* Then unsigned.  */
-    { "  0",           0,              0,      0,      0 },
-    { "0xffffffffg",   0xffffffff,     0,      'g',    0 },
-    { "0xffffffffffffffffg",   0xffffffffffffffff,     0,      'g',    0 },
-    { "0xf1f2f3f4f5f6f7f8f9",  0xffffffffffffffff,     0,      0,      ERANGE },
-    { "-0x123456789abcdef01",  0xffffffffffffffff,     0,      0,      ERANGE },
-    { "-0xfedcba987654321",    0xf0123456789abcdf,     0,      0,      0 },
-    { NULL,            0,              0,      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},
+  
+  /* extremes... */
+#if LONG_MAX == 0x7fffffff
+  {"2147483647", 2147483647, 0, 0, 0},
+  {"2147483648", 2147483647, 0, 0, ERANGE},
+  {"214748364888", 2147483647, 0, 0, ERANGE},
+  {"2147483650", 2147483647, 0, 0, ERANGE},
+  {"-2147483648", 0x80000000, 0, 0, 0},
+  {"-2147483649", 0x80000000, 0, 0, ERANGE},
+  {"0x1122334455z", 2147483647, 16, 'z', ERANGE},
+#else
+  {"9223372036854775807", 9223372036854775807, 0, 0, 0},
+  {"9223372036854775808", 9223372036854775807, 0, 0, ERANGE},
+  {"922337203685477580777", 9223372036854775807, 0, 0, ERANGE},
+  {"9223372036854775810", 9223372036854775807, 0, 0, ERANGE},
+  {"-2147483648", -2147483648, 0, 0, 0},
+  {"-9223372036854775808", -9223372036854775808, 0, 0, 0},
+  {"-9223372036854775809", -9223372036854775808, 0, 0, ERANGE},
+  {"0x112233445566778899z", 9223372036854775807, 16, 'z', ERANGE},
+#endif
+  {NULL, 0, 0, 0, 0},
+
+  /* Then unsigned.  */
+  {"  0", 0, 0, 0, 0},
+  {"0xffffffffg", 0xffffffff, 0, 'g', 0},
+#if LONG_MAX == 0x7fffffff
+  {"-0xfedcba98", 0x01234568, 0, 0, 0},
+  {"0xf1f2f3f4f5", 0xffffffff, 0, 0, ERANGE},
+  {"-0x123456789", 0xffffffff, 0, 0, ERANGE},
+#else
+  {"0xffffffffffffffffg", 0xffffffffffffffff, 0, 'g', 0},
+  {"-0xfedcba987654321", 0xf0123456789abcdf, 0, 0, 0},
+  {"0xf1f2f3f4f5f6f7f8f9", 0xffffffffffffffff, 0, 0, ERANGE},
+  {"-0x123456789abcdef01", 0xffffffffffffffff, 0, 0, ERANGE},
 #endif
+  {NULL, 0, 0, 0, 0},
   };
 
 static void expand __P ((char *dst, int c));