Avoid gnulib getline module.

[cdecl99.git] / t / testlib.c

diff --git a/t/testlib.c b/t/testlib.c
index 5c76bb4dbec84bab03c3e2be23232345e109a2ab..dd9e0736a06e31687894cb121a1f2cf1f46072b9 100644 (file)
--- a/t/testlib.c
+++ b/t/testlib.c
@@ -1,6 +1,6 @@
 /*
  *  Miscellaneous functions used by the cdecl99 test suite.
- *  Copyright © 2011-2012, 2021-2023 Nick Bowler
+ *  Copyright © 2011-2012, 2021-2024 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,12 +19,30 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
 #include <errno.h>
 #include <getopt.h>
-#include <cdecl.h>
+
+#include "cdecl.h"
 
 #include "help.h"
 #include "test.h"
+#include "intconv.h"
+
+void print_error(const char *fmt, ...)
+{
+       extern const char *progname;
+       va_list ap;
+
+       fprintf(stderr, "%s: ", progname);
+
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+
+       fprintf(stderr, "\n");
+}
 
 void *realloc_nofail(void *ptr, size_t size)
 {
@@ -44,15 +62,36 @@ void *malloc_nofail(size_t size)
        return realloc_nofail(NULL, size);
 }
 
-bool strict_strtoul(unsigned long *val, const char *str, int base)
+static unsigned intconv_base(const char **str)
 {
-       char *end;
+       if ((*str)[0] == '0') {
+               if ((*str)[1] == 'X' || (*str)[1] == 'x') {
+                       *str += 2;
+                       return INTCONV_HEXADECIMAL;
+               }
 
-       errno = 0;
-       *val = strtoul(str, &end, base);
-       if (errno != 0 || *end != 0)
-               return false;
+               return INTCONV_OCTAL;
+       }
+
+       return INTCONV_DECIMAL;
+}
+
+bool test_strtoumax(uintmax_t *out, const char *s, uintmax_t limit)
+{
+       static const char idx[] = "0123456789abcdef0123456789ABCDEF";
+       unsigned base = intconv_base(&s);
+       uintmax_t v;
+       char *c, d;
+
+       for (v = 0; (d = *s++);) {
+               if (!(c = strchr(idx, d)) || (d = (c-idx) & 0xf) >= base)
+                       return 0;
+
+               if (!intconv_shift(&v, base, d) || v > limit)
+                       return 0;
+       }
 
+       *out = v;
        return true;
 }