kservice try RT-Thread#1

Author: grissiom

Diff for: src/kservice.c

@@ -578,9 +578,12 @@ static char *print_number(char *buf,
 #ifdef RT_PRINTF_LONGLONG
     char tmp[32];
 #else
-    char tmp[16];
+    //char tmp[16];
 #endif
-    register int i;
+    register int i = 0;
+    register int buflen = (int)(end - buf);
+    int number_width;
+    long saved_num;
 
     if (type & LEFT)
         type &= ~ZEROPAD;
@@ -590,6 +593,7 @@ static char *print_number(char *buf,
         num = -num;
         type |= NEGATIVE;
     }
+    saved_num = num;
 
 #ifdef RT_PRINTF_SPECIAL
     if (type & SPECIAL)
@@ -601,25 +605,18 @@ static char *print_number(char *buf,
     }
 #endif
 
-    i = 0;
-    if (num == 0)
-        tmp[i++]='0';
-    else
-    {
-        if (type & LARGE)
-            while (num != 0)
-                tmp[i++] = "0123456789ABCDEF"[divide(&num, base)];
-        else
-            while (num != 0)
-                tmp[i++] = "0123456789abcdef"[divide(&num, base)];
-    }
+    number_width = 0;
+    do {
+        number_width++;
+        divide(&saved_num, base);
+    } while (saved_num);
 
 #ifdef RT_PRINTF_PRECISION
-    if (i > precision)
-        precision = i;
+    if (number_width > precision)
+        precision = number_width;
     size -= precision;
 #else
-    size -= i;
+    size -= number_width;
 #endif
 
     if (!(type&(ZEROPAD | LEFT)))
@@ -629,46 +626,46 @@ static char *print_number(char *buf,
 
         while (size-->0)
         {
-            if (buf <= end)
-                *buf = ' ';
-            ++ buf;
+            if (i <= buflen)
+                buf[i] = ' ';
+            i++;
         }
     }
 
     if (type & SIGN)
     {
-        if (buf <= end)
+        if (i <= buflen)
         {
             if (type & NEGATIVE)
-                *buf = '-';
+                buf[i] = '-';
             else if (type & PLUS)
-                *buf = '+';
+                buf[i] = '+';
             else if (type & SPACE)
-                *buf = ' ';
-            -- size;
+                buf[i] = ' ';
         }
-        ++ buf;
+        -- size;
+        ++ i;
     }
 
 #ifdef RT_PRINTF_SPECIAL
     if (type & SPECIAL)
     {
         if (base==8)
         {
-            if (buf <= end)
-                *buf = '0';
-            ++ buf;
+            if (i <= buflen)
+                buf[i] = '0';
+            ++ i;
         }
         else if (base == 16)
         {
-            if (buf <= end)
-                *buf = '0';
-            ++ buf;
-            if (buf <= end)
+            if (i <= buflen)
+                buf[i] = '0';
+            ++ i;
+            if (i <= buflen)
             {
-                *buf = type & LARGE? 'X' : 'x';
+                buf[i] = type & LARGE? 'X' : 'x';
             }
-            ++ buf;
+            ++ i;
         }
     }
 #endif
@@ -678,38 +675,63 @@ static char *print_number(char *buf,
     {
         while (size-- > 0)
         {
-            if (buf <= end)
-                *buf = (type & ZEROPAD) ? '0' : ' ';
-
-            ++ buf;
+            if (i <= buflen)
+                buf[i] = (type & ZEROPAD) ? '0' : ' ';
+            ++ i;
         }
     }
 
 #ifdef RT_PRINTF_PRECISION
     while (i < precision--)
     {
-        if (buf <= end)
-            *buf = '0';
-        ++ buf;
+        if (i <= buflen)
+            buf[i] = '0';
+        ++ i;
     }
 #endif
 
-    /* put number in the temporary buffer */
-    while (i-- > 0)
+    /* put number */
+    if (num == 0)
     {
-        if (buf <= end)
-            *buf = tmp[i];
-        ++ buf;
+        if (i <= buflen)
+            buf[i] ='0';
+        ++ i;
+    }
+    else
+    {
+        number_width--;
+        if (type & LARGE)
+            while (num != 0)
+            {
+                char c;
+
+                c = "0123456789ABCDEF"[divide(&num, base)];
+                if (i + number_width <= buflen)
+                    buf[i + number_width] = c;
+                number_width -= 2;
+                i++;
+            }
+        else
+            while (num != 0)
+            {
+                char c;
+
+                c = "0123456789abcdef"[divide(&num, base)];
+                if (i + number_width <= buflen)
+                    buf[i + number_width] = c;
+                number_width -= 2;
+                i++;
+            }
     }
 
     while (size-- > 0)
     {
-        if (buf <= end)
-            *buf = ' ';
-        ++ buf;
+        if (i <= buflen)
+            buf[i] = ' ';
+        ++ i;
     }
 
-    return buf;
+    return buf+i;
 }
 
 rt_int32_t rt_vsnprintf(char       *buf,