2.4.22

 lib

diff -urN linux-2.4.21/lib/vsprintf.c linux-2.4.22/lib/vsprintf.c
--- linux-2.4.21/lib/vsprintf.c   2003-06-13 07:51:39.000000000 -0700
+++ linux-2.4.22/lib/vsprintf.c   2003-08-25 04:44:44.000000000 -0700
@@ -131,8 +131,8 @@
 {
    char c,sign,tmp[66];
    const char *digits;
-   const char small_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-   const char large_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+   static const char small_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+   static const char large_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
    int i;
 
    digits = (type & LARGE) ? large_digits : small_digits;
@@ -306,7 +306,8 @@
 
       /* get the conversion qualifier */
       qualifier = -1;
-      if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt =='Z') {
+      if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
+          *fmt =='Z' || *fmt == 'z') {
          qualifier = *fmt;
          ++fmt;
          if (qualifier == 'l' && *fmt == 'l') {
@@ -381,7 +382,7 @@
             if (qualifier == 'l') {
                long * ip = va_arg(args, long *);
                *ip = (str - buf);
-            } else if (qualifier == 'Z') {
+            } else if (qualifier == 'Z' || qualifier == 'z') {
                size_t * ip = va_arg(args, size_t *);
                *ip = (str - buf);
             } else {
@@ -432,7 +433,7 @@
          num = va_arg(args, unsigned long);
          if (flags & SIGN)
             num = (signed long) num;
-      } else if (qualifier == 'Z') {
+      } else if (qualifier == 'Z' || qualifier == 'z') {
          num = va_arg(args, size_t);
       } else if (qualifier == 'h') {
          num = (unsigned short) va_arg(args, int);
@@ -517,10 +518,11 @@
 {
    const char *str = buf;
    char *next;
+   char digit;
    int num = 0;
    int qualifier;
    int base;
-   int field_width = -1;
+   int field_width;
    int is_sign = 0;
 
    while(*fmt && *str) {
@@ -558,12 +560,14 @@
       }
 
       /* get field width */
+      field_width = -1;
       if (isdigit(*fmt))
          field_width = skip_atoi(&fmt);
 
       /* get conversion qualifier */
       qualifier = -1;
-      if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'Z') {
+      if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
+          *fmt == 'Z' || *fmt == 'z') {
          qualifier = *fmt;
          fmt++;
       }
@@ -616,8 +620,9 @@
       case 'X':
          base = 16;
          break;
-      case 'd':
       case 'i':
+                        base = 0;
+      case 'd':
          is_sign = 1;
       case 'u':
          break;
@@ -637,12 +642,16 @@
       while (isspace(*str))
          str++;
 
-      if (!*str
-          || (base == 16 && !isxdigit(*str))
-          || (base == 10 && !isdigit(*str))
-          || (base == 8 && (!isdigit(*str) || *str > '7'))
-          || (base == 0 && !isdigit(*str)))
-         break;
+      digit = *str;
+      if (is_sign && digit == '-')
+         digit = *(str + 1);
+
+      if (!digit
+                    || (base == 16 && !isxdigit(digit))
+                    || (base == 10 && !isdigit(digit))
+                    || (base == 8 && (!isdigit(digit) || digit > '7'))
+                    || (base == 0 && !isdigit(digit)))
+            break;
 
       switch(qualifier) {
       case 'h':
@@ -673,6 +682,7 @@
          }
          break;
       case 'Z':
+      case 'z':
       {
          size_t *s = (size_t*) va_arg(args,size_t*);
          *s = (size_t) simple_strtoul(str,&next,base);