X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flib.c;h=116dce6150a6db8b1302ce69b782207c148c0fa5;hb=eecce4b7a55315f6c385ad8be35c25dbb12d43d8;hp=bfae2a41da89df0f7d920ef7cbef8b278bd407ef;hpb=bf7d1cd5635d41bd7c58bf99c61cdc670291c543;p=tpg%2Facess2.git

diff --git a/Kernel/lib.c b/Kernel/lib.c
index bfae2a41..116dce61 100644
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -14,7 +14,57 @@ 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);
+char	**str_split(const char *__str, char __ch);
+ int	strpos8(const char *str, Uint32 Search);
  int	ReadUTF8(Uint8 *str, Uint32 *Val);
+ int	WriteUTF8(Uint8 *str, Uint32 Val);
+ int	DivUp(int num, int dem);
+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(str_split);
+EXPORT(strpos8);
+EXPORT(DivUp);
+EXPORT(ReadUTF8);
+EXPORT(WriteUTF8);
+EXPORT(timestamp);
+EXPORT(CheckString);
+EXPORT(CheckMem);
+EXPORT(ModUtil_LookupString);
+EXPORT(ModUtil_SetIdent);
 
 // === GLOBALS ===
 static Uint	giRandomState = RANDOM_SEED;
@@ -26,9 +76,16 @@ static Uint	giRandomState = RANDOM_SEED;
 int atoi(const char *string)
 {
 	 int	ret = 0;
+	 int	bNeg = 0;
+	
+	//Log("atoi: (string='%s')", string);
 	
 	// Clear non-numeric characters
-	while( !('0' <= *string && *string <= '9') )	string++;
+	while( !('0' <= *string && *string <= '9') && *string != '-' )	string++;
+	if( *string == '-' ) {
+		bNeg = 1;
+		while( !('0' <= *string && *string <= '9') )	string++;
+	}
 	
 	if(*string == '0')
 	{
@@ -37,32 +94,34 @@ int atoi(const char *string)
 		{
 			// Hex
 			string ++;
-			for( ;; ) {
-				ret *= 16;
-				if('0' <= *string && *string <= '9')
+			for( ;; string ++ )
+			{
+				if('0' <= *string && *string <= '9') {
+					ret *= 16;
 					ret += *string - '0';
-				else if('A' <= *string && *string <= 'F')
+				}
+				else if('A' <= *string && *string <= 'F') {
+					ret *= 16;
 					ret += *string - 'A' + 10;
-				else if('a' <= *string && *string <= 'f')
+				}
+				else if('a' <= *string && *string <= 'f') {
+					ret *= 16;
 					ret += *string - 'a' + 10;
+				}
 				else
 					break;
-				string ++;
 			}
 		}
-		else
+		else	// Octal
 		{
-			for( ;; )
+			for( ; '0' <= *string && *string <= '7'; string ++ )
 			{
 				ret *= 8;
-				if('0' <= *string && *string <= '7')
-					ret += *string - '0';
-				else
-					break;
+				ret += *string - '0';
 			}
 		}
 	}
-	else
+	else	// Decimal
 	{
 		for( ; '0' <= *string && *string <= '9'; string++)
 		{
@@ -70,6 +129,11 @@ int atoi(const char *string)
 			ret += *string - '0';
 		}
 	}
+	
+	if(bNeg)	ret = -ret;
+	
+	//Log("atoi: RETURN %i", ret);
+	
 	return ret;
 }
 
@@ -108,16 +172,27 @@ void itoa(char *buf, Uint num, int base, int minLength, char pad)
 	buf[i] = 0;
 }
 
