When looking for a local username on Windows, if we can get hold of the

[u/mdw/putty] / config.c

diff --git a/config.c b/config.c
index 3f0ea93..464a241 100644 (file)
--- a/config.c
+++ b/config.c
@@ -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);
@@ -1170,7 +1176,7 @@ void setup_config_box(struct controlbox *b, int midsession,
            ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 3,
                              HELPCTX(session_hostname),
                              config_protocolbuttons_handler, P(hp),
-                             "Raw", 'r', I(PROT_RAW),
+                             "Raw", 'w', I(PROT_RAW),
                              "Telnet", 't', I(PROT_TELNET),
                              "Rlogin", 'i', I(PROT_RLOGIN),
                              NULL);
@@ -1178,7 +1184,7 @@ void setup_config_box(struct controlbox *b, int midsession,
            ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 4,
                              HELPCTX(session_hostname),
                              config_protocolbuttons_handler, P(hp),
-                             "Raw", 'r', I(PROT_RAW),
+                             "Raw", 'w', I(PROT_RAW),
                              "Telnet", 't', I(PROT_TELNET),
                              "Rlogin", 'i', I(PROT_RLOGIN),
                              "SSH", 's', I(PROT_SSH),
@@ -1236,7 +1242,7 @@ void setup_config_box(struct controlbox *b, int midsession,
     ctrl_columns(s, 1, 100);
 
     s = ctrl_getset(b, "Session", "otheropts", NULL);
-    c = ctrl_radiobuttons(s, "Close window on exit:", 'w', 4,
+    c = ctrl_radiobuttons(s, "Close window on exit:", 'x', 4,
                          HELPCTX(session_coe),
                          dlg_stdradiobutton_handler,
                          I(offsetof(Config, close_on_exit)),
@@ -1759,7 +1765,8 @@ void setup_config_box(struct controlbox *b, int midsession,
                /* We assume the local username is sufficiently stable
                 * to include on the dialog box. */
                char *user = get_username();
-               char *userlabel = dupprintf("Use system username (%s)", user);
+               char *userlabel = dupprintf("Use system username (%s)",
+                                           user ? user : "");
                sfree(user);
                ctrl_radiobuttons(s, "When username is not specified:", 'n', 4,
                                  HELPCTX(connection_username_from_env),