Diff markup

Differences between /sos/klibc.c (Article 6) and /sos/klibc.c (Article 2)

 /* Copyright (C) 2004  David Decotigny (with I     /* Copyright (C) 2004  David Decotigny (with INSA Rennes for vsnprintf)
    Copyright (C) 2003  The KOS Team                   Copyright (C) 2003  The KOS Team
    Copyright (C) 1999  Free Software Foundatio        Copyright (C) 1999  Free Software Foundation
                                                    
    This program is free software; you can redi        This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU Genera        modify it under the terms of the GNU General Public License
    as published by the Free Software Foundatio        as published by the Free Software Foundation; either version 2
    of the License, or (at your option) any lat        of the License, or (at your option) any later version.
                                                       
    This program is distributed in the hope tha        This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the         but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details        GNU General Public License for more details.
                                                       
    You should have received a copy of the GNU         You should have received a copy of the GNU General Public License
    along with this program; if not, write to t        along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 3        Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.                                               USA. 
 */                                                 */
 #include "klibc.h"                                 #include "klibc.h"
                                                    
 /* For an optimized version, see BSD sources ;     /* For an optimized version, see BSD sources ;) */
 void *memcpy(void *dst0, const void *src0, reg     void *memcpy(void *dst0, const void *src0, register unsigned int size)
 {                                                  {
   char *dst;                                         char *dst;
   const char *src;                                   const char *src;
   for (dst = (char*)dst0, src = (const char*)s       for (dst = (char*)dst0, src = (const char*)src0 ;
        size > 0 ;                                         size > 0 ;
        dst++, src++, size--)                              dst++, src++, size--)
     *dst = *src;                                       *dst = *src;
   return dst0;                                       return dst0;
 }                                                  }
                                                    
 /* ditto */                                        /* ditto */
 void *memset(void *dst0, register int c, regis     void *memset(void *dst0, register int c, register unsigned int length)
 {                                                  {
   char *dst;                                         char *dst;
   for (dst = (char*) dst0 ;                          for (dst = (char*) dst0 ;
        length > 0 ;                                       length > 0 ;
        dst++, length --)                                  dst++, length --)
     *dst = (char)c;                                    *dst = (char)c;
   return dst0;                                       return dst0;
 }                                                  }
                                                    
 int memcmp(const void *s1, const void *s2, sos     int memcmp(const void *s1, const void *s2, sos_size_t len)
 {                                                  {
   const unsigned char *c1, *c2;                      const unsigned char *c1, *c2;
   unsigned int i;                                    unsigned int i;
                                                     
   for (i = 0, c1 = s1, c2 = s2; i < len; i++,        for (i = 0, c1 = s1, c2 = s2; i < len; i++, c1++, c2++)
     {                                                  {
       if(*c1 != *c2)                                     if(*c1 != *c2)
         return *c1 - *c2;                                  return *c1 - *c2;
     }                                                  }
                                                     
   return 0;                                          return 0;
 }                                                  }
                                                    
                                                    
 unsigned int strlen(register const char *str)      unsigned int strlen(register const char *str)
 {                                                  {
   unsigned int retval = 0;                           unsigned int retval = 0;
                                                      
   while (*str++)                                     while (*str++)
     retval++;                                          retval++;
                                                      
   return retval;                                     return retval;
 }                                                  }
                                                    
                                                    
 unsigned int strnlen(const char * s, sos_size_     unsigned int strnlen(const char * s, sos_size_t count)
 {                                                  {
   const char *sc;                                    const char *sc;
                                                      
   for (sc = s; count-- && *sc != '\0'; ++sc)         for (sc = s; count-- && *sc != '\0'; ++sc)
     /* nothing */continue;                     !!      /* nothing */;
                                                << 
   return sc - s;                                     return sc - s;
 }                                                  }
                                                    
                                                    
 char *strzcpy(register char *dst, register con     char *strzcpy(register char *dst, register const char *src, register int len)
 {                                                  {
   int i;                                             int i;
                                                << 
   if (len <= 0)                                << 
     return dst;                                << 
                                                      
   for (i = 0; i < len; i++)                          for (i = 0; i < len; i++)
     {                                                  {
       dst[i] = src[i];                                   dst[i] = src[i];
       if(src[i] == '\0')                                 if(src[i] == '\0')
         return dst;                                        return dst;
     }                                                  }
                                                      
   dst[len-1] = '\0';                                 dst[len-1] = '\0'; 
   return dst;                                        return dst;
 }                                                  }
                                                    
                                                << 
 char *strzcat (char *dest, const char *src, so     char *strzcat (char *dest, const char *src, sos_size_t n)
 {                                                  {
   char *res = dest;                                  char *res = dest;
                                                      
   for ( ; *dest ; dest++);                           for ( ; *dest ; dest++);
                                                      
   for ( ; *src ; src++, dest++) {                    for ( ; *src ; src++, dest++) {
     *dest = *src;                                      *dest = *src;
     n--;                                               n--;
     if (n <= 0)                                        if (n <= 0)
       break;                                             break;
   }                                                  }
                                                    
   *dest = '\0';                                      *dest = '\0';
   return res;                                        return res;
 }                                                  }
                                                    
 int strcmp(register const char *s1, register c     int strcmp(register const char *s1, register const char *s2)
 {                                                  {
   while (*s1 == *s2++)                               while (*s1 == *s2++)
     if (*s1++ == 0)                                    if (*s1++ == 0)
       return (0);                                        return (0);
                                                      
   return (*(const unsigned char *)s1 - *(const       return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1));
 }                                                  }
                                                    
                                                    
 int strncmp(register const char *s1, register      int strncmp(register const char *s1, register const char *s2, register int len)
 {                                                  {
   char c1 = '\0', c2 = '\0';                         char c1 = '\0', c2 = '\0';
                                                      
   while (len > 0)                                    while (len > 0)
     {                                                  {
       c1 = (unsigned char) *s1++;                        c1 = (unsigned char) *s1++;
       c2 = (unsigned char) *s2++;                        c2 = (unsigned char) *s2++;
       if (c1 == '\0' || c1 != c2)                        if (c1 == '\0' || c1 != c2)
         return c1 - c2;                                    return c1 - c2;
       len--;                                             len--;
     }                                                  }
                                                      
   return c1 - c2;                                    return c1 - c2;
 }                                                  }
                                                    
                                                    
 static unsigned long int _random_seed = 931867 << 
                                                << 
 /**                                            << 
  * The following code is borrowed from Glenn R << 
  * http://remus.rutgers.edu/~rhoads/Code/code. << 
  * License to be defined...                    << 
  */                                            << 
 unsigned long int random (void)                << 
 {                                              << 
 /* The following parameters are recommended se << 
    uncomment the one you want. */              << 
                                                << 
 /* For RAND_MAX == 4294967291 */               << 
    static unsigned int a = 1588635695, q = 2,  << 
 /* static unsigned int a = 1223106847, m = 429 << 
 /* static unsigned int a = 279470273, m = 4294 << 
                                                << 
 /* For RAND_MAX == 2147483647 */               << 
 /* static unsigned int a = 1583458089, m = 214 << 
 /* static unsigned int a = 784588716, m = 2147 << 
 /* static unsigned int a = 16807, m = 21474836 << 
 /* static unsigned int a = 950706376, m = 2147 << 
                                                << 
    _random_seed = a*(_random_seed % q) - r*(_r << 
    return _random_seed;                        << 
 }                                              << 
                                                << 
                                                << 
 void srandom (unsigned long int seed)          << 
 {                                              << 
   _random_seed = seed;                         << 
 }                                              << 
                                                << 
                                                << 
 /* I (d2) borrowed and rewrote this for Nachos     /* I (d2) borrowed and rewrote this for Nachos/INSA Rennes. Thanks to
    them for having kindly allowed me to do so.        them for having kindly allowed me to do so. */
 int vsnprintf(char *buff, sos_size_t len, cons     int vsnprintf(char *buff, sos_size_t len, const char * format, va_list ap)
 {                                                  {
   sos_size_t i, result;                              sos_size_t i, result;
                                                      
   if (!buff || !format || (len < 0))                 if (!buff || !format || (len < 0))
     return -1;                                         return -1;
                                                      
 #define PUTCHAR(thechar) \                         #define PUTCHAR(thechar) \
   do { \                                             do { \
     if (result < len-1) \                              if (result < len-1) \
       *buff++ = (thechar);  \                            *buff++ = (thechar);  \
     result++; \                                        result++; \
   } while (0)                                        } while (0)
                                                      
   result = 0;                                        result = 0;
   for(i=0 ; format[i] != '\0' ; i++){                for(i=0 ; format[i] != '\0' ; i++){
     switch (format[i])                                 switch (format[i])
       {                                                  {
       case '%':                                          case '%':
         i++;                                               i++;
         switch(format[i])                                  switch(format[i])
           {                                                  {
           case '%':                                          case '%':
             {                                                  {
               PUTCHAR('%');                                      PUTCHAR('%');
               break;                                             break;
             }                                                  }
           case 'i':;                                         case 'i':;
           case 'd':                                          case 'd':
             {                                                  {
               int integer = va_arg(ap,int);                      int integer = va_arg(ap,int);
               int cpt2 = 0;                                      int cpt2 = 0;
               char buff_int[16];                                 char buff_int[16];
                                                                  
               if (integer<0)                                     if (integer<0)
                 PUTCHAR('-');                                      PUTCHAR('-');
               /* Ne fait pas integer = -intege                   /* Ne fait pas integer = -integer ici parce que INT_MIN
                  n'a pas d'equivalent positif                       n'a pas d'equivalent positif (int = [-2^31, 2^31-1]) */
                                                                  
               do {                                               do {
                 int m10 = integer%10;                              int m10 = integer%10;
                 m10 = (m10 < 0)? -m10:m10;                         m10 = (m10 < 0)? -m10:m10;
                 buff_int[cpt2++]=(char)('0'+ m                     buff_int[cpt2++]=(char)('0'+ m10);
                 integer=integer/10;                                integer=integer/10;
               } while(integer!=0);                               } while(integer!=0);
                                                                  
               for(cpt2 = cpt2 - 1 ; cpt2 >= 0                    for(cpt2 = cpt2 - 1 ; cpt2 >= 0 ; cpt2--)
                 PUTCHAR(buff_int[cpt2]);                           PUTCHAR(buff_int[cpt2]);
                                                                  
               break;                                             break;
             }                                                  }
                                                                
           case 'c':                                          case 'c':
             {                                                  {
               int value = va_arg(ap,int);                        int value = va_arg(ap,int);
               PUTCHAR((char)value);                              PUTCHAR((char)value);
               break;                                             break;
             }                                                  }
                                                                
           case 's':                                          case 's':
             {                                                  {
               char *string = va_arg(ap,char *)                   char *string = va_arg(ap,char *);
               if (! string)                                      if (! string)
                 string = "(null)";                                 string = "(null)";
               for( ; *string != '\0' ; string+                   for( ; *string != '\0' ; string++)
                 PUTCHAR(*string);                                  PUTCHAR(*string);
               break;                                             break;
             }                                                  }
                                                    
           case 'p':                            << 
             PUTCHAR('0');                      << 
             PUTCHAR('x');                      << 
           case 'x':                                          case 'x':
             {                                                  {
               unsigned int hexa = va_arg(ap,in                   unsigned int hexa = va_arg(ap,int);
               unsigned int nb;                                   unsigned int nb;
               int i, had_nonzero = 0;                            int i, had_nonzero = 0;
               for(i=0 ; i < 8 ; i++)                             for(i=0 ; i < 8 ; i++)
                 {                                                  {
                   nb = (unsigned int)(hexa <<                        nb = (unsigned int)(hexa << (i*4));
                   nb = (nb >> 28) & 0xf;                             nb = (nb >> 28) & 0xf;
                   // Skip the leading zeros                          // Skip the leading zeros
                   if (nb == 0)                                       if (nb == 0)
                     {                                                  {
                       if (had_nonzero)                                   if (had_nonzero)
                         PUTCHAR('0');                                      PUTCHAR('0');
                     }                                                  }
                   else                                               else
                     {                                                  {
                       had_nonzero = 1;                                   had_nonzero = 1;
                       if (nb < 10)                                       if (nb < 10)
                         PUTCHAR('0'+nb);                                   PUTCHAR('0'+nb);
                       else                                               else
                         PUTCHAR('a'+(nb-10));                              PUTCHAR('a'+(nb-10));
                     }                                                  }
                 }                                                  }
               if (! had_nonzero)                                 if (! had_nonzero)
                 PUTCHAR('0');                                      PUTCHAR('0');
               break;                                             break;
             }                                                  }
             break;                                             break;
                                                            
           default:                                           default:
             PUTCHAR('%');                                      PUTCHAR('%');
             PUTCHAR(format[i]);                                PUTCHAR(format[i]);
           }                                                  }
         break;                                             break;
                                                            
       default:                                           default:
         PUTCHAR(format[i]);                                PUTCHAR(format[i]);
       }                                                  }
   }                                                  }
                                                      
   *buff = '\0';                                      *buff = '\0';
   return result;                                     return result;
 }                                                  }
                                                    
                                                    
 int snprintf(char * buff, sos_size_t len, cons     int snprintf(char * buff, sos_size_t len, const char *format, ...)
 {                                                  {
   va_list ap;                                        va_list ap;
                                                     
   va_start(ap, format);                              va_start(ap, format);
   len = vsnprintf(buff, len, format, ap);            len = vsnprintf(buff, len, format, ap);
   va_end(ap);                                        va_end(ap);
                                                     
   return len;                                        return len;
 }                                                  }