X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FTEST_strtoi.c;h=cf2d2698ebc24649157adce39fcdeb84c4973ad8;hb=db55040ba8814edf681d4ccc12ad8955d8aa404a;hp=6d89224eaa83b92c9231a8b57d4d8a69657ea106;hpb=85653b526282abdbcab5c9b2d3aed13b74261aa9;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/TEST_strtoi.c b/Usermode/Libraries/libc.so_src/TEST_strtoi.c
index 6d89224e..cf2d2698 100644
--- a/Usermode/Libraries/libc.so_src/TEST_strtoi.c
+++ b/Usermode/Libraries/libc.so_src/TEST_strtoi.c
@@ -7,15 +7,77 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <limits.h>
+#include <string.h>	// strerror
 
-#define TST(t, class, base, val, exp, fmt) do {\
-	t ret = strto##class(#val, NULL, base); \
-	if( ret != exp ) \
-		printf("FAIL strto"#class"('"#val"') != "#val" (act 0x"fmt")\n", ret);\
+#define STR_(v)	#v
+#define STR(v)	STR_(v)
+#define TST(t, class, base, val, exp, fmt, ofs, exp_errno) do {\
+	const char *in = val;\
+	char *end;\
+	errno = 0;\
+	t ret = strto##class(in, &end, base); \
+	if( ret != exp ) { \
+		fprintf(stderr, "FAIL strto"#class"('%s') != "#exp" (act "fmt")\n", in, ret);\
+		exit(1); \
+	} \
+	if( end != in+ofs ) { \
+		fprintf(stderr, "FAIL strto"#class"('%s') returned wrong end: %p (+%zi) instead of %p (+%zi)\n",\
+			in,end,end-in,in+ofs,(size_t)ofs);\
+		exit(1); \
+	} \
+	if( exp_errno != errno ) { \
+		fprintf(stderr, "FAIL strto"#class"('%s') returned wrong errno, exp '%s', got '%s'\n",\
+			in, strerror(exp_errno), strerror(errno));\
+		exit(1); \
+	} \
 }while(0)
 
+#define PRIMEBUF(fmt, val)	buf_len = snprintf(buf, sizeof(buf), fmt, val)
+
 int main(int argc, char *argv[])
 {
-	TST(unsigned long, ul, 0, 0x10ec, 0x10ec, "%lx");
-	TST(unsigned long long, ull, 0, 0xffeed10ec, 0xffeed10ec, "%llx");
+	char buf[64];
+	size_t	buf_len;
+	
+	// Success cases
+	TST(unsigned long, ul, 0, "0x10ec", 0x10ec, "%lx", 2+4, 0);
+	TST(unsigned long long, ull, 0, "0xffeed10ec", 0xffeed10ec, "%llx", 2+9, 0);
+	TST(unsigned long long, ull, 0, "01234567", 01234567, "%llo", 8, 0);
+	TST(unsigned long long, ull, 0, "1234567", 1234567, "%lld", 7, 0);
+	TST(long long, ll, 0, "-1", -1, "%lld", 2, 0);	// -1
+	TST(long long, ll, 0, "100113", 100113, "%lld", strlen(in), 0);
+	TST(long long, ll, 0, "0x101", 0x101, "0x%llx", strlen(in), 0);
+	
+	// Invalid strings
+	TST(unsigned long long, ull, 0, "0x",  0, "%llx", 1, 0);	// Single 0
+	TST(unsigned long long, ull, 0, "0xg", 0, "%llx", 1, 0);	// Single 0
+	TST(unsigned long long, ull, 0, "-a", 0, "%llx", 0, 0);	// Nothing
+	TST(long long, ll, 0, "-a", 0, "%lld", 0, 0);	// Nothing
+	TST(long long, ll, 0, "-1aaatg", -1, "%lld", 2, 0);	// -1 (with traling junk)
+	TST(long long, ll, 0, "-+1aaatg", 0, "%lld", 0, 0);	// Nothing
+	TST(long long, ll, 0, "-  1", 0, "%lld", 0, 0);	// Nothing
+	TST(long long, ll, 0, "01278  1", 0127, "%lld", 4, 0);	// 0127 with junk
+	
+	// Range edges
+	PRIMEBUF("0x%llx", ULLONG_MAX);
+	TST(unsigned long long, ull, 0, buf, ULLONG_MAX, "0x%llx", buf_len, 0);
+	PRIMEBUF("%llu", ULLONG_MAX);
+	TST(unsigned long long, ull, 0, buf, ULLONG_MAX, "%llu", buf_len, 0);
+	PRIMEBUF("-%llu", (long long)LONG_MAX);
+	TST(long, l, 0, buf, -LONG_MAX, "%ld", buf_len, 0);
+	
+	// Out of range
+	// - When the range limit is hit, valid characters should still be consumed (just not used)
+	TST(unsigned long long, ull, 0, "0x10000FFFF0000FFFF", ULLONG_MAX, "%llx", strlen(in), ERANGE);
+	TST(unsigned long, ul, 0, "0x10000FFFF0000FFFF", ULONG_MAX, "%lx", strlen(in), ERANGE);
+	TST(long, l, 0, "0x10000FFFF0000FFFF", LONG_MAX, "%ld", strlen(in), ERANGE);
+	TST(long, l, 0, "-0x10000FFFF0000FFFF", LONG_MIN, "%ld", strlen(in), ERANGE);
+	if( LONG_MIN < -LONG_MAX )
+	{
+		// Ensure that if -LONG_MIN is greater than LONG_MAX, that converting it leaves a range error
+		PRIMEBUF("%ld", LONG_MIN);
+		TST(long, l, 0, buf+1, LONG_MAX, "%ld", buf_len-1, ERANGE);
+	}
 }