Corey Stup points out that any attempt to display the message "Unable to load

[sgt/putty] / config.c

diff --git a/config.c b/config.c
index 8d492df..d0931f8 100644 (file)
--- a/config.c
+++ b/config.c
@@ -317,14 +317,14 @@ static void codepage_handler(union control *ctrl, void *dlg,
     Config *cfg = (Config *)data;
     if (event == EVENT_REFRESH) {
        int i;
-       const char *cp;
+       const char *cp, *thiscp;
        dlg_update_start(ctrl, dlg);
-       strcpy(cfg->line_codepage,
-              cp_name(decode_codepage(cfg->line_codepage)));
+       thiscp = cp_name(decode_codepage(cfg->line_codepage));
        dlg_listbox_clear(ctrl, dlg);
        for (i = 0; (cp = cp_enumerate(i)) != NULL; i++)
            dlg_listbox_add(ctrl, dlg, cp);
-       dlg_editbox_set(ctrl, dlg, cfg->line_codepage);
+       dlg_editbox_set(ctrl, dlg, thiscp);
+       strcpy(cfg->line_codepage, thiscp);
        dlg_update_done(ctrl, dlg);
     } else if (event == EVENT_VALCHANGE) {
        dlg_editbox_get(ctrl, dlg, cfg->line_codepage,
@@ -1016,19 +1016,25 @@ static void portfwd_handler(union control *ctrl, void *dlg,
                *p = '\0';
            p = cfg->portfwd;
            while (*p) {
+               if (strcmp(p,str) == 0) {
+                   dlg_error_msg(dlg, "Specified forwarding already exists");
+                   break;
+               }
                while (*p)
                    p++;
                p++;
            }
-           if ((p - cfg->portfwd) + strlen(str) + 2 <=
-               sizeof(cfg->portfwd)) {
-               strcpy(p, str);
-               p[strlen(str) + 1] = '\0';
-               dlg_listbox_add(pfd->listbox, dlg, str);
-               dlg_editbox_set(pfd->sourcebox, dlg, "");
-               dlg_editbox_set(pfd->destbox, dlg, "");
-           } else {
-               dlg_error_msg(dlg, "Too many forwardings");
+           if (!*p) {
+               if ((p - cfg->portfwd) + strlen(str) + 2 <=
+                   sizeof(cfg->portfwd)) {
+                   strcpy(p, str);
+                   p[strlen(str) + 1] = '\0';
+                   dlg_listbox_add(pfd->listbox, dlg, str);
+                   dlg_editbox_set(pfd->sourcebox, dlg, "");
+                   dlg_editbox_set(pfd->destbox, dlg, "");
+               } else {
+                   dlg_error_msg(dlg, "Too many forwardings");
+               }
            }
        } else if (ctrl == pfd->rembutton) {
            int i = dlg_listbox_index(pfd->listbox, dlg);