Buglocating: Some random corruption in VFS, FDD lockups

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / fileIO.c

diff --git a/Usermode/Libraries/libc.so_src/fileIO.c b/Usermode/Libraries/libc.so_src/fileIO.c
index 5fdac4c..7149b3e 100644 (file)
--- a/Usermode/Libraries/libc.so_src/fileIO.c
+++ b/Usermode/Libraries/libc.so_src/fileIO.c
@@ -17,7 +17,7 @@
 #define        _stdout 1\r
 \r
 // === PROTOTYPES ===\r
-EXPORT void    itoa(char *buf, uint64_t num, int base, int minLength, char pad, int bSigned);\r
+EXPORT void    itoa(char *buf, uint64_t num, uint base, int minLength, char pad, int bSigned);\r
 struct sFILE   *get_file_struct();\r
 \r
 // === GLOBALS ===\r
@@ -150,20 +150,28 @@ EXPORT int vfprintf(FILE *fp, const char *format, va_list args)
 {\r
        va_list tmpList = args;\r
         int    size;\r
-       char    *buf;\r
+       char    sbuf[1024];\r
+       char    *buf = sbuf;\r
         \r
        if(!fp || !format)      return -1;\r
        \r
-       size = vsprintf(NULL, (char*)format, tmpList);\r
+       size = vsnprintf(sbuf, 1024, (char*)format, tmpList);\r
        \r
-       buf = (char*)malloc(size+1);\r
-       buf[size] = '\0';\r
+       if( size >= 1024 )\r
+       {\r
+               buf = (char*)malloc(size+1);\r
+               if(!buf) {\r
+                       write(_stdout, 31, "vfprintf ERROR: malloc() failed");\r
+                       return 0;\r
+               }\r
+               buf[size] = '\0';\r
        \r
-       // Print\r
-       vsprintf(buf, (char*)format, args);\r
+               // Print\r
+               vsnprintf(buf, size+1, (char*)format, args);\r
+       }\r
        \r
        // Write to stream\r
-       write(fp->FD, size+1, buf);\r
+       write(fp->FD, size, buf);\r
        \r
        // Free buffer\r
        free(buf);\r
@@ -271,17 +279,22 @@ EXPORT int        puts(const char *str)
        return len;\r
 }\r
 \r
