Merge branch 'pre-0.64'

[PuTTY.git] / unix / uxputty.c

diff --git a/unix/uxputty.c b/unix/uxputty.c
index fc718a0c8cfbc0ad3a38bfa73c02ae24c0206550..c7b0fcb2209c05a97db9be7caf7d6d71ec9543ad 100644 (file)
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -76,8 +76,7 @@ int process_nonoption_arg(char *arg, Conf *conf, int *allow_launch)
             q += 2;
         conf_set_int(conf, CONF_protocol, PROT_TELNET);
         p = q;
-        while (*p && *p != ':' && *p != '/')
-            p++;
+        p += host_strcspn(p, ":/");
         c = *p;
         if (*p)
             *p++ = '\0';
@@ -122,9 +121,14 @@ char *platform_get_x_display(void) {
     return dupstr(display);
 }
 
+const int share_can_be_downstream = TRUE;
+const int share_can_be_upstream = TRUE;
+
 int main(int argc, char **argv)
 {
     extern int pt_main(int argc, char **argv);
+    int ret;
+
     sk_init();
     flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
     default_protocol = be_default_protocol;
@@ -135,5 +139,7 @@ int main(int argc, char **argv)
        if (b)
            default_port = b->default_port;
     }
-    return pt_main(argc, argv);
+    ret = pt_main(argc, argv);
+    cleanup_exit(ret);
+    return ret;             /* not reached, but placates optimisers */
 }