From 1fe68e23b4f4c886bea00b169346b8ad195208e4 Mon Sep 17 00:00:00 2001
From: Tyge Løvset <tylo@norceresearch.no>
Date: Fri, 23 Oct 2020 22:42:35 +0200
Subject: Fix1: Added _Bool. Fix2: Handle '*' flag in format. 3: Removed
 support for %-format. Warns when trying to use.

---
 stc/cfmt.h | 50 ++++++++++++++++++++------------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/stc/cfmt.h b/stc/cfmt.h
index aefd4130..10f23d2d 100644
--- a/stc/cfmt.h
+++ b/stc/cfmt.h
@@ -47,6 +47,7 @@ _cfmt_conv(int nargs, const char *fmt, ...);
 #endif
 
 #define _cfmt(x) _Generic ((x), \
+    _Bool: "d:bool", \
     _cfmt_uschar(), \
     short: "hd", \
     unsigned short: "hu", \
@@ -145,14 +146,14 @@ _cfmt_conv(int nargs, const char *fmt, ...);
 STC_DEF void
 _cfmt_printf(int s, const char* fmt, ...) {
     va_list args;
-	va_start(args, fmt);
+    va_start(args, fmt);
     vfprintf(s ? stderr : stdout, fmt, args);
     va_end(args);
 }
 
 STC_DEF char *
 _cfmt_conv(int nargs, const char *fmt, ...) {
-    char *fmt2 = (char *) malloc(strlen(fmt)*2 + 1), *p = fmt2, *f, ch;
+    char *fmt1 = (char *) malloc(strlen(fmt)*2 + 1), *p = fmt1, *f, ch;
     const char *fmt0 = fmt;
     int n = 0;
     va_list args;
@@ -160,47 +161,36 @@ _cfmt_conv(int nargs, const char *fmt, ...) {
     do {
         switch ((ch = *fmt)) {
         case '%':
-            *p++ = *fmt++;
-            if (*fmt == '%') break;
+            if (fmt[1] == '%') *p++ = *fmt++;
+            else fprintf(stderr, "ERROR: c_printf() illegal unescaped %%: %s\n", fmt0);
+            break;
+        case '}':
+            if (fmt[1] == '}') ++fmt;
+            break;
+        case '{':
+            if (fmt[1] == '{') { ++fmt; break; }
+            if (fmt[1] != ':' && fmt[1] != '}') break;
             if (++n > nargs) {
                 fprintf(stderr, "ERROR: c_printf() missing argument(%d): %s\n", n, fmt0);
                 break;
             }
+            *p++ = '%';
+            fmt += 1 + (fmt[1] == ':');
             f = va_arg(args, char *);
-            while (*fmt && !strchr("csdioxXufFeEaAgGnpt", *fmt))
-                *p++ = *fmt++;
-            if (*fmt == 't') {
-                ++fmt; 
+            while (*fmt != '}' && *fmt)
+                if ((*p++ = *fmt++) == '*' && ++n <= nargs)
+                    f = va_arg(args, char *);
+            if (!strchr("csdioxXufFeEaAgGnp", fmt[-1]))
                 while (*f) *p++ = *f++;
-            }
+            fmt += (*fmt == '}');
             continue;
-        case '}':
-            if (fmt[1] == '}') ++fmt;
-            break;
-        case '{':
-            if (fmt[1] == '{') { ++fmt; break; }
-            if (fmt[1] == ':' || fmt[1] == '}') {
-                if (++n > nargs) {
-                    fprintf(stderr, "ERROR: c_printf() missing argument(%d): %s\n", n, fmt0);
-                    break;
-                }
-                *p++ = '%';
-                fmt += 1 + (fmt[1] == ':');
-                while (*fmt != '}' && *fmt) *p++ = *fmt++;
-                f = va_arg(args, char *);
-                if (!strchr("csdioxXufFeEaAgGnp", fmt[-1]))
-                    while (*f) *p++ = *f++;
-                fmt += (*fmt == '}');
-                continue;
-            }
-            break;
         }
         *p++ = *fmt++;
     } while (ch);
     va_end(args);
     if (n < nargs)
         fprintf(stderr, "WARNING: c_printf() %d superfluous argument(s): %s\n", nargs - n, fmt0);
-    return fmt2;
+    return fmt1;
 }
 
 #endif
-- 
cgit v1.2.3