Usermode/libc - Fix strchr and strrchr behavior

[tpg/acess2.git] / KernelLand / Kernel / libc.c

diff --git a/KernelLand/Kernel/libc.c b/KernelLand/Kernel/libc.c
index d42e524..572184d 100644 (file)
--- a/KernelLand/Kernel/libc.c
+++ b/KernelLand/Kernel/libc.c
@@ -74,6 +74,7 @@ EXPORT(CheckMem);
 // === CODE ===
 // - Import userland stroi.c file
 #define _LIB_H_
+#define _SysDebug(f,v...)      Log_Debug("libc", f ,## v)
 #include "../../Usermode/Libraries/libc.so_src/strtoi.c"
 
 int ParseInt(const char *string, int *Val)
@@ -380,7 +381,7 @@ int vsnprintf(char *__s, const size_t __maxlen, const char *__format, va_list ar
                                break;
                        }
                        p = va_arg(args, char*);        // Get Argument
-                       if( !p || !CheckString(p) )     p = "(inval)";  // Avoid #PFs  
+                       if( p && !CheckString(p) )      goto invalString;       // Avoid #PFs  
                printString:
                        if(!p)          p = "(null)";
                        len = strlen(p);
@@ -388,16 +389,37 @@ int vsnprintf(char *__s, const size_t __maxlen, const char *__format, va_list ar
                        while(*p && precision--) { PUTCH(*p); p++;} 
                        if( bPadLeft )  while(len++ < minSize)  PUTCH(pad);
                        break;
+               invalString:    
+                       PUTCH('(');PUTCH('i');PUTCH('n');PUTCH('v');PUTCH('a'); PUTCH('l');PUTCH(':');
+                       PUTCH('*');PUTCH('0');PUTCH('x');
+                       val = (tVAddr)p;
+                       for( len = BITS/4; len -- && ((val>>(len*4))&15) == 0; )
+                               ;
+                       len ++;
+                       if( len == 0 )
+                               PUTCH( '0' );
+                       else
+                               while( len -- )
+                                       PUTCH( cUCDIGITS[ (val>>(len*4))&15 ] );
+                       PUTCH(')');
+                       break;
                
                case 'C':       // Non-Null Terminated Character Array
                        p = va_arg(args, char*);
-                       if( !CheckMem(p, minSize) )     continue;       // No #PFs please
+                       if( !CheckMem(p, minSize) ) {
+                               p = "(inval)";
+                               goto printString;
+                       }
                        if(!p)  goto printString;
                        while(minSize--) {
                                if(*p == '\0') {
                                        PUTCH('\\');
                                        PUTCH('0');
                                }
+                               else if(*p == '\\') {
+                                       PUTCH('\\');
+                                       PUTCH('\\');
+                               }
                                else {
                                        PUTCH(*p);
                                }