Added strncmp

[tpg/acess2.git] / Kernel / lib.c

diff --git a/Kernel/lib.c b/Kernel/lib.c
index 9923d7c..b512022 100644 (file)
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -180,6 +180,9 @@ void itoa(char *buf, Uint num, int base, int minLength, char pad)
        if(pos==__maxlen){return pos;}\
        if(__s){__s[pos++]=ch;}else{pos++;}\
        }while(0)
+/**
+ * \brief VArg String Number Print Formatted
+ */
 int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 {
        char    c, pad = ' ';
@@ -270,14 +273,14 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                {
                case 'd':
                case 'i':
-                       #if BITS == 32
-                       if( (isLongLong && val >> 63) || (!isLongLong && val >> 31) ) {
-                       #else
-                       if( (Sint)val < 0 ) {
-                       #endif
+                       if( isLongLong && val >> 63 ) {
                                PUTCH('-');
                                val = -val;
                        }
+                       else if( !isLongLong && val >> 31 ) {
+                               PUTCH('-');
+                               val = -(Sint32)val;
+                       }
                        itoa(p, val, 10, minSize, pad);
                        goto printString;
                case 'u':
@@ -662,7 +665,7 @@ Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year)
                ) && month > 1) // Leap year and after feb
                stamp += 3600*24;
        
-       stamp += ((365*4+1) * ((year-2000)&~3)) * 3600*24;      // Foour Year Segments
+       stamp += ((365*4+1) * ((year-2000)&~3)) * 3600*24;      // Four Year Segments
        stamp += ((year-2000)&3) * 365*3600*24; // Inside four year segment
        stamp += UNIX_TO_2K;