Consequences of Simon's recent deglobalisation changes.

[u/mdw/putty] / mac / mac.c

diff --git a/mac/mac.c b/mac/mac.c
index 76ba435..0e55933 100644 (file)
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.25 2003/01/11 23:33:57 ben Exp $ */
+/* $Id: mac.c,v 1.27 2003/01/12 16:11:27 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -204,14 +204,6 @@ static void mac_startup(void) {
     default_port = DEFAULT_PORT;
     flags = FLAG_INTERACTIVE;
 
-    /*
-     * Really grotty hack to ensure that anything that looks at the
-     * global "cfg" variable gets something vaguely sensible.
-     * Obviously, nothing should actually be using it, but that will
-     * take a while to arrange.
-     */
-    do_defaults(NULL, &cfg);
-
     {
        short vol;
        long dirid;
@@ -240,6 +232,8 @@ static void mac_eventloop(void) {
            mac_event(&event);
        if (mac_gestalts.mtcpvers != 0)
            mactcp_poll();
+       if (mac_gestalts.otptattr != 0)
+           ot_poll();
        mac_pollterm();
     }
     DisposeRgn(cursrgn);
@@ -645,7 +639,7 @@ void fatalbox(char *fmt, ...) {
     va_end(ap);
     ParamText(stuff, NULL, NULL, NULL);
     StopAlert(128, NULL);
-    exit(1);
+    cleanup_exit(1);
 }
 
 void modalfatalbox(char *fmt, ...) {
@@ -658,7 +652,7 @@ void modalfatalbox(char *fmt, ...) {
     va_end(ap);
     ParamText(stuff, NULL, NULL, NULL);
     StopAlert(128, NULL);
-    exit(1);
+    cleanup_exit(1);
 }
 
 /* This should only kill the current session, not the whole application. */
@@ -672,7 +666,7 @@ void connection_fatal(void *fontend, char *fmt, ...) {
     va_end(ap);
     ParamText(stuff, NULL, NULL, NULL);
     StopAlert(128, NULL);
-    exit(1);
+    cleanup_exit(1);
 }
 
 /* Null SSH agent client -- never finds an agent. */