feat: Add snprintf

This patch adds snprintf. The second parameter "size" is expected to
accept only zero or positive integer, otherwise as C11 specification
states, it would be undefined behavior.

Author: Jim Hsu

Makefile

@@ -121,7 +121,7 @@ bootstrap: $(OUT)/$(STAGE2)
 	fi
 
 $(BUILD_SESSION):
-	$(PRINTF) "ARCH=$(ARCH)" > $@
+	$(VECHO) "ARCH=$(ARCH)" > $@
 
 .PHONY: clean
 clean:

lib/c.c

@@ -713,3 +713,72 @@ void free(void *ptr)
     __freelist_head->prev = cur;
     __freelist_head = cur;
 }
+
+void snprintf(char *buffer, int n, char *str, ...)
+{
+    int *var_args = &str + 4;
+    int si = 0, bi = 0, pi = 0;
+
+    if (n == 0)
+        return;
+
+    while (str[si]) {
+        if (bi >= n - 1) {
+            break;
+        } else if (str[si] != '%') {
+            buffer[bi] = str[si];
+            bi++;
+            si++;
+        } else {
+            int w = 0, zp = 0, pp = 0;
+
+            si++;
+            if (str[si] == '#') {
+                pp = 1;
+                si++;
+            }
+            if (str[si] == '0') {
+                zp = 1;
+                si++;
+            }
+            if (str[si] >= '1' && str[si] <= '9') {
+                w = str[si] - '0';
+                si++;
+                if (str[si] >= '0' && str[si] <= '9') {
+                    w = w * 10;
+                    w += str[si] - '0';
+                    si++;
+                }
+            }
+            switch (str[si]) {
+            case 37: /* % */
+                buffer[bi++] = '%';
+                si++;
+                continue;
+            case 99: /* c */
+                buffer[bi++] = var_args[pi];
+                break;
+            case 115: /* s */
+                strcpy(buffer + bi, var_args[pi]);
+                bi += strlen(var_args[pi]);
+                break;
+            case 111: /* o */
+                bi += __format(buffer + bi, var_args[pi], w, zp, 8, pp);
+                break;
+            case 100: /* d */
+                bi += __format(buffer + bi, var_args[pi], w, zp, 10, 0);
+                break;
+            case 120: /* x */
+                bi += __format(buffer + bi, var_args[pi], w, zp, 16, pp);
+                break;
+            default:
+                abort();
+                break;
+            }
+            pi++;
+            si++;
+        }
+    }
+
+    buffer[n - 1] = 0;
+}

src/defs.h

@@ -17,17 +17,17 @@
 #define MAX_VAR_LEN 32
 #define MAX_TYPE_LEN 32
 #define MAX_PARAMS 8
-#define MAX_LOCALS 1500
+#define MAX_LOCALS 1600
 #define MAX_FIELDS 64
 #define MAX_FUNCS 512
 #define MAX_TYPES 64
-#define MAX_IR_INSTR 50000
+#define MAX_IR_INSTR 60000
 #define MAX_BB_PRED 128
 #define MAX_BB_DOM_SUCC 64
 #define MAX_BB_RDOM_SUCC 256
 #define MAX_GLOBAL_IR 256
 #define MAX_LABEL 4096
-#define MAX_SOURCE 327680
+#define MAX_SOURCE 524288
 #define MAX_CODE 262144
 #define MAX_DATA 262144
 #define MAX_SYMTAB 65536

src/parser.c

@@ -3401,17 +3401,15 @@ void load_source_file(char *file)
         }
         if (!strncmp(buffer, "#include ", 9) && (buffer[9] == '"')) {
             char path[MAX_LINE_LEN];
-            int c = strlen(file) - 1;
+            int c = strlen(file) - 1, inclusion_path_len = strlen(buffer) - 11;
             while (c > 0 && file[c] != '/')
                 c--;
             if (c) {
                 /* prepend directory name */
-                strncpy(path, file, c + 1);
-                c++;
+                snprintf(path, c + 2, "%s", file);
             }
-            path[c] = 0;
-            buffer[strlen(buffer) - 2] = 0;
-            strcpy(path + c, buffer + 10);
+
+            snprintf(path + c + 1, inclusion_path_len, "%s", buffer + 10);
             load_source_file(path);
         } else {
             strcpy(SOURCE + source_idx, buffer);

tests/driver.sh

@@ -1611,4 +1611,32 @@ int main()
 }
 EOF
 
+# snprintf, including truncation and zero size input
+try_output 0 "Hello World 1123" << EOF
+int main() {
+    char buffer[50];
+    snprintf(buffer, 50, "Hello %s %d", "World", 1123);
+    printf("%s", buffer);
+    return 0;
+}
+EOF
+
+try_output 0 "" << EOF
+int main() {
+    char buffer[20];
+    snprintf(buffer, 0, "Number: %d", -37);
+    printf("%s", buffer);
+    return 0;
+}
+EOF
+
+try_output 0 "Number: -" << EOF
+int main() {
+    char buffer[10];
+    snprintf(buffer, 10, "Number: %d", -37);
+    printf("%s", buffer);
+    return 0;
+}
+EOF
+
 echo OK