+EXPORT int vsprintf(char * __s, const char *__format, va_list __args)\r
+{\r
+       return vsnprintf(__s, 0x7FFFFFFF, __format, __args);\r
+}\r
+\r
 //sprintfv\r
 /**\r
- \fn EXPORT void vsprintf(char *buf, const char *format, va_list args)\r
- \brief Prints a formatted string to a buffer\r
- \param buf    Pointer - Destination Buffer\r
- \param format String - Format String\r
- \param args   VarArgs List - Arguments\r
-*/\r
-EXPORT int vsprintf(char *buf, const char *format, va_list args)\r
+ * \fn EXPORT void vsnprintf(char *buf, const char *format, va_list args)\r
+ * \brief Prints a formatted string to a buffer\r
+ * \param buf  Pointer - Destination Buffer\r
+ * \param format       String - Format String\r
+ * \param args VarArgs List - Arguments\r
+ */\r
+EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args)\r
 {\r
-       char    tmp[33];\r
+       char    tmp[65];\r
         int    c, minSize;\r
         int    pos = 0;\r
        char    *p;\r
@@ -295,7 +308,7 @@ EXPORT int vsprintf(char *buf, const char *format, va_list args)
        {\r
                // Non-control character\r
                if (c != '%') {\r
-                       if(buf) buf[pos] = c;\r
+                       if(buf && pos < __maxlen)       buf[pos] = c;\r
                        pos ++;\r
                        continue;\r
                }\r
@@ -303,7 +316,7 @@ EXPORT int vsprintf(char *buf, const char *format, va_list args)
                // Control Character\r
                c = *format++;\r
                if(c == '%') {  // Literal %\r
-                       if(buf) buf[pos] = '%';\r
+                       if(buf && pos < __maxlen)       buf[pos] = '%';\r
                        pos ++;\r
                        continue;\r
                }\r
@@ -358,12 +371,15 @@ EXPORT int vsprintf(char *buf, const char *format, va_list args)
                \r
                // Pointer\r
                case 'p':\r
-                       if(buf) {\r
+                       if(buf && pos+2 < __maxlen) {\r
                                buf[pos] = '*';\r
                                buf[pos+1] = '0';\r
                                buf[pos+2] = 'x';\r
                        }\r
                        pos += 3;\r
+                       arg = va_arg(args, uint32_t);\r
+                       itoa(tmp, arg, 16, minSize, pad, 0);\r
+                       goto sprintf_puts;\r
                        // Fall through to hex\r
                // Unsigned Hexadecimal\r
                case 'x':\r
@@ -392,9 +408,11 @@ EXPORT int vsprintf(char *buf, const char *format, va_list args)
                        p = (void*)(intptr_t)arg;\r
                sprintf_puts:\r
                        if(!p)  p = "(null)";\r
+                       //_SysDebug("vsnprintf: p = '%s'", p);\r
                        if(buf) {\r
                                while(*p) {\r
-                                       buf[pos++] = *p++;\r
+                                       if(pos < __maxlen)      buf[pos] = *p;\r
+                                       pos ++; p ++;\r
                                }\r
                        }\r
                        else {\r
@@ -407,12 +425,14 @@ EXPORT int vsprintf(char *buf, const char *format, va_list args)
                // Unknown, just treat it as a character\r
                default:\r
                        arg = va_arg(args, uint32_t);\r
-                       if(buf) buf[pos] = arg;\r
+                       if(buf && pos < __maxlen)       buf[pos] = arg;\r
                        pos ++;\r
                        break;\r
                }\r
     }\r
-       if(buf) buf[pos] = '\0';\r
+       if(buf && pos < __maxlen)       buf[pos] = '\0';\r
+       \r
+       //_SysDebug("vsnprintf: buf = '%s'", buf);\r
        \r
        return pos;\r
 }\r
@@ -421,14 +441,20 @@ const char cUCDIGITS[] = "0123456789ABCDEF";
 /**\r
  * \fn static void itoa(char *buf, uint64_t num, int base, int minLength, char pad, int bSigned)\r
  * \brief Convert an integer into a character string\r
+ * \param buf  Destination Buffer\r
+ * \param num  Number to convert\r
+ * \param base Base-n number output\r
+ * \param minLength    Minimum length of output\r
+ * \param pad  Padding used to ensure minLength\r
+ * \param bSigned      Signed number output?\r
  */\r
-EXPORT void itoa(char *buf, uint64_t num, int base, int minLength, char pad, int bSigned)\r
+EXPORT void itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned)\r
 {\r
-       char    tmpBuf[32];\r
+       char    tmpBuf[64];\r
         int    pos=0, i;\r
 \r
        if(!buf)        return;\r
-       if(base > 16) {\r
+       if(base > 16 || base < 2) {\r
                buf[0] = 0;\r
                return;\r
        }\r
@@ -440,14 +466,15 @@ EXPORT void itoa(char *buf, uint64_t num, int base, int minLength, char pad, int
        } else\r
                bSigned = 0;\r
        \r
+       // Encode into reversed string\r
        while(num > base-1) {\r
-               tmpBuf[pos] = cUCDIGITS[ num % base ];\r
-               num = (long) num / base;                // Shift {number} right 1 digit\r
-               pos++;\r
+               tmpBuf[pos++] = cUCDIGITS[ num % base ];\r
+               num = (uint64_t) num / (uint64_t)base;          // Shift {number} right 1 digit\r
        }\r
 \r
        tmpBuf[pos++] = cUCDIGITS[ num % base ];                // Last digit of {number}\r
        if(bSigned)     tmpBuf[pos++] = '-';    // Append sign symbol if needed\r
+       \r
        i = 0;\r
        minLength -= pos;\r
        while(minLength-- > 0)  buf[i++] = pad;\r
@@ -463,22 +490,29 @@ EXPORT int printf(const char *format, ...)
 {\r
        #if 1\r
         int    size;\r
-       char    *buf;\r
+       char    sbuf[1024];\r
+       char    *buf = sbuf;\r
        va_list args;\r
        \r
        // Get final size\r
        va_start(args, format);\r
-       size = vsprintf(NULL, (char*)format, args);\r
+       size = vsnprintf(sbuf, 1024, (char*)format, args);\r
        va_end(args);\r
        \r
-       // Allocate buffer\r
-       buf = (char*)malloc(size+1);\r
-       buf[size] = '\0';\r
+       if( size >= 1024 ) {\r
+               // Allocate buffer\r
+               buf = (char*)malloc(size+1);\r
+               if(buf) {\r
+                       write(_stdout, 29, "PRINTF ERROR: malloc() failed");\r
+                       return 0;\r
+               }\r
+               buf[size] = '\0';\r
        \r
-       // Fill Buffer\r
-       va_start(args, format);\r
-       vsprintf(buf, (char*)format, args);\r
-       va_end(args);\r
+               // Fill Buffer\r
+               va_start(args, format);\r
+               vsnprintf(buf, size+1, (char*)format, args);\r
+               va_end(args);\r
+       }\r
        \r
        // Send to stdout\r
        write(_stdout, size+1, buf);\r