X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flib.c;h=c1e2807ec23164a73f566c40506f04aa238a782c;hb=ec0a3c65da8c3d47895ab2e5b4cec8cf2070f6eb;hp=c4251a63dd7baf84e51df15253e76c663ffd6e13;hpb=193a19846230cd653ca61b65d54538974116c1ea;p=tpg%2Facess2.git

diff --git a/Kernel/lib.c b/Kernel/lib.c
index c4251a63..c1e2807e 100644
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -3,6 +3,7 @@
  * Common Library Functions
  */
 #include <acess.h>
+#include <hal_proc.h>
 
 // === CONSTANTS ===
 #define	RANDOM_SEED	0xACE55052
@@ -357,7 +358,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) )	p = "(inval)";	// Avoid #PFs  
+			if( !p || !CheckString(p) )	p = "(inval)";	// Avoid #PFs  
 		printString:
 			if(!p)		p = "(null)";
 			len = strlen(p);
@@ -489,11 +490,11 @@ char *strcpy(char *__str1, const char *__str2)
  * \brief Copy a string to a new location
  * \note Copies at most `max` chars
  */
-char *strncpy(char *__str1, const char *__str2, size_t max)
+char *strncpy(char *__str1, const char *__str2, size_t __max)
 {
-	while(*__str2 && max-- >= 1)
+	while(*__str2 && __max-- >= 1)
 		*__str1++ = *__str2++;
-	if(max)
+	if(__max)
 		*__str1 = '\0';	// Terminate String
 	return __str1;
 }
@@ -821,65 +822,38 @@ int rand(void)
  */
 int CheckString(const char *String)
 {
-	if( !MM_GetPhysAddr( (tVAddr)String ) )
+	tVAddr	addr;
+	 int	bUser;
+
+	addr = (tVAddr)String;
+
+	if( !MM_GetPhysAddr( addr ) )
 		return 0;
 	
 	// Check 1st page
-	if( MM_IsUser( (tVAddr)String ) )
+	bUser = MM_IsUser( addr );
+	
+	while( *(char*)addr )
 	{
-		// Traverse String
-		while( *String )
+		if( (addr & (PAGE_SIZE-1)) == 0 )
 		{
-			if( !MM_IsUser( (tVAddr)String ) )
+			if(bUser && !MM_IsUser(addr) )
 				return 0;
-			// Increment string pointer
-			String ++;
-		}
-		return 1;
-	}
-	else if( MM_GetPhysAddr( (tVAddr)String ) )
-	{
-		// Traverse String
-		while( *String )
-		{
-			if( !MM_GetPhysAddr( (tVAddr)String ) )
+			if(!bUser && !MM_GetPhysAddr(addr) )
 				return 0;
-			// Increment string pointer
-			String ++;
 		}
-		return 1;
+		addr ++;
 	}
-	return 0;
+	return 1;
 }
 
 /**
  * \brief Check if a sized memory region is valid memory
+ * \return Boolean success
  */
 int CheckMem(const void *Mem, int NumBytes)
 {
-	tVAddr	addr = (tVAddr)Mem;
-	
-	if( MM_IsUser( addr ) )
-	{
-		while( NumBytes-- )
-		{
-			if( !MM_IsUser( addr ) )
-				return 0;
-			addr ++;
-		}
-		return 1;
-	}
-	else if( MM_GetPhysAddr( addr ) )
-	{
-		while( NumBytes-- )
-		{
-			if( !MM_GetPhysAddr( addr ) )
-				return 0;
-			addr ++;
-		}
-		return 1;
-	}
-	return 0;
+	return MM_IsValidBuffer( (tVAddr)Mem, NumBytes );
 }
 /* *
  * \}
@@ -956,12 +930,19 @@ void *memmove(void *__dest, const void *__src, size_t len)
 	char	*dest = __dest;
 	const char	*src = __src;
 	void	*ret = __dest;
+
+	if( len == 0 || dest == src )
+		return dest;
 	
 	if( (tVAddr)dest > (tVAddr)src + len )
 		return memcpy(dest, src, len);
 	if( (tVAddr)dest + len < (tVAddr)src )
 		return memcpy(dest, src, len);
 	
+	// NOTE: Assumes memcpy works forward
+	if( (tVAddr)dest < (tVAddr)src )
+		return memcpy(dest, src, len);
+
 	if( (tVAddr)dest < (tVAddr)src )
 		block_size = (tVAddr)src - (tVAddr)dest;
 	else