MacTCP returns canonical names with a trailing dot. We don't want this, so

[sgt/putty] / mac / mac.c

diff --git a/mac/mac.c b/mac/mac.c
index 76ba435..6335aab 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.29 2003/01/14 19:42:00 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;
@@ -223,7 +215,6 @@ static void mac_startup(void) {
            LMSetCurDirStore(dirid);
        }
     }
-    init_ucs();
 }
 
 static void mac_eventloop(void) {
@@ -240,6 +231,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 +638,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 +651,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 +665,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. */
@@ -708,7 +701,7 @@ void old_keyfile_warning(void)
 
 }
 
-char *platform_default_s(char *name)
+char *platform_default_s(char const *name)
 {
     long smfs;
     Str255 pname;
@@ -730,7 +723,7 @@ char *platform_default_s(char *name)
     return NULL;
 }
 
-int platform_default_i(char *name, int def)
+int platform_default_i(char const *name, int def)
 {
     long smfs;