Changeset 1066 for Whitix/branches/keobject/lib/vsprintf.c

Timestamp:

10/03/08 12:25:17 (3 months ago)

Author:

mwhitworth

Message:

Add vasprintf function, rework vsprintf into vsnprintf. remove the unsafe sprintf function.

Files:

• Whitix/branches/keobject/lib/vsprintf.c (modified) (14 diffs)

Whitix/branches/keobject/lib/vsprintf.c

@@ -22 +22 @@
 #include <string.h>
 #include <typedefs.h>
+#include <types.h>
 
 #define SIGN 1
@@ -32 +33 @@
 
 #define is_digit(c) ((c) >= '0' && (c) <= '9')
+
 #define do_div(n,base) ({ \
-int __res; \
-__asm__("divl %4":"=a" (n),"=d" (__res):"0" (n),"1" (0),"r" (base)); \
-__res; })
+        unsigned long __upper, __low, __high, __mod, __base; \
+        __base = (base); \
+        asm("":"=a" (__low), "=d" (__high):"A" (n)); \
+        __upper = __high; \
+        if (__high) { \
+                __upper = __high % (__base); \
+                __high = __high / (__base); \
+        } \
+        asm("divl %2":"=a" (__low), "=d" (__mod):"rm" (__base), "0" (__low), "1" (__upper)); \
+        asm("":"=A" (n):"a" (__low),"d" (__high)); \
+        __mod; \
+})
 
 int skip_atoi(const char** s)
@@ -45 +56 @@
 }
 
