-/* $Id: mac.c,v 1.24 2003/01/11 19:43:59 ben Exp $ */
+/* $Id: mac.c,v 1.29 2003/01/14 19:42:00 ben Exp $ */
/*
* Copyright (c) 1999 Ben Harris
* All rights reserved.
mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
DisposeHandle((Handle)ti);
}
- /* MacTCP? */
- if (Gestalt(FOUR_CHAR_CODE('mtcp'), &mac_gestalts.mtcpvers) != noErr)
- mac_gestalts.mtcpvers = 0;
- if (mac_gestalts.mtcpvers > 0) {
- if (mactcp_init() != noErr)
+ /* OpenTransport? */
+ if (Gestalt(gestaltOpenTpt, &mac_gestalts.otptattr) != noErr ||
+ (mac_gestalts.otptattr & gestaltOpenTptTCPPresentMask) == 0 ||
+ ot_init() != noErr)
+ mac_gestalts.otptattr = 0;
+ if (mac_gestalts.otptattr == 0) {
+ /* MacTCP? */
+ if (Gestalt(FOUR_CHAR_CODE('mtcp'), &mac_gestalts.mtcpvers) != noErr)
mac_gestalts.mtcpvers = 0;
- }
+ if (mac_gestalts.mtcpvers > 0) {
+ if (mactcp_init() != noErr)
+ mac_gestalts.mtcpvers = 0;
+ }
+ } else
+ mac_gestalts.mtcpvers = 0;
/* We've been tested with the Appearance Manager */
if (mac_gestalts.apprvers != 0)
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;
LMSetCurDirStore(dirid);
}
}
- init_ucs();
}
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);
if (mac_gestalts.encvvers != 0)
TerminateUnicodeConverter();
#endif
- if (mac_gestalts.mtcpvers != 0)
- mactcp_shutdown();
+ sk_cleanup();
exit(status);
}
va_end(ap);
ParamText(stuff, NULL, NULL, NULL);
StopAlert(128, NULL);
- exit(1);
+ cleanup_exit(1);
}
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. */
va_end(ap);
ParamText(stuff, NULL, NULL, NULL);
StopAlert(128, NULL);
- exit(1);
+ cleanup_exit(1);
}
/* Null SSH agent client -- never finds an agent. */
}
-char *platform_default_s(char *name)
+char *platform_default_s(char const *name)
{
long smfs;
Str255 pname;
return NULL;
}
-int platform_default_i(char *name, int def)
+int platform_default_i(char const *name, int def)
{
long smfs;