Fiddly fixes in code page handling

git-svn-id: svn://svn.tartarus.org/sgt/putty@1303 cda61777-01e9-0310-a592-d414129be87e

diff --git a/unicode.c b/unicode.c
index 37df590..76ffa4c 100644 (file)
--- a/unicode.c
+++ b/unicode.c
@@ -245,8 +245,6 @@ static struct cp_list_item cp_list[] = {
     {"Win1257 (Baltic)", 1257},
     {"Win1258 (Vietnamese)", 1258},
 
-    {"Win1258 (Vietnamese)", 1258},
-
     {"CP437", 437},
     {"CP819", 28591},
     {"CP878", 20866},
@@ -963,6 +961,8 @@ int decode_codepage(char *cp_name)
                    codepage = cpi->codepage;
                    if (codepage == CP_UTF8)
                        goto break_break;
+                   if (codepage == -1)
+                       return codepage;
                    if (codepage == 0) {
                        codepage = 65536 + (cpi - cp_list);
                        goto break_break;