Mass commit of all the changes made between version 2.1 and 2.2.5. See ChangeLog...

[thirdparty/sarg.git] / charset.c

diff --git a/charset.c b/charset.c
index 8d1f6cd34b641ff89efecd35fbaaba6c61972b23..d5d94ee3554754f969f9ff2cfdec05fd46d1b6d6 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -27,40 +27,18 @@
 
 void ccharset()
 {
-
-   if(strcmp(CharSet,"Latin2") == 0)
-      strcpy(CharSet,"ISO-8859-2");
-
-   if(strcmp(CharSet,"Latin3") == 0)
-      strcpy(CharSet,"ISO-8859-3");
-
-   if(strcmp(CharSet,"Latin4") == 0)
-      strcpy(CharSet,"ISO-8859-4");
-
-   if(strcmp(CharSet,"Cyrillic") == 0)
-      strcpy(CharSet,"ISO-8859-5");
-
-   if(strcmp(CharSet,"Arabic") == 0)
-      strcpy(CharSet,"ISO-8859-6");
-
-   if(strcmp(CharSet,"Greek") == 0)
-      strcpy(CharSet,"ISO-8859-7");
-
-   if(strcmp(CharSet,"Hebrew") == 0)
-      strcpy(CharSet,"ISO-8859-8");
-
-   if(strcmp(CharSet,"Latin5") == 0)
-      strcpy(CharSet,"ISO-8859-9");
-
-   if(strcmp(CharSet,"Latin6") == 0)
-      strcpy(CharSet,"ISO-8859-10");
-
-   if(strcmp(CharSet,"Windows-1251") == 0)
-      strcpy(CharSet,"Windows-1251");
-
-   if(strcmp(CharSet,"Koi8-r") == 0)
-      strcpy(CharSet,"KOI8-R");
-
+   if(strcmp(CharSet,"Latin2") == 0) strcpy(CharSet,"ISO-8859-2");
+   else if(strcmp(CharSet,"Latin3") == 0) strcpy(CharSet,"ISO-8859-3");
+   else if(strcmp(CharSet,"Latin4") == 0) strcpy(CharSet,"ISO-8859-4");
+   else if(strcmp(CharSet,"Cyrillic") == 0) strcpy(CharSet,"ISO-8859-5");
+   else if(strcmp(CharSet,"Arabic") == 0) strcpy(CharSet,"ISO-8859-6");
+   else if(strcmp(CharSet,"Greek") == 0) strcpy(CharSet,"ISO-8859-7");
+   else if(strcmp(CharSet,"Hebrew") == 0) strcpy(CharSet,"ISO-8859-8");
+   else if(strcmp(CharSet,"Latin5") == 0) strcpy(CharSet,"ISO-8859-9");
+   else if(strcmp(CharSet,"Latin6") == 0) strcpy(CharSet,"ISO-8859-10");
+   else if(strcmp(CharSet,"Windows-1251") == 0) strcpy(CharSet,"Windows-1251");
+   else if(strcmp(CharSet,"Japan") == 0) strcpy(CharSet,"EUC-JP");
+   else if(strcmp(CharSet,"Koi8-r") == 0) strcpy(CharSet,"KOI8-R");
+   else if(strcmp(CharSet,"UTF-8") == 0) strcpy(CharSet,"UTF-8");
    return;
-
 }