X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxpterm.c;h=1f4f20c2aaf363c32a1e2ec4e24d6649ccf1518c;hb=f004bcca17a789356c32527a396b68b71a773db2;hp=f2956d9d68a2416a7503e2f87a4894de4fd9fe32;hpb=c64ad3bb0ceb7d453f3ee6e6f6a1727a6a8da9cc;p=PuTTY.git

diff --git a/unix/uxpterm.c b/unix/uxpterm.c
index f2956d9d..1f4f20c2 100644
--- a/unix/uxpterm.c
+++ b/unix/uxpterm.c
@@ -10,20 +10,21 @@
 const char *const appname = "pterm";
 const int use_event_log = 0;	       /* pterm doesn't need it */
 const int new_session = 0, saved_sessions = 0;   /* or these */
+const int use_pty_argv = TRUE;
 
-Backend *select_backend(Config *cfg)
+Backend *select_backend(Conf *conf)
 {
     return &pty_backend;
 }
 
-int cfgbox(Config *cfg)
+int cfgbox(Conf *conf)
 {
     /*
      * This is a no-op in pterm, except that we'll ensure the
      * protocol is set to -1 to inhibit the useless Connection
      * panel in the config box.
      */
-    cfg->protocol = -1;
+    conf_set_int(conf, CONF_protocol, -1);
     return 1;
 }
 
@@ -32,7 +33,7 @@ void cleanup_exit(int code)
     exit(code);
 }
 
-int process_nonoption_arg(char *arg, Config *cfg)
+int process_nonoption_arg(char *arg, Conf *conf, int *allow_launch)
 {
     return 0;                          /* pterm doesn't have any. */
 }
@@ -46,11 +47,14 @@ int main(int argc, char **argv)
 {
     extern int pt_main(int argc, char **argv);
     extern void pty_pre_init(void);    /* declared in pty.c */
+    int ret;
 
     cmdline_tooltype = TOOLTYPE_NONNETWORK;
     default_protocol = -1;
 
     pty_pre_init();
 
-    return pt_main(argc, argv);
+    ret = pt_main(argc, argv);
+    cleanup_exit(ret);
+    return ret;             /* not reached, but placates optimisers */
 }