-#define PUTCH(c)	do{if(pos==__maxlen)break;if(__s){__s[pos++]=(c);}else{pos++;}}while(0)
+/**
+ * \brief Append a character the the vsnprintf output
+ */
+#define PUTCH(c)	do{\
+	char ch=(c);\
+	if(pos==__maxlen){return pos;}\
+	if(__s){__s[pos++]=ch;}else{pos++;}\
+	}while(0)
 int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 {
 	char	c, pad = ' ';
-	 int	minSize = 0;
+	 int	minSize = 0, len;
 	char	tmpBuf[34];	// For Integers
 	char	*p = NULL;
 	 int	isLongLong = 0;
 	Uint64	val;
 	size_t	pos = 0;
+	// Flags
+	 int	bPadLeft = 0;
+	
+	//Log("vsnprintf: (__s=%p, __maxlen=%i, __format='%s', ...)", __s, __maxlen, __format);
 	
 	while((c = *__format++) != 0)
 	{
@@ -125,6 +200,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 		if(c != '%') { PUTCH(c); continue; }
 		
 		c = *__format++;
+		//Log("pos = %i", pos);
 		
 		// Literal %
 		if(c == '%') { PUTCH('%'); continue; }
@@ -141,6 +217,12 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 		// Get Argument
 		val = va_arg(args, Uint);
 		
+		// - Padding Side Flag
+		if(c == '+') {
+			bPadLeft = 1;
+			c = *__format++;
+		}
+		
 		// - Padding
 		if(c == '0') {
 			pad = '0';
@@ -150,8 +232,12 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 			pad = ' ';
 		
 		// - Minimum length
-		minSize = 1;
-		if('1' <= c && c <= '9')
+		if(c == '*') {
+			minSize = val;
+			val = va_arg(args, Uint);
+			c = *__format++;
+		}
+		else if('1' <= c && c <= '9')
 		{
 			minSize = 0;
 			while('0' <= c && c <= '9')
@@ -161,6 +247,8 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 				c = *__format++;
 			}
 		}
+		else
+			minSize = 1;
 		
 		// - Default, Long or LongLong?
 		isLongLong = 0;
@@ -211,12 +299,16 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 			p = (char*)(Uint)val;
 		printString:
 			if(!p)		p = "(null)";
+			len = strlen(p);
+			if( !bPadLeft )	while(len++ < minSize)	PUTCH(pad);
 			while(*p)	PUTCH(*p++);
+			if( bPadLeft )	while(len++ < minSize)	PUTCH(pad);
 			break;
 		
 		case 'C':	// Non-Null Terminated Character Array
 			p = (char*)(Uint)val;
 			if(!p)	goto printString;
+			//while(minSize--)	PUTCH(*p++);
 			while(minSize--)	PUTCH(*p++);
 			break;
 		
@@ -230,7 +322,6 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 	
 	if(__s && pos != __maxlen)
 		__s[pos] = '\0';
-		
 	
 	return pos;
 }
@@ -369,6 +460,47 @@ char *strdup(const char *Str)
 	return ret;
 }
 
+/**
+ * \brief Split a string using the passed character
+ * \return NULL terminated array of strings on the heap
+ * \param __str	String to split
+ * \param __ch	Character to split by
+ */
+char **str_split(const char *__str, char __ch)
+{
+	 int	i, j;
+	 int	len = 1;
+	char	**ret;
+	char	*start;
+	
+	for( i = 0; __str[i]; i++ )
+	{
+		if(__str[i] == __ch)
+			len ++;
+	}
+	
+	ret = malloc( sizeof(char*)*(len+1) + (i + 1) );
+	if( !ret )	return NULL;
+	
+	j = 1;
+	start = (char *)&ret[len+1];
+	ret[0] = start;
+	for( i = 0; __str[i]; i++ )
+	{
+		if(__str[i] == __ch) {
+			*start++ = '\0';
+			ret[j++] = start;
+		}
+		else {
+			*start++ = __str[i]; 
+		}
+	}
+	*start = '\0';
+	ret[j] = NULL;
+	
+	return ret;
+}
+
 /**
  * \fn int DivUp(int num, int dem)
  * \brief Divide two numbers, rounding up
@@ -539,7 +671,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
@@ -636,17 +768,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);