Bugfixing initrd and ld-acess

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

diff --git a/Kernel/lib.c b/Kernel/lib.c
index f99f58a..bfae2a4 100644 (file)
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -20,9 +20,62 @@ const short DAYS_BEFORE[] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 3
 static Uint    giRandomState = RANDOM_SEED;
 
 // === CODE ===
+/**
+ * \brief Convert a string into an integer
+ */
+int atoi(const char *string)
+{
+        int    ret = 0;
+       
+       // Clear non-numeric characters
+       while( !('0' <= *string && *string <= '9') )    string++;
+       
+       if(*string == '0')
+       {
+               string ++;
+               if(*string == 'x')
+               {
+                       // Hex
+                       string ++;
+                       for( ;; ) {
+                               ret *= 16;
+                               if('0' <= *string && *string <= '9')
+                                       ret += *string - '0';
+                               else if('A' <= *string && *string <= 'F')
+                                       ret += *string - 'A' + 10;
+                               else if('a' <= *string && *string <= 'f')
+                                       ret += *string - 'a' + 10;
+                               else
+                                       break;
+                               string ++;
+                       }
+               }
+               else
+               {
+                       for( ;; )
+                       {
+                               ret *= 8;
+                               if('0' <= *string && *string <= '7')
+                                       ret += *string - '0';
+                               else
+                                       break;
+                       }
+               }
+       }
+       else
+       {
+               for( ; '0' <= *string && *string <= '9'; string++)
+               {
+                       ret *= 10;
+                       ret += *string - '0';
+               }
+       }
+       return ret;
+}
+
 static const char cUCDIGITS[] = "0123456789ABCDEF";
 /**
- * \fn static void itoa(char *buf, Uint num, int base, int minLength, char pad)
+ * \fn void itoa(char *buf, Uint 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)
@@ -209,7 +262,7 @@ int tolower(int c)
 }
 
 /**
- * \fn int strucmp(char *Str1, char *Str2)
+ * \fn int strucmp(const char *Str1, const char *Str2)
  * \brief Compare \a Str1 and \a Str2 case-insensitively
  */
 int strucmp(const char *Str1, const char *Str2)
@@ -256,7 +309,7 @@ Uint strlen(const char *__str)
 }
 
 /**
- * \fn char *strcpy(const char *__str1, const char *__str2)
+ * \fn char *strcpy(char *__str1, const char *__str2)
  * \brief Copy a string to a new location
  */
 char *strcpy(char *__str1, const char *__str2)
@@ -268,7 +321,7 @@ char *strcpy(char *__str1, const char *__str2)
 }
 
 /**
- * \fn char *strcpy(const char *__str1, const char *__str2)
+ * \fn char *strncpy(char *__str1, const char *__str2, size_t max)
  * \brief Copy a string to a new location
  */
 char *strncpy(char *__str1, const char *__str2, size_t max)