Add some missing calls to cleanup_exit.

[originally from svn r9936]

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index e16407633d70589e31f772bfed23feae22a29899..ee91a93ebf3333ecfb8cef1ca3195bfbc107c21a 100644 (file)
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -1361,7 +1361,7 @@ void frontend_keypress(void *handle)
      * any keypress.
      */
     if (inst->exited)
-       exit(0);
+       cleanup_exit(0);
 }
 
 static gint idle_exit_func(gpointer data)

diff --git a/unix/uxpterm.c b/unix/uxpterm.c
index c18505bb2d0041eed4f300f55d98ba1167def890..6542fbbaf4180df75f4b50f89d1f930e63feb38f 100644 (file)
--- a/unix/uxpterm.c
+++ b/unix/uxpterm.c
@@ -57,11 +57,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 */
 }

diff --git a/unix/uxputty.c b/unix/uxputty.c
index fc718a0c8cfbc0ad3a38bfa73c02ae24c0206550..fbaf029d3b769478903356b18283d205f588a14d 100644 (file)
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -125,6 +125,8 @@ char *platform_get_x_display(void) {
 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 +137,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 */
 }