Initial import of a C portability framework and utility functions from

remctl so that the wallet client error handling can rest on a firmer
foundation.

4 files changed, 252 insertions, 0 deletions

diff --git a/tests/portable/asprintf-t.c b/tests/portable/asprintf-t.c
new file mode 100644
index 0000000..a362755
--- /dev/null
+++ b/tests/portable/asprintf-t.c
@@ -0,0 +1,51 @@
+/* $Id$ */
+/* asprintf and vasprintf test suite. */
+
+/* Written by Russ Allbery <rra@stanford.edu>
+   Copyright 2006 Board of Trustees, Leland Stanford Jr. University
+   See README for licensing terms. */
+
+#include <config.h>
+#include <system.h>
+
+#include <tests/libtest.h>
+
+static int
+vatest(char **result, const char *format, ...)
+{
+    va_list args;
+    int status;
+
+    va_start(args, format);
+    status = vasprintf(result, format, args);
+    va_end(args);
+    return status;
+}
+
+int
+main(void)
+{
+    char *result = NULL;
+
+    test_init(12);
+
+    ok_int(1, 7, asprintf(&result, "%s", "testing"));
+    ok_string(2, "testing", result);
+    free(result);
+    ok(3, 1);
+    ok_int(4, 0, asprintf(&result, "%s", ""));
+    ok_string(5, "", result);
+    free(result);
+    ok(6, 1);
+
+    ok_int(7, 6, vatest(&result, "%d %s", 2, "test"));
+    ok_string(8, "2 test", result);
+    free(result);
+    ok(9, 1);
+    ok_int(10, 0, vatest(&result, "%s", ""));
+    ok_string(11, "", result);
+    free(result);
+    ok(12, 1);
+
+    return 0;
+}
diff --git a/tests/portable/asprintf.c b/tests/portable/asprintf.c
new file mode 100644
index 0000000..221c993
--- /dev/null
+++ b/tests/portable/asprintf.c
@@ -0,0 +1,2 @@
+#define TESTING 1
+#include <portable/asprintf.c>
diff --git a/tests/portable/snprintf-t.c b/tests/portable/snprintf-t.c
new file mode 100644
index 0000000..9159fcf
--- /dev/null
+++ b/tests/portable/snprintf-t.c
@@ -0,0 +1,197 @@
+/* $Id$ */
+/* snprintf test suite. */
+
+/* Copyright (c) 2004, 2005, 2006
+       by Internet Systems Consortium, Inc. ("ISC")
+   Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+       2002, 2003 by The Internet Software Consortium and Rich Salz
+
+   This code is derived from software contributed to the Internet Software
+   Consortium by Rich Salz.
+
+   Permission to use, copy, modify, and distribute this software for any
+   purpose with or without fee is hereby granted, provided that the above
+   copyright notice and this permission notice appear in all copies.
+
+   THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+   REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY
+   SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+
+#include <config.h>
+#include <system.h>
+
+#include <tests/libtest.h>
+
+int test_snprintf(char *str, size_t count, const char *fmt, ...);
+int test_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
+
+static const char string[] = "abcdefghijklmnopqrstuvwxyz0123456789";
+
+static const char *const fp_formats[] = {
+    "%-1.5f",   "%1.5f",    "%31.9f",   "%10.5f",   "% 10.5f",  "%+22.9f",
+    "%+4.9f",   "%01.3f",   "%3.1f",    "%3.2f",    "%.0f",     "%.1f",
+    "%f",
+
+    /* %e and %g formats aren't really implemented yet. */
+#if 0
+    "%-1.5e",   "%1.5e",    "%31.9e",   "%10.5e",   "% 10.5e",  "%+22.9e",
+    "%+4.9e",   "%01.3e",   "%3.1e",    "%3.2e",    "%.0e",     "%.1e",
+    "%e",
+    "%-1.5g",   "%1.5g",    "%31.9g",   "%10.5g",   "% 10.5g",  "%+22.9g",
+    "%+4.9g",   "%01.3g",   "%3.1g",    "%3.2g",    "%.0g",     "%.1g",
+    "%g",
+#endif
+    NULL
+};
+static const char *const int_formats[] = {
+    "%-1.5d",   "%1.5d",    "%31.9d",   "%5.5d",    "%10.5d",   "% 10.5d",
+    "%+22.30d", "%01.3d",   "%4d",      "%d",       "%ld",      NULL
+};
+static const char *const uint_formats[] = {
+    "%-1.5lu",  "%1.5lu",   "%31.9lu",  "%5.5lu",   "%10.5lu",  "% 10.5lu",
+    "%+6.30lu", "%01.3lu",  "%4lu",     "%lu",      "%4lx",     "%4lX",
+    "%01.3lx",  "%1lo",     NULL
+};
+static const char *const llong_formats[] = {
+    "%lld",     "%-1.5lld",  "%1.5lld",    "%123.9lld",  "%5.5lld",
+    "%10.5lld", "% 10.5lld", "%+22.33lld", "%01.3lld",   "%4lld",
+    NULL
+};
+static const char *const ullong_formats[] = {
+    "%llu",     "%-1.5llu",  "%1.5llu",    "%123.9llu",  "%5.5llu",
+    "%10.5llu", "% 10.5llu", "%+22.33llu", "%01.3llu",   "%4llu",
+    "%llx",     "%llo",      NULL
+};
+
+static const double fp_nums[] = {
+    -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, 0.9996, 1.996,
+    4.136, 0.1, 0.01, 0.001, 10.1, 0
+};
+static long int_nums[] = {
+    -1, 134, 91340, 341, 0203, 0
+};
+static unsigned long uint_nums[] = {
+    (unsigned long) -1, 134, 91340, 341, 0203, 0
+};
+static long long llong_nums[] = {
+    ~(long long) 0,                     /* All-1 bit pattern. */
+    (~(unsigned long long) 0) >> 1,     /* Largest signed long long. */
+    -150, 134, 91340, 341,
+    0
+};
+static unsigned long long ullong_nums[] = {
+    ~(unsigned long long) 0,            /* All-1 bit pattern. */
+    (~(unsigned long long) 0) >> 1,     /* Largest signed long long. */
+    134, 91340, 341,
+    0
+};
+
+static void
+test_format(int n, int truncate, const char *expected, int count,
+            const char *format, ...)
+{
+    char buf[128];
+    int result;
+    va_list args;
+
+    va_start(args, format);
+    result = test_vsnprintf(buf, truncate ? 32 : sizeof(buf), format, args);
+    va_end(args);
+    if (!strcmp(buf, expected) && result == count) {
+        printf("ok %d\n", n);
+    } else {
+        printf("not ok %d\n", n);
+        printf("  format: %s\n", format);
+        if (strcmp(buf, expected))
+            printf("   saw: %s\n  want: %s\n", buf, expected);
+        if (result != count)
+            printf("  %d != %d\n", result, count);
+    }
+}
+
+int
+main(void)
+{
+    int n, i, count;
+    unsigned int j;
+    long lcount;
+    char lgbuf[128];
+
+    test_init((26 + (ARRAY_SIZE(fp_formats) - 1) * ARRAY_SIZE(fp_nums)
+              + (ARRAY_SIZE(int_formats) - 1) * ARRAY_SIZE(int_nums)
+              + (ARRAY_SIZE(uint_formats) - 1) * ARRAY_SIZE(uint_nums)
+              + (ARRAY_SIZE(llong_formats) - 1) * ARRAY_SIZE(llong_nums)
+              + (ARRAY_SIZE(ullong_formats) - 1) * ARRAY_SIZE(ullong_nums)));
+
+    ok(1, test_snprintf(NULL, 0, "%s", "abcd") == 4);
+    ok(2, test_snprintf(NULL, 0, "%d", 20) == 2);
+    ok(3, test_snprintf(NULL, 0, "Test %.2s", "abcd") == 7);
+    ok(4, test_snprintf(NULL, 0, "%c", 'a') == 1);
+    ok(5, test_snprintf(NULL, 0, "") == 0);
+
+    test_format(6, 1, "abcd", 4, "%s", "abcd");
+    test_format(7, 1, "20", 2, "%d", 20);
+    test_format(8, 1, "Test ab", 7, "Test %.2s", "abcd");
+    test_format(9, 1, "a", 1, "%c", 'a');
+    test_format(10, 1, "", 0, "");
+    test_format(11, 1, "abcdefghijklmnopqrstuvwxyz01234", 36, "%s",
+                string);
+    test_format(12, 1, "abcdefghij", 10, "%.10s", string);
+    test_format(13, 1, "  abcdefghij", 12, "%12.10s", string);
+    test_format(14, 1, "    abcdefghijklmnopqrstuvwxyz0", 40, "%40s",
+                string);
+    test_format(15, 1, "abcdefghij    ", 14, "%-14.10s", string);
+    test_format(16, 1, "              abcdefghijklmnopq", 50, "%50s",
+                string);
+    test_format(17, 1, "%abcd%", 6, "%%%0s%%", "abcd");
+    test_format(18, 1, "", 0, "%.0s", string);
+    test_format(19, 1, "abcdefghijklmnopqrstuvwxyz  444", 32, "%.26s  %d",
+                string, 4444);
+    test_format(20, 1, "abcdefghijklmnopqrstuvwxyz  -2.", 32,
+                "%.26s  %.1f", string, -2.5);
+    test_format(21, 1, "abcdefghij4444", 14, "%.10s%n%d", string, &count,
+                4444);
+    ok(22, count == 10);
+    test_format(23, 1, "abcdefghijklmnopqrstuvwxyz01234", 36, "%n%s%ln",
+                &count, string, &lcount);
+    ok(24, count == 0);
+    ok(25, lcount == 31);
+    test_format(26, 1, "(null)", 6, "%s", NULL);
+
+    n = 26;
+    for (i = 0; fp_formats[i] != NULL; i++)
+        for (j = 0; j < ARRAY_SIZE(fp_nums); j++) {
+            count = sprintf(lgbuf, fp_formats[i], fp_nums[j]);
+            test_format(++n, 0, lgbuf, count, fp_formats[i], fp_nums[j]);
+        }
+    for (i = 0; int_formats[i] != NULL; i++)
+        for (j = 0; j < ARRAY_SIZE(int_nums); j++) {
+            count = sprintf(lgbuf, int_formats[i], int_nums[j]);
+            test_format(++n, 0, lgbuf, count, int_formats[i],
+                        int_nums[j]);
+        }
+    for (i = 0; uint_formats[i] != NULL; i++)
+        for (j = 0; j < ARRAY_SIZE(uint_nums); j++) {
+            count = sprintf(lgbuf, uint_formats[i], uint_nums[j]);
+            test_format(++n, 0, lgbuf, count, uint_formats[i],
+                        uint_nums[j]);
+        }
+    for (i = 0; llong_formats[i] != NULL; i++)
+        for (j = 0; j < ARRAY_SIZE(llong_nums); j++) {
+            count = sprintf(lgbuf, llong_formats[i], llong_nums[j]);
+            test_format(++n, 0, lgbuf, count, llong_formats[i],
+                        llong_nums[j]);
+        }
+    for (i = 0; ullong_formats[i] != NULL; i++)
+        for (j = 0; j < ARRAY_SIZE(ullong_nums); j++) {
+            count = sprintf(lgbuf, ullong_formats[i], ullong_nums[j]);
+            test_format(++n, 0, lgbuf, count, ullong_formats[i],
+                        ullong_nums[j]);
+        }
+
+    return 0;
+}
diff --git a/tests/portable/snprintf.c b/tests/portable/snprintf.c
new file mode 100644
index 0000000..cff95b3
--- /dev/null
+++ b/tests/portable/snprintf.c
@@ -0,0 +1,2 @@
+#define TESTING 1
+#include <portable/snprintf.c>