X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flib.c;h=f6149652eeafd2285effc5254a47374f3d66841b;hb=38e4b28d370c5f9284b285a71518ae2b6bce125c;hp=3399d3d85ca7af8fb496117c03f09d7eb4c8e170;hpb=71d97264ff059a530d86584f690a43831468dc69;p=tpg%2Facess2.git

diff --git a/Kernel/lib.c b/Kernel/lib.c
index 3399d3d8..f6149652 100644
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -56,7 +56,7 @@ void itoa(char *buf, Uint num, int base, int minLength, char pad)
 }
 
 /**
- * \fn int tolower(int __c)
+ * \fn int tolower(int c)
  * \brief Converts a character to lower case
  */
 int tolower(int c)
@@ -70,7 +70,7 @@ int tolower(int c)
  * \fn int strucmp(char *Str1, char *Str2)
  * \brief Compare \a Str1 and \a Str2 case-insensitively
  */
-int strucmp(char *Str1, char *Str2)
+int strucmp(const char *Str1, const char *Str2)
 {
 	while(*Str1 && tolower(*Str1) == tolower(*Str2))
 		Str1++, Str2++;
@@ -78,10 +78,10 @@ int strucmp(char *Str1, char *Str2)
 }
 
 /**
- * \fn int strpos(char *Str, char Ch)
+ * \fn int strpos(const char *Str, char Ch)
  * \brief Search a string for an ascii character
  */
-int strpos(char *Str, char Ch)
+int strpos(const char *Str, char Ch)
 {
 	 int	pos;
 	for(pos=0;Str[pos];pos++)
@@ -92,6 +92,8 @@ int strpos(char *Str, char Ch)
 }
 
 /**
+ * \fn int ByteSum(void *Ptr, int Size)
+ * \brief Adds the bytes in a memory region and returns the sum
  */
 int ByteSum(void *Ptr, int Size)
 {
@@ -101,10 +103,10 @@ int ByteSum(void *Ptr, int Size)
 }
 
 /**
- * \fn Uint strlen(char *__str)
+ * \fn Uint strlen(const char *__str)
  * \brief Get the length of string
  */
-Uint strlen(char *__str)
+Uint strlen(const char *__str)
 {
 	Uint	ret = 0;
 	while(*__str++)	ret++;
@@ -112,10 +114,10 @@ Uint strlen(char *__str)
 }
 
 /**
- * \fn char *strcpy(char *__str1, char *__str2)
+ * \fn char *strcpy(const char *__str1, const char *__str2)
  * \brief Copy a string to a new location
  */
-char *strcpy(char *__str1, char *__str2)
+char *strcpy(char *__str1, const char *__str2)
 {
 	while(*__str2)
 		*__str1++ = *__str2++;
@@ -124,11 +126,11 @@ char *strcpy(char *__str1, char *__str2)
 }
 
 /**
- * \fn int strcmp(char *str1, char *str2)
+ * \fn int strcmp(const char *str1, const char *str2)
  * \brief Compare two strings return the difference between
  *        the first non-matching characters.
  */
-int strcmp(char *str1, char *str2)
+int strcmp(const char *str1, const char *str2)
 {
 	while(*str1 && *str1 == *str2)
 		str1++, str2++;
@@ -136,10 +138,10 @@ int strcmp(char *str1, char *str2)
 }
 
 /**
- * \fn int strncmp(char *Str1, char *Str2, size_t num)
+ * \fn int strncmp(const char *Str1, const char *Str2, size_t num)
  * \brief Compare strings \a Str1 and \a Str2 to a maximum of \a num characters
  */
-int strncmp(char *Str1, char *Str2, size_t num)
+int strncmp(const char *Str1, const char *Str2, size_t num)
 {
 	if(num == 0)	return 0;	// TODO: Check what should officially happen here
 	while(--num && *Str1 && *Str1 == *Str2)
@@ -148,22 +150,33 @@ int strncmp(char *Str1, char *Str2, size_t num)
 }
 
 /**
- * \fn char *strdup(char *str)
+ * \fn char *strdup(const char *Str)
  * \brief Duplicates a string
  */
-char *strdup(char *str)
+char *strdup(const char *Str)
 {
 	char	*ret;
-	ret = malloc(strlen(str)+1);
-	strcpy(ret, str);
+	ret = malloc(strlen(Str)+1);
+	strcpy(ret, Str);
 	return ret;
 }
 
 /**
- * \fn int strpos8(char *str, Uint32 search)
+ * \fn int DivUp(int num, int dem)
+ * \brief Divide two numbers, rounding up
+ * \param num	Numerator
+ * \param dem	Denominator
+ */
+int DivUp(int num, int dem)
+{
+	return (num+dem-1)/dem;
+}
+
+/**
+ * \fn int strpos8(const char *str, Uint32 search)
  * \brief Search a string for a UTF-8 character
  */
-int strpos8(char *str, Uint32 Search)
+int strpos8(const char *str, Uint32 Search)
 {
 	 int	pos;
 	Uint32	val = 0;
@@ -328,5 +341,95 @@ Uint rand()
 	return giRandomState;
 }
 
+/// \name Memory Validation
+/// \{
+/**
+ * \brief Checks if a string resides fully in valid memory
+ */
+int CheckString(char *String)
+{
+	// Check 1st page
+	if( MM_IsUser( (tVAddr)String ) )
+	{
+		// Traverse String
+		while( *String )
+		{
+			if( !MM_IsUser( (tVAddr)String ) )
+				return 0;
+			// Increment string pointer
+			String ++;
+		}
+		return 1;
+	}
+	else if( MM_GetPhysAddr( (tVAddr)String ) )
+	{
+		// Traverse String
+		while( *String )
+		{
+			if( !MM_GetPhysAddr( (tVAddr)String ) )
+				return 0;
+			// Increment string pointer
+			String ++;
+		}
+		return 1;
+	}
+	return 0;
+}
+
+/**
+ * \brief Check if a sized memory region is valid memory
+ */
+int CheckMem(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;
+}
+/// \}
+
+/**
+ * \brief Search a string array for \a Needle
+ * \note Helper function for eTplDrv_IOCtl::DRV_IOCTL_LOOKUP
+ */
+int LookupString(char **Array, char *Needle)
+{
+	 int	i;
+	for( i = 0; Array[i]; i++ )
+	{
+		if(strcmp(Array[i], Needle) == 0)	return i;
+	}
+	return -1;
+}
+
+EXPORT(strlen);
+EXPORT(strdup);
+EXPORT(strcmp);
+EXPORT(strncmp);
+EXPORT(strcpy);
+//EXPORT(strncpy);
+
 EXPORT(timestamp);
 EXPORT(ReadUTF8);
+EXPORT(CheckMem);
+EXPORT(CheckString);
+EXPORT(LookupString);