--- smsdaemon/util.cpp	2008/06/16 10:09:17	89
+++ smsdaemon/util.cpp	2008/12/07 00:59:05	132
@@ -10,7 +10,9 @@
 #include <stdexcept>
 #include <time.h>
 #include <sys/time.h>
+#include <stdlib.h>
 
+#include <cstring>
 #include "util.h"
 
 using namespace std;
@@ -105,12 +107,34 @@
 		return retval;
 	}
 
+	char my_toupper(char ch)
+	{
+		if (ch == 'æ')
+			return 'Æ';
+		if (ch == 'ø')
+			return 'Ø';
+		if (ch == 'å')
+			return 'Å';
+
+		return ::toupper(ch);
+	}
+
+	char my_tolower(char ch)
+	{
+		if (ch == 'Æ')
+			return 'æ';
+		if (ch == 'Ø')
+			return 'ø';
+		if (ch == 'Å')
+			return 'å';
 
+		return ::tolower(ch);
+	}
     string str_toupper(string str)
 	{
 		for (unsigned i=0; i<str.length(); ++i)
 		{
-			str.replace(i, 1 ,1, ::toupper(str.at(i)));
+			str.replace(i, 1 ,1, my_toupper(str.at(i)));
 		}
 		return str;
 	}
@@ -119,7 +143,7 @@
 	{
 		for (unsigned i=0; i<str.length(); ++i)
 		{
-			str.replace(i, 1 ,1, ::tolower(str.at(i)));
+			str.replace(i, 1 ,1, my_tolower(str.at(i)));
 		}
 		return str;
 	}
@@ -298,14 +322,51 @@
 		return now;
 	}
 
-	int my_system(const char* cmd)
+	int my_system(const char* cmd, std::string* response)
 	{
 		FILE* p;
-		if ((p = popen(cmd,"w")) == NULL)
+		if ((p = popen(cmd,"r")) == NULL)
 			return (-1);
+
+		if (response)
+		{
+			std::string output;
+			char buf[256];
+			while(!feof(p))
+			{
+				int len = fread(buf,1,255, p);
+				buf[len] = 0;
+				output += buf;
+			}
+			*response = output;
+		}
+
 		return (pclose(p));
 	}
 
+	string readfile(string filename)
+	{
+		string str;
+	    ifstream in(filename.c_str());
+    	if (in)
+	    {
+    	    char buffer[2048];
+        	in.read(buffer, 2047);
+			buffer[ in.gcount() ] = 0;
+	        str = string(buffer);
+    	    in.close();
+	    }
+    	else
+	    {
+    	    string message =  "Could no open ";
+        	message +=  filename;
+	        throw std::runtime_error(message);
+    	}
+	    return str;
+	}
+
+
+
 }