TSC backed timekeeping, 64-bit integer printing

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

diff --git a/Kernel/lib.c b/Kernel/lib.c
index c2c1b58..4c6ab18 100644 (file)
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -15,7 +15,7 @@ const short DAYS_BEFORE[] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 3
 
 // === PROTOTYPES ===
  int   atoi(const char *string);
-void   itoa(char *buf, Uint num, int base, int minLength, char pad);
+void   itoa(char *buf, Uint64 num, int base, int minLength, char pad);
  int   vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args);
  int   sprintf(char *__s, const char *__format, ...);
  int   tolower(int c);
@@ -36,7 +36,7 @@ char  **str_split(const char *__str, char __ch);
 
  int   DivUp(int num, int dem);
 Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year);
-Uint   rand(void);
+ int   rand(void);
  
  int   CheckString(char *String);
  int   CheckMem(void *Mem, int NumBytes);
@@ -145,12 +145,12 @@ int atoi(const char *string)
 
 static const char cUCDIGITS[] = "0123456789ABCDEF";
 /**
- * \fn void itoa(char *buf, Uint num, int base, int minLength, char pad)
+ * \fn void itoa(char *buf, Uint64 num, int base, int minLength, char pad)
  * \brief Convert an integer into a character string
  */
-void itoa(char *buf, Uint num, int base, int minLength, char pad)
+void itoa(char *buf, Uint64 num, int base, int minLength, char pad)
 {
-       char    tmpBuf[BITS];
+       char    tmpBuf[64+1];
         int    pos=0, i;
 
        // Sanity check
@@ -292,9 +292,8 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                        itoa(p, val, 10, minSize, pad);
                        goto printString;
                case 'X':
-                       #if BITS == 64
-                       isLongLong = 1; // TODO: Handle non-x86 64-bit archs
-                       #endif
+                       if(BITS == 64)
+                               isLongLong = 1; // TODO: Handle non-x86 64-bit archs
                        GETVAL();
                        itoa(p, val, 16, minSize, pad);
                        goto printString;
@@ -321,6 +320,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                // String - Null Terminated Array
                case 's':
                        p = va_arg(args, char*);        // Get Argument
+                       if( !CheckString(p) )   continue;       // Avoid #PFs  
                printString:
                        if(!p)          p = "(null)";
                        len = strlen(p);
@@ -331,6 +331,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                
                case 'C':       // Non-Null Terminated Character Array
                        p = va_arg(args, char*);
+                       if( !CheckMem(p, minSize) )     continue;       // No #PFs please
                        if(!p)  goto printString;
                        while(minSize--)        PUTCH(*p++);
                        break;
@@ -425,12 +426,12 @@ Uint8 ByteSum(void *Ptr, int Size)
 }
 
 /**
- * \fn Uint strlen(const char *__str)
+ * \fn size_t strlen(const char *__str)
  * \brief Get the length of string
  */
-Uint strlen(const char *__str)
+size_t strlen(const char *__str)
 {
-       Uint    ret = 0;
+       size_t  ret = 0;
        while(*__str++) ret++;
        return ret;
 }
@@ -720,11 +721,10 @@ Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year)
 }
 
 /**
- * \fn Uint rand()
+ * \fn int rand()
  * \brief Pseudo random number generator
- * \note Unknown effectiveness (made up on the spot)
  */
-Uint rand(void)
+int rand(void)
 {
        #if 0
        static Uint     state = RANDOM_SEED;