From 7fda289cbd67306c844a3d850f386d0aabf40609 Mon Sep 17 00:00:00 2001
From: daanx <daanx@effp.org>
Date: Fri, 19 May 2023 12:07:07 -0700
Subject: [PATCH] small fixes

---
 src/libc.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/libc.c b/src/libc.c
index 8a429c09..17948736 100644
--- a/src/libc.c
+++ b/src/libc.c
@@ -80,7 +80,16 @@ bool _mi_getenv(const char* name, char* result, size_t result_size) {
 #endif
 
 // --------------------------------------------------------
-// Define our own limited `_vsnprintf` 
+// Define our own limited `_mi_vsnprintf` and `_mi_snprintf`
+// This is mostly to avoid calling these when libc is not yet
+// initialized (and to reduce dependencies)
+// 
+// format:      d i, p x u, s
+// prec:        z l
+// width:       10
+// align-left:  -
+// fill:        0
+// plus:        +
 // --------------------------------------------------------
 
 static void mi_outc(char c, char** out, char* end) {
@@ -208,16 +217,18 @@ void _mi_vsnprintf(char* buf, size_t bufsize, const char* fmt, va_list args) {
       }
       else if (c == 'i' || c == 'd') {
         // signed
-        long x = va_arg(args, long);
+        intptr_t x = 0;
+        if (numtype == 'z') x = va_arg(args, intptr_t );
+                       else x = va_arg(args, long);
         char pre = 0;
         if (x < 0) {
           pre = '-';
-          x = -x;
+          if (x > INTPTR_MIN) { x = -x; }
         }
         else if (numplus != 0) {
           pre = numplus;
         }
-        mi_out_num((size_t)x, 10, pre, &out, end);
+        mi_out_num((uintptr_t)x, 10, pre, &out, end);
       }
       else if (c >= ' ' && c < '~') {
         mi_outc(c, &out, end);