tests: Avoid dependency on strtoumax.

[cdecl99.git] / t / testlib.c

diff --git a/t/testlib.c b/t/testlib.c
index c6b1975b1f3e8fdde8eeec655c3b0c2dae9046c1..41ea1fcb1d2f3fb2e43c1cbb8ba43536fe0ecad6 100644 (file)
--- a/t/testlib.c
+++ b/t/testlib.c
@@ -19,15 +19,14 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <getopt.h>
 #include <cdecl.h>
 
 #include "help.h"
 #include "test.h"
-
-static size_t printbuf_size;
-static char *printbuf;
+#include "intconv.h"
 
 void *realloc_nofail(void *ptr, size_t size)
 {
@@ -47,45 +46,36 @@ void *malloc_nofail(size_t size)
        return realloc_nofail(NULL, size);
 }
 
-void test_print_decl(struct cdecl *decl)
+static unsigned intconv_base(const char **str)
 {
-       size_t rc;
+       if ((*str)[0] == '0') {
+               if ((*str)[1] == 'X' || (*str)[1] == 'x') {
+                       *str += 2;
+                       return INTCONV_HEXADECIMAL;
+               }
 
-retry:
-       rc = cdecl_declare(printbuf, printbuf_size, decl);
-       if (rc >= printbuf_size) {
-               printbuf_size = rc + 1;
-               printbuf = realloc_nofail(printbuf, printbuf_size);
-               goto retry;
+               return INTCONV_OCTAL;
        }
 
-       printf("%s\n", printbuf);
+       return INTCONV_DECIMAL;
 }
 
-void test_explain_decl(struct cdecl *decl)
+bool test_strtoumax(uintmax_t *out, const char *s, uintmax_t limit)
 {
-       size_t rc;
-
-retry:
-       rc = cdecl_explain(printbuf, printbuf_size, decl);
-       if (rc >= printbuf_size) {
-               printbuf_size = rc + 1;
-               printbuf = realloc_nofail(printbuf, printbuf_size);
-               goto retry;
-       }
+       static const char idx[] = "0123456789abcdef0123456789ABCDEF";
+       unsigned base = intconv_base(&s);
+       uintmax_t v;
+       char *c, d;
 
-       printf("%s\n", printbuf);
-}
+       for (v = 0; (d = *s++);) {
+               if (!(c = strchr(idx, d)) || (d = (c-idx) & 0xf) >= base)
+                       return 0;
 
-bool strict_strtoul(unsigned long *val, const char *str, int base)
-{
-       char *end;
-
-       errno = 0;
-       *val = strtoul(str, &end, base);
-       if (errno != 0 || *end != 0)
-               return false;
+               if (!intconv_shift(&v, base, d) || v > limit)
+                       return 0;
+       }
 
+       *out = v;
        return true;
 }