libcdecl: reduce snprintf reliance for error reporting.

[cdecl99.git] / t / cdeclerr.c

diff --git a/t/cdeclerr.c b/t/cdeclerr.c
index b69f7e60971a8088731889df2cfa4f13ccf078d5..b4a014ca1e8b2b06fa1c93a0c526007d913eb188 100644 (file)
--- a/t/cdeclerr.c
+++ b/t/cdeclerr.c
@@ -27,6 +27,11 @@
 #include "errmsg.h"
 #include "tap.h"
 
+const char *cdecl__token_name(unsigned token)
+{
+       assert(0);
+}
+
 static char *fmt_char(int c, char *buf)
 {
        int escape = 0;
@@ -53,6 +58,15 @@ static char *fmt_char(int c, char *buf)
        return buf;
 }
 
+static void check_code(const struct cdecl_error *err, unsigned expect)
+{
+       if (!tap_result(err->code == expect, "returned error code")) {
+               tap_diag("Failed, unexpected result");
+               tap_diag("   Received: %u", err->code);
+               tap_diag("   Expected: %u", expect);
+       }
+}
+
 static void check_fixed_string(size_t len)
 {
        const struct cdecl_error *err;
@@ -69,15 +83,11 @@ static void check_fixed_string(size_t len)
        memset(work2, 'X', len - 1);
 
        tap_diag("cdecl__err w/ %lu-byte string", (unsigned long)len);
-       cdecl__err(1234, work1, "");
+       cdecl__err(1234, work1, "XX");
        memset(work1, 0, len);
        err = cdecl_get_error();
 
-       if (!tap_result(err->code == 1234, "returned error code")) {
-               tap_diag("Failed, unexpected result");
-               tap_diag("   Received: %u", err->code);
-               tap_diag("   Expected: 1234");
-       }
+       check_code(err, 1234);
 
        errlen = strlen(err->str);
        if (!tap_result(errlen == len-1, "returned string length")) {
@@ -103,6 +113,32 @@ static void check_fixed_string(size_t len)
        free(work1);
 }
 
+static void check_format_string(const char *fmt, const char *arg)
+{
+       size_t sz = strlen(fmt) + strlen(arg);
+       const struct cdecl_error *err;
+       char *work;
+
+       work = malloc(sz + 1);
+       if (!work)
+               abort();
+       sprintf(work, fmt, arg);
+
+       cdecl__err(5432, fmt, arg);
+       err = cdecl_get_error();
+
+       tap_diag("cdecl__err(\"%s\", \"%s\")", fmt, arg);
+       check_code(err, 5432);
+
+       if (!tap_result(!strcmp(err->str, work), "returned string")) {
+               tap_diag("Failed, unexpected result");
+               tap_diag("   Received: %.*s", (int)sz, err->str);
+               tap_diag("   Expected: %s", work);
+       }
+
+       free(work);
+}
+
 static void check_enomem()
 {
        const char expmsg[] = "failed to allocate memory";
@@ -112,12 +148,7 @@ static void check_enomem()
        cdecl__errmsg(CDECL__ENOMEM);
        err = cdecl_get_error();
 
-       if (!tap_result(err->code == CDECL_ENOMEM, "returned error code")) {
-               tap_diag("Failed, unexpected result");
-               tap_diag("   Received: %u", err->code);
-               tap_diag("   Expected: %d", CDECL_ENOMEM);
-       }
-
+       check_code(err, CDECL_ENOMEM);
        if (!tap_result(!strcmp(err->str, "failed to allocate memory"),
                        "returned string"))
        {
@@ -134,14 +165,23 @@ static void check_enomem()
        }
 }
 
+#define IFNLS(a, b) (ENABLE_NLS ? (a) : (b))
+
 int main(void)
 {
-       tap_plan(3*3 + 2);
+       tap_plan(3*3 + 2 + 2);
 
        check_fixed_string(50);
        check_fixed_string(500);
        check_fixed_string(5000);
 
+       /*
+        * When NLS is disabled, for implementation simplicity only format
+        * strings ending with %s are supported as this is sufficient.
+        * Otherwise, %s may appear anywhere.
+        */
+       check_format_string(IFNLS("hello %s world", "hello world %s"), "za");
+
        check_enomem();
 
        tap_done();