X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flib.c;h=62500fe9d40de9e06938bf5f7605767fbae3edb9;hb=bd8dc898108f10c0498f4dc5d0164a50b5ff2e5c;hp=f99f58ac705bcb821d03ebe13a3a51ed1e8ad4ac;hpb=6ea2f6040da80c963882f6ccfe4bf21ff048eaff;p=tpg%2Facess2.git

diff --git a/Kernel/lib.c b/Kernel/lib.c
index f99f58ac..62500fe9 100644
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -14,15 +14,116 @@ const short DAYS_BEFORE[] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 3
 #define UNIX_TO_2K	((30*365*3600*24) + (7*3600*24))	//Normal years + leap years
 
 // === PROTOTYPES ===
+ int	atoi(const char *string);
+void	itoa(char *buf, Uint 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);
+ int	strucmp(const char *Str1, const char *Str2);
+ int	strpos(const char *Str, char Ch);
+ Uint8	ByteSum(void *Ptr, int Size);
+size_t	strlen(const char *__s);
+char	*strcpy(char *__str1, const char *__str2);
+char	*strncpy(char *__str1, const char *__str2, size_t max);
+ int	strcmp(const char *str1, const char *str2);
+ int	strncmp(const char *str1, const char *str2, size_t num);
+char	*strdup(const char *Str);
+ int	DivUp(int num, int dem);
+ int	strpos8(const char *str, Uint32 Search);
  int	ReadUTF8(Uint8 *str, Uint32 *Val);
+ int	WriteUTF8(Uint8 *str, Uint32 Val);
+Sint64	timestamp(int sec, int mins, int hrs, int day, int month, int year);
+Uint	rand(void);
+ int	CheckString(char *String);
+ int	CheckMem(void *Mem, int NumBytes);
+ int	ModUtil_LookupString(char **Array, char *Needle);
+ int	ModUtil_SetIdent(char *Dest, char *Value);
+
+// === EXPORTS ===
+EXPORT(atoi);
+EXPORT(itoa);
+EXPORT(vsnprintf);
+EXPORT(sprintf);
+EXPORT(tolower);
+EXPORT(strucmp);
+EXPORT(strpos);
+EXPORT(ByteSum);
+EXPORT(strlen);
+EXPORT(strcpy);
+EXPORT(strncpy);
+EXPORT(strcmp);
+EXPORT(strncmp);
+EXPORT(strdup);
+EXPORT(DivUp);
+EXPORT(strpos8);
+EXPORT(ReadUTF8);
+EXPORT(WriteUTF8);
+EXPORT(timestamp);
+EXPORT(CheckString);
+EXPORT(CheckMem);
+EXPORT(ModUtil_LookupString);
+EXPORT(ModUtil_SetIdent);
 
 // === GLOBALS ===
 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)
@@ -173,6 +274,9 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 			PUTCH( (Uint8)val );
 			break;
 		}
+		
+		if(pos == __maxlen)
+			break;
 	}
 	
 	if(__s && pos != __maxlen)
@@ -209,7 +313,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 +360,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 +372,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)
@@ -486,7 +590,7 @@ Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year)
  * \brief Pseudo random number generator
  * \note Unknown effectiveness (made up on the spot)
  */
-Uint rand()
+Uint rand(void)
 {
 	Uint	old = giRandomState;
 	// Get the next state value
@@ -583,17 +687,3 @@ int ModUtil_SetIdent(char *Dest, char *Value)
 	strncpy(Dest, Value, 32);
 	return 1;
 }
-
-EXPORT(strlen);
-EXPORT(strdup);
-EXPORT(strcmp);
-EXPORT(strncmp);
-EXPORT(strcpy);
-EXPORT(strncpy);
-
-EXPORT(timestamp);
-EXPORT(ReadUTF8);
-EXPORT(CheckMem);
-EXPORT(CheckString);
-EXPORT(ModUtil_LookupString);
-EXPORT(ModUtil_SetIdent);