--- Daodan/src/inifile_reader.c	2009/06/09 12:00:41	346
+++ Daodan/src/inifile_reader.c	2009/07/26 12:04:44	451
@@ -6,7 +6,78 @@
 
 #include "inifile.h"
 
-bool inifile_read(char* filename, inifile_callback callback)
+char* inifile_cleanstr(char* str)
+{
+	int i;
+	for (i = strlen(str) - 1; i >= 0; i --)
+		if (!isspace(str[i]))
+		{
+			str[i + 1] = '\0';
+			break;
+		}
+	
+	while (isspace(*str))
+		str++;
+	
+	return str;
+}
+
+int64_t inifile_parseint(const char* str, bool issigned)
+{
+	int64_t ret = 0;
+	bool neg = false;
+	if (str[0] == '0' && str[1] == 'x')
+	{
+		int i;
+		if (str[2] == '\0')
+			return 0x100000000LL;
+		
+		for (i = 0, str += 2; *str; i++, str++)
+		{
+			if (i == 8)
+				return 0x100000000LL;
+			
+			ret <<= 4;
+			if (*str >= '0' && *str <= '9')
+				ret |= *str - '0';
+			else if (*str >= 'a' && *str <= 'f')
+				ret |= *str - 'a' + 10;
+			else if (*str >= 'A' && *str <= 'F')
+				ret |= *str - 'A' + 10;
+			else
+				return 0x100000000LL;
+		}
+		return ret;
+	}
+	else if ((*str >= '0' && *str <= '9') || (neg = (*str == '-')))
+	{
+		int i;
+		if (neg)
+			str++;
+		for (i = 0; *str; i++, str++)
+		{
+			if (i == 10)
+				return 0x100000000LL;
+			else if (i == 9 && !issigned && (ret > 429496729LL || (ret == 429496729LL && *str > '5')))
+				return 0x100000000LL;
+			else if (i == 9 && issigned && (ret > 214748364LL || (ret == 214748364LL && *str > (neg ? '8' : '7'))))
+				return 0x100000000LL;
+			
+			ret *= 10;
+			if (*str >= '0' && *str <= '9')
+				ret += *str - '0';
+			else
+				return 0x100000000LL;
+		}
+		if (neg)
+			ret *= -1;
+		return ret;
+	}
+	else
+		return 0x100000000LL;
+}
+
+bool inifile_read(const char* filename, inifile_callback callback)
 {
 	FILE* fp = fopen(filename, "r");
 	char* inisection = "";
@@ -42,7 +113,7 @@ bool inifile_read(char* filename, inifil
 			
 			if (inisection[0])
 				free(inisection);
-			inisection = strdup(readptr + 1);
+			inisection = strdup(readptr + 1); // Skip the first [
 			newsection = true;
 		}
 		else // It's a value.
@@ -56,14 +127,14 @@ bool inifile_read(char* filename, inifil
 			if (readptr[i - 1] == '\n')
 				readptr[i - 1] = '\0'; // Remove the trailing newline.
 			
-			if (equals) // If there's no equals, crash with error.
+			if (equals)
 			{
 				readptr[equals] = '\0';
 				if (!callback(inisection, newsection, readptr, readptr + equals + 1)) // If the callback is false, exit.
 					break;
 				newsection = false;
 			}
-			else
+			else // If there's no equals, crash with error.
 			{
 				success = false;
 				break;