--- smsdaemon/util.cpp 2008/12/07 13:28:52 141 +++ smsdaemon/Util.cpp 2008/12/12 13:57:10 183 @@ -13,7 +13,7 @@ #include #include -#include "util.h" +#include "Util.h" using namespace std; @@ -168,26 +168,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); } @@ -403,15 +405,15 @@ ifstream in(filename.c_str()); if (in) { - char buffer[2048]; - in.read(buffer, 2047); + char buffer[4096]; + in.read(buffer, 4095); buffer[ in.gcount() ] = 0; str = string(buffer); in.close(); } else { - string message = "Could no open "; + string message = "Could not open "; message += filename; throw std::runtime_error(message); }