Fix subtle problem with scp protocol/port selection

[u/mdw/putty] / windlg.c

diff --git a/windlg.c b/windlg.c
index ad6ac33..23aee3f 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -117,7 +117,7 @@ static void save_settings (char *section, int do_host) {
        wpps (sesskey, "HostName", cfg.host);
        wppi (sesskey, "PortNumber", cfg.port);
         p = "raw";
-        for (i = 0; backends[i].backend != NULL; i++)
+        for (i = 0; backends[i].name != NULL; i++)
             if (backends[i].protocol == cfg.protocol) {
                 p = backends[i].name;
                 break;
@@ -243,7 +243,7 @@ static void load_settings (char *section, int do_host) {
 
     gpps (sesskey, "Protocol", "default", prot, 10);
     cfg.protocol = default_protocol;
-    for (i = 0; backends[i].backend != NULL; i++)
+    for (i = 0; backends[i].name != NULL; i++)
         if (!strcmp(prot, backends[i].name)) {
             cfg.protocol = backends[i].protocol;
             break;
@@ -259,7 +259,7 @@ static void load_settings (char *section, int do_host) {
       char buf[2*sizeof(cfg.environmt)], *p, *q;
        gpps (sesskey, "Environment", "", buf, sizeof(buf));
        p = buf;
-      q = cfg.environmt;
+       q = cfg.environmt;
        while (*p) {
            while (*p && *p != ',') {
                int c = *p++;
@@ -267,7 +267,7 @@ static void load_settings (char *section, int do_host) {
                    c = '\t';
                if (c == '\\')
                    c = *p++;
-               *p++ = c;
+               *q++ = c;
            }
            if (*p == ',') p++;
            *q++ = '\0';