X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxputty.c;h=6d22fceb76b2b32b8d77489d062222d455efdc7c;hb=51732faeb913527f3373e3c77bf66ca414e5bab6;hp=d0ba55f68177a7bc68da8084d21e96a8104f692a;hpb=8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d;p=PuTTY.git diff --git a/unix/uxputty.c b/unix/uxputty.c index d0ba55f6..6d22fceb 100644 --- a/unix/uxputty.c +++ b/unix/uxputty.c @@ -20,6 +20,7 @@ */ const int use_pty_argv = FALSE; char **pty_argv; /* never used */ +char *pty_osx_envrestore_prefix; /* * Clean up and exit. @@ -52,6 +53,7 @@ int cfgbox(Conf *conf) static int got_host = 0; const int use_event_log = 1, new_session = 1, saved_sessions = 1; +const int dup_check_launchable = 1; int process_nonoption_arg(const char *arg, Conf *conf, int *allow_launch) { @@ -132,11 +134,8 @@ char *platform_get_x_display(void) { const int share_can_be_downstream = TRUE; const int share_can_be_upstream = TRUE; -int main(int argc, char **argv) +void setup(int single) { - extern int pt_main(int argc, char **argv); - int ret; - sk_init(); flags = FLAG_VERBOSE | FLAG_INTERACTIVE; default_protocol = be_default_protocol; @@ -147,7 +146,4 @@ int main(int argc, char **argv) if (b) default_port = b->default_port; } - ret = pt_main(argc, argv); - cleanup_exit(ret); - return ret; /* not reached, but placates optimisers */ }