--- smsdaemon/Util.cpp	2008/12/08 21:49:49	158
+++ smsdaemon/Util.cpp	2008/12/19 07:03:34	203
@@ -10,6 +10,9 @@
 #include <stdexcept>
 #include <time.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
 #include <stdlib.h>
 
 #include <cstring>
@@ -146,6 +149,18 @@
 		return str;
 	}
 
+
+	vector<string>  str_split(string input)
+	{
+		string buf;
+		stringstream ss(input);
+		vector<string> tokens;
+		while (ss >> buf)
+			tokens.push_back(buf);
+		return tokens;
+	}
+
+
 	vector<string> str_split(string input, string delimiter)
 	{
 		vector<string> retval;
@@ -168,26 +183,28 @@
 		return retval;
 	}
 
-	char my_toupper(char ch)
+	char danish_map[3][2] = { {198,230}, {216,248}, {197,229} }; // aelig, oslash, aring
+
+	unsigned char my_toupper(unsigned char ch)
 	{
-		if (ch == 'æ')
-			return 'Æ';
-		if (ch == 'ø')
-			return 'Ø';
-		if (ch == 'å')
-			return 'Å';
+		if (ch == 230)
+			return 198;
+		if (ch == 248)
+			return 216;
+		if (ch == 229)
+			return 197;
 
 		return ::toupper(ch);
 	}
 
-	char my_tolower(char ch)
+	unsigned char my_tolower(unsigned char ch)
 	{
-		if (ch == 'Æ')
-			return 'æ';
-		if (ch == 'Ø')
-			return 'ø';
-		if (ch == 'Å')
-			return 'å';
+		if (ch == 198)
+			return 230;
+		if (ch == 216)
+			return 248;
+		if (ch == 197)
+			return 229;
 
 		return ::tolower(ch);
 	}
@@ -223,22 +240,28 @@
 		string rep;
 		rep.append(1,197);
 		str = str_replace(str, "&#197;", rep);
+		str = str_replace(str, "&Aring;", rep);
 
 		rep.at(0) = 198;
 		str = str_replace(str, "&#198;", rep);
+		str = str_replace(str, "&AElig;", rep);
 
 		rep.at(0) = 216;
 		str = str_replace(str, "&#216;", rep);
+		str = str_replace(str, "&Oslash;", rep);
 
 
 		rep.at(0) = 229;
 		str = str_replace(str, "&#229;", rep);
+		str = str_replace(str, "&aring;", rep);
 
 		rep.at(0) = 230;
 		str = str_replace(str, "&#230;", rep);
+		str = str_replace(str, "&aelig;", rep);
 
 		rep.at(0) = 248;
 		str = str_replace(str, "&#248;", rep);
+		str = str_replace(str, "&oslash;", rep);
 
 		return str;
 	}
@@ -246,7 +269,8 @@
 
 	string str_gsm2latin(string str)
 	{
-		for (unsigned i=0; i<str.size(); i++) {
+		for (unsigned i=0; i<str.size(); i++)
+		{
 			str.at(i) = char_def_alphabet_decode(str.at(i));
 		}
 		return str;
@@ -254,12 +278,14 @@
 
 	string str_latin2gsm(string str)
 	{
-		for (unsigned i=0; i<str.size(); i++) {
+		for (unsigned i=0; i<str.size(); i++)
+		{
 			str.at(i) = char_def_alphabet_encode(str.at(i));
 		}
 		return str;
 	}
 
+	/* deprecated, use HttpClient instead
 	string readUrl(string url, string tempfile)
 	{
 		char buf[128000];
@@ -294,7 +320,7 @@
 		unlink(tempfile.c_str());
 
 		return document;
-	}
+	}*/
 
 
 
@@ -397,6 +423,47 @@
 		return (pclose(p));
 	}
 
+	int my_system2 (const char *command)
+	{
+		int pid, status;
+
+		if (command == 0)
+			return 1;
+	//	printf("forking ...\n");
+		pid = fork();
+		if (pid == -1)
+			return -1;
+		if (pid == 0)
+		{
+			char *argv[4];
+			argv[0] = (char*) "sh";
+			argv[1] = (char*) "-c";
+			argv[2] = (char *) command;
+			argv[3] = 0;
+	//		printf("chaining ...\n");
+			execve("/bin/sh", argv, environ);
+	//		printf("Chaining failed!\n");
+			exit(127);
+		}
+		do
+		{
+	//		printf("Waiting on PID: %d\n",pid);
+			if (waitpid(pid, &status, 0) == -1)
+			{
+	//			printf("erc: %d\n",errno);
+				if (errno != EINTR)
+					return -1;
+			}
+			else
+			{
+	//			printf("status: %d\n",status);
+				return status;
+			}
+		}
+		while (1);
+	}
+
+
 	string readfile(string filename)
 	{
 		string str;