* Acess2
* Common Library Functions
*/
-#include <common.h>
+#include <acess.h>
// === CONSTANTS ===
#define RANDOM_SEED 0xACE55052
#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)
buf[i] = 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;
+ char tmpBuf[34]; // For Integers
+ char *p = NULL;
+ int isLongLong = 0;
+ Uint64 val;
+ size_t pos = 0;
+
+ //Log("vsnprintf: (__s=%p, __maxlen=%i, __format='%s', ...)", __s, __maxlen, __format);
+
+ while((c = *__format++) != 0)
+ {
+ // Non control character
+ if(c != '%') { PUTCH(c); continue; }
+
+ c = *__format++;
+ //Log("pos = %i", pos);
+
+ // Literal %
+ if(c == '%') { PUTCH('%'); continue; }
+
+ // Pointer - Done first for debugging
+ if(c == 'p') {
+ Uint ptr = va_arg(args, Uint);
+ PUTCH('*'); PUTCH('0'); PUTCH('x');
+ p = tmpBuf;
+ itoa(p, ptr, 16, BITS/4, '0');
+ goto printString;
+ }
+
+ // Get Argument
+ val = va_arg(args, Uint);
+ //Log("val = %x", val);
+
+
+ // - Padding
+ if(c == '0') {
+ pad = '0';
+ c = *__format++;
+ }
+ else
+ pad = ' ';
+
+ // - Minimum length
+ minSize = 1;
+ if('1' <= c && c <= '9')
+ {
+ minSize = 0;
+ while('0' <= c && c <= '9')
+ {
+ minSize *= 10;
+ minSize += c - '0';
+ c = *__format++;
+ }
+ }
+
+ // - Default, Long or LongLong?
+ isLongLong = 0;
+ if(c == 'l') // Long is actually the default on x86
+ {
+ c = *__format++;
+ if(c == 'l') {
+ #if BITS == 32
+ val |= (Uint64)va_arg(args, Uint) << 32;
+ #endif
+ c = *__format++;
+ isLongLong = 1;
+ }
+ }
+
+ // - Now get the format code
+ p = tmpBuf;
+ switch(c)
+ {
+ case 'd':
+ case 'i':
+ if( (isLongLong && val >> 63) || (!isLongLong && val >> 31) ) {
+ PUTCH('-');
+ val = -val;
+ }
+ itoa(p, val, 10, minSize, pad);
+ goto printString;
+ case 'u':
+ itoa(p, val, 10, minSize, pad);
+ goto printString;
+ case 'x':
+ itoa(p, val, 16, minSize, pad);
+ goto printString;
+ case 'o':
+ itoa(p, val, 8, minSize, pad);
+ goto printString;
+ case 'b':
+ itoa(p, val, 2, minSize, pad);
+ goto printString;
+
+ case 'B': //Boolean
+ if(val) p = "True";
+ else p = "False";
+ goto printString;
+
+ // String - Null Terminated Array
+ case 's':
+ p = (char*)(Uint)val;
+ printString:
+ //Log("p = '%s'", p);
+ if(!p) p = "(null)";
+ while(*p) PUTCH(*p++);
+ break;
+
+ case 'C': // Non-Null Terminated Character Array
+ p = (char*)(Uint)val;
+ if(!p) goto printString;
+ while(minSize--) PUTCH(*p++);
+ break;
+
+ // Single Character
+ case 'c':
+ default:
+ PUTCH( (Uint8)val );
+ break;
+ }
+ }
+
+ if(__s && pos != __maxlen)
+ __s[pos] = '\0';
+
+ return pos;
+}
+#undef PUTCH
+
+/**
+ */
+int sprintf(char *__s, const char *__format, ...)
+{
+ va_list args;
+ int ret;
+
+ va_start(args, __format);
+ ret = vsnprintf(__s, -1, __format, args);
+ va_end(args);
+
+ return ret;
+}
+
/**
* \fn int tolower(int c)
* \brief Converts a character to lower case
}
/**
- * \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)
}
/**
- * \fn int ByteSum(void *Ptr, int Size)
+ * \fn Uint8 ByteSum(void *Ptr, int Size)
* \brief Adds the bytes in a memory region and returns the sum
*/
-int ByteSum(void *Ptr, int Size)
+Uint8 ByteSum(void *Ptr, int Size)
{
- int sum = 0;
+ Uint8 sum = 0;
while(Size--) sum += *(Uint8*)Ptr++;
return sum;
}
}
/**
- * \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)
return __str1;
}
+/**
+ * \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)
+{
+ while(*__str2 && max-- >= 1)
+ *__str1++ = *__str2++;
+ if(max)
+ *__str1 = '\0'; // Terminate String
+ return __str1;
+}
+
/**
* \fn int strcmp(const char *str1, const char *str2)
* \brief Compare two strings return the difference between
* \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
* \brief Search a string array for \a Needle
* \note Helper function for eTplDrv_IOCtl::DRV_IOCTL_LOOKUP
*/
-int LookupString(char **Array, char *Needle)
+int ModUtil_LookupString(char **Array, char *Needle)
{
int i;
+ if( !CheckString(Needle) ) return -1;
for( i = 0; Array[i]; i++ )
{
if(strcmp(Array[i], Needle) == 0) return i;
return -1;
}
-EXPORT(strdup);
-EXPORT(strcmp);
-EXPORT(strcpy);
-
-EXPORT(timestamp);
-EXPORT(ReadUTF8);
-EXPORT(CheckMem);
-EXPORT(CheckString);
+int ModUtil_SetIdent(char *Dest, char *Value)
+{
+ if( !CheckMem(Dest, 32) ) return -1;
+ strncpy(Dest, Value, 32);
+ return 1;
+}