X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxputty.c;h=6d22fceb76b2b32b8d77489d062222d455efdc7c;hb=c2c22fb16a87783d26edd3235ea9b0d3c6f414e1;hp=f42c428d6e4864713e634e2cf83ed6ad799403c2;hpb=46c00b0f381f48a9992e43e014e104015952e9da;p=PuTTY.git

diff --git a/unix/uxputty.c b/unix/uxputty.c
index f42c428d..6d22fceb 100644
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -7,16 +7,20 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <unistd.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
 #include "putty.h"
 #include "storage.h"
 
+#include "gtkcompat.h"
+
 /*
  * Stubs to avoid uxpty.c needing to be linked in.
  */
 const int use_pty_argv = FALSE;
 char **pty_argv;		       /* never used */
+char *pty_osx_envrestore_prefix;
 
 /*
  * Clean up and exit.
@@ -31,25 +35,31 @@ void cleanup_exit(int code)
     exit(code);
 }
 
-Backend *select_backend(Config *cfg)
+Backend *select_backend(Conf *conf)
 {
-    Backend *back = backend_from_proto(cfg->protocol);
+    Backend *back = backend_from_proto(conf_get_int(conf, CONF_protocol));
     assert(back != NULL);
     return back;
 }
 
-int cfgbox(Config *cfg)
+int cfgbox(Conf *conf)
 {
-    return do_config_box("PuTTY Configuration", cfg, 0, 0);
+    char *title = dupcat(appname, " Configuration", NULL);
+    int ret = do_config_box(title, conf, 0, 0);
+    sfree(title);
+    return ret;
 }
 
 static int got_host = 0;
 
 const int use_event_log = 1, new_session = 1, saved_sessions = 1;
+const int dup_check_launchable = 1;
 
-int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
+int process_nonoption_arg(const char *arg, Conf *conf, int *allow_launch)
 {
-    char *p, *q = arg;
+    char *argdup, *p, *q;
+    argdup = dupstr(arg);
+    q = argdup;
 
     if (got_host) {
         /*
@@ -58,7 +68,7 @@ int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
          * argument, so that it will be deferred until it's a good
          * moment to run it.
          */
-        int ret = cmdline_process_param("-P", arg, 1, cfg);
+        int ret = cmdline_process_param("-P", argdup, 1, conf);
         assert(ret == 2);
     } else if (!strncmp(q, "telnet:", 7)) {
         /*
@@ -71,49 +81,47 @@ int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
         q += 7;
         if (q[0] == '/' && q[1] == '/')
             q += 2;
-        cfg->protocol = PROT_TELNET;
+        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';
         if (c == ':')
-            cfg->port = atoi(p);
+            conf_set_int(conf, CONF_port, atoi(p));
         else
-            cfg->port = -1;
-        strncpy(cfg->host, q, sizeof(cfg->host) - 1);
-        cfg->host[sizeof(cfg->host) - 1] = '\0';
+            conf_set_int(conf, CONF_port, -1);
+	conf_set_str(conf, CONF_host, q);
         got_host = 1;
     } else {
         /*
          * Otherwise, treat this argument as a host name.
          */
-        p = arg;
+        p = argdup;
         while (*p && !isspace((unsigned char)*p))
             p++;
         if (*p)
             *p++ = '\0';
-        strncpy(cfg->host, q, sizeof(cfg->host) - 1);
-        cfg->host[sizeof(cfg->host) - 1] = '\0';
+        conf_set_str(conf, CONF_host, q);
         got_host = 1;
     }
     if (got_host)
 	*allow_launch = TRUE;
+
+    sfree(argdup);
+
     return 1;
 }
 
 char *make_default_wintitle(char *hostname)
 {
-    return dupcat(hostname, " - PuTTY", NULL);
+    return dupcat(hostname, " - ", appname, NULL);
 }
 
 /*
  * X11-forwarding-related things suitable for Gtk app.
  */
 
-const char platform_x11_best_transport[] = "unix";
-
 char *platform_get_x_display(void) {
     const char *display;
     /* Try to take account of --display and what have you. */
@@ -123,9 +131,11 @@ char *platform_get_x_display(void) {
     return dupstr(display);
 }
 
-int main(int argc, char **argv)
+const int share_can_be_downstream = TRUE;
+const int share_can_be_upstream = TRUE;
+
+void setup(int single)
 {
-    extern int pt_main(int argc, char **argv);
     sk_init();
     flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
     default_protocol = be_default_protocol;
@@ -136,5 +146,4 @@ int main(int argc, char **argv)
 	if (b)
 	    default_port = b->default_port;
     }
-    return pt_main(argc, argv);
 }