-char* number(char* str,int num,int base,int size,int precision,int type)
+char* number(char* str, char* end, unsigned long long num,int base,int size,int precision,int type)
 {
         char c,sign,tmp[36];
@@ -53 +64 @@
         if (type & SMALL) digits="0123456789abcdefghijklmnopqrstuvwxyz";
         if (type & LEFT) type &= ~ZEROPAD;
+        
         if (base < 2 || base > 36)
                 return NULL;
+                
         c=(type & ZEROPAD) ? '0' : ' ';
-        if (type & SIGN && num < 0)
+        
+        if (type & SIGN && (signed long long)num < 0)
         {
                 sign='-';
-                num=-num;
+                num=- (signed long long)num;
         }else
                 sign=(type & PLUS) ? '+' : ((type & SPACE) ? ' ' : 0);
-        if (sign) size--;
+                
+        if (sign)
+                size--;
+        
         if (type & SPECIAL)
         {
@@ -76 +93 @@
         }
 
-        if (i>precision) precision=i;
+        if (i>precision)
+                precision=i;
+                
         size-=precision;
+        
         if (!(type & (ZEROPAD+LEFT)))
                 while (size-- > 0)
-                        *str++=' ';
+                {
+                        if (str < end)
+                                *str = ' ';
+                        str++;
+                }
                         
         if (sign)
-                *str++=sign;
-        
-        if (type & SPECIAL)
+        {
+                if (str < end)
+                        *str = sign;
+                
+                str++;
+        }
+        
+        if (type & SPECIAL && str < end)
         {
                 if (base == 8)
-                        *str++='0';
-                else if (base == 16)
-                {
-                        *str++='0';
-                        *str++=digits[33];
+                {
+                        if (str < end)
+                                *str = '0';
+                        str++;
+                }else if (base == 16)
+                {
+                        if (str < end)
+                                *str='0';
+                        str++;
+                        
+                        if (str < end)
+                                *str = digits[33];
+                                
+                        str++;
                 }
         }
@@ -98 +136 @@
         if (!(type & LEFT))
                 while (size-- > 0)
-                        *str++=c;
+                {
+                        if (str < end)
+                                *str = c;
+                        str++;
+                }
                         
         while (i < precision--)
-                *str++='0';
+        {
+                if (str < end)
+                        *str='0';
+                        
+                str++;
+        }
+        
         while (i-- > 0)
-                *str++=tmp[i];
+        {
+                if (str < end)
+                        *str = tmp[i];
+                
+                str++;
+        }
+        
         while (size-- > 0)
-                *str++=' ';
+        {
+                if (str < end)
+                        *str = ' ';
+                        
+                str++;
+        }
+                
         return str;
 }
 
-int vsprintf(char* buf,const char* fmt,va_list args)
+int vsnprintf(char* buf, int size, const char* fmt, VaList args)
 {
         char* str=buf;
+        char* end;
         int fieldWidth,precision,qualifier,flags;
+
+        end = buf+size;
+        
+        if (end < buf)
+        {
+                end = ((void*)-1);
+                size = end - buf;
+        }
 
         for (; *fmt; fmt++)
@@ -121 +190 @@
                 if (LIKELY(*fmt != '%'))
                 {
-                        *str++=*fmt;
+                        if (str < end)
+                                *str = *fmt;
+                                
+                        str++;
                         continue;
                 }
@@ -141 +213 @@
                 else if (*fmt == '*')
                 {
-                        fieldWidth=va_arg(args,int);
+                        fieldWidth=VaArg(args, int);
                         if (fieldWidth < 0)
                         {
@@ -156 +228 @@
                         else if (*fmt == '*')
                         {
-                                precision=va_arg(args,int);
+                                precision=VaArg(args,int);
                         }
                         if (precision < 0)
@@ -174 +246 @@
                         if (!(flags & LEFT))
                                 while (--fieldWidth > 0)
-                                        *str++=' ';
-                        *str++=(unsigned char)va_arg(args,int);
+                                {
+                                        if (str < end)
+                                                *str=' ';
+                                                
+                                        ++str;
+                                }
+                                
+                        if (str < end)
+                                *str=(unsigned char)VaArg(args,int);
+                                
+                        str++;
+                                
                         while (--fieldWidth > 0)
-                                *str++=' ';                     
+                        {
+                                if (str < end)
+                                        *str=' ';
+                                        
+                                str++;
+                        }               
                         break;
 
                 case 's':
                 {
-                        char* s=va_arg(args,char*);
+                        char* s=VaArg(args,char*);
                         if (!s)
                                 s="<NULL>";
@@ -193 +280 @@
                         if (!(flags & LEFT))
                                 while (len < fieldWidth--)
-                                        *str++=' ';
+                                {
+                                        if (str < end)
+                                                *str=' ';
+                                                
+                                        str++;
+                                }
                         int i;
                         for (i=0; i<len; i++)
-                                *str++=*s++;
+                        {
+                                if (str < end)
+                                        *str=*s;
+                                        
+                                str++;
+                                s++;
+                        }
                                 
                         while (len < fieldWidth--)
-                                *str++=' ';
+                        {
+                                if (str < end)                  
+                                        *str++=' ';
+                        }
                         break;
                 }
                 
                 case 'o':
-                        str=number(str,va_arg(args,unsigned long),8,fieldWidth,
+                        str=number(str, end, VaArg(args,unsigned long),8,fieldWidth,
                                 precision,flags);
                         break;
@@ -214 +315 @@
                                 flags |= ZEROPAD;
                         }
-                        str=number(str,(unsigned long)va_arg(args,void*),16,fieldWidth,
+                        str=number(str, end, (unsigned long)VaArg(args,void*),16,fieldWidth,
                                 precision,flags);
                         break;
@@ -221 +322 @@
                         flags |= SMALL;
                 case 'X':
-                        str=number(str,va_arg(args,unsigned long),16,fieldWidth,
+                        str=number(str, end, VaArg(args,unsigned long),16,fieldWidth,
                                 precision,flags);
                         break;
@@ -228 +329 @@
                         flags |= SIGN;
                 case 'u':
-                        str=number(str,va_arg(args,unsigned long),10,fieldWidth,
+                        str=number(str, end, VaArg(args,unsigned long),10,fieldWidth,
                                 precision,flags);
                         break;
                 default:
-                        if (*fmt != '%')
-                                *str++ = '%';
+                        if (str < end)
+                                *str = '%';
+                        
                         if (*fmt)
-                                *str++ = *fmt;
-                        else
+                        {
+                                if (str < end)
+                                        *str = *fmt;
+                                ++str;
+                        }else
                                 --fmt;
                         break;
                 }
         }
-        *str='\0';
+        
+        if (size > 0)
+        {
+                if (str < end)
+                        *str = '\0';
+                else
+                        end[-1] = '\0';
+        }
+        
         return (str-buf);
 }
 
+SYMBOL_EXPORT(vsnprintf);
+
+int vsprintf(char* buf,const char* fmt, VaList args)
+{
+        return vsnprintf(buf, INT_MAX, fmt, args);
+}
+
 SYMBOL_EXPORT(vsprintf);
 
-int sprintf(char* buf,const char* fmt,...)
-{
-        int i;
-        va_list args;
-
-        va_start(args,fmt);
-        i=vsprintf(buf,fmt,args);
-        va_end(args);
-        return i;
-}
-
-SYMBOL_EXPORT(sprintf);
+char* vasprintf(const char* fmt, VaList args)
+{
+        int length;
+        char* ret;
+        VaList temp;
+        
+        VaCopy(temp, args);
+        
+        length = vsnprintf(NULL, 0, fmt, temp);
+        
+        VaEnd(temp);
+        
+        ret = (char*)MemAlloc(length + 1);
+        
+        if (!ret)
+                return NULL;
+        
+        vsnprintf(ret, length+1, fmt, args);
+
+        return ret;
+}
+
+SYMBOL_EXPORT(vasprintf);