projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Workarounds for compiling with -D_FORTIFY_SOURCE=2 (as Ubuntu does), which
[u/mdw/putty]
/
mac
/
macdlg.c
diff --git
a/mac/macdlg.c
b/mac/macdlg.c
index
cef7dea
..
0b28cf9
100644
(file)
--- a/
mac/macdlg.c
+++ b/
mac/macdlg.c
@@
-66,7
+66,6
@@
static void mac_config(int midsession)
{
Session *s;
WinInfo *wi;
{
Session *s;
WinInfo *wi;
- static struct sesslist sesslist;
Str255 mactitle;
char *str;
Str255 mactitle;
char *str;
@@
-77,6
+76,7
@@
static void mac_config(int midsession)
memset(s, 0, sizeof(*s));
do_defaults(NULL, &s->cfg);
s->hasfile = FALSE;
memset(s, 0, sizeof(*s));
do_defaults(NULL, &s->cfg);
s->hasfile = FALSE;
+ s->session_closed = FALSE;
}
/* Copy the configuration somewhere else in case this is a *
}
/* Copy the configuration somewhere else in case this is a *
@@
-89,9
+89,8
@@
static void mac_config(int midsession)
else
s->settings_window = GetNewWindow(wSettings, NULL, (WindowPtr)-1);
else
s->settings_window = GetNewWindow(wSettings, NULL, (WindowPtr)-1);
- get_sesslist(&sesslist, TRUE);
s->ctrlbox = ctrl_new_box();
s->ctrlbox = ctrl_new_box();
- setup_config_box(s->ctrlbox,
&sesslist,
midsession, 0, 0);
+ setup_config_box(s->ctrlbox, midsession, 0, 0);
s->settings_ctrls.data = &s->temp_cfg;
if (midsession)
s->settings_ctrls.data = &s->temp_cfg;
if (midsession)
@@
-238,7
+237,7
@@
static OSErr mac_opensessionfrom(FSSpec *fss)
err = -9999;
goto fail;
}
err = -9999;
goto fail;
}
- load_open_settings(sesshandle,
TRUE,
&s->cfg);
+ load_open_settings(sesshandle, &s->cfg);
close_settings_r(sesshandle);
mac_startsession(s);
close_settings_r(sesshandle);
mac_startsession(s);
@@
-322,7
+321,7
@@
void mac_savesession(void)
assert(s->hasfile);
sesshandle = open_settings_w_fsp(&s->savefile);
if (sesshandle == NULL) return; /* XXX report error */
assert(s->hasfile);
sesshandle = open_settings_w_fsp(&s->savefile);
if (sesshandle == NULL) return; /* XXX report error */
- save_open_settings(sesshandle,
TRUE,
&s->cfg);
+ save_open_settings(sesshandle, &s->cfg);
close_settings_w(sesshandle);
}
close_settings_w(sesshandle);
}
@@
-343,7
+342,7
@@
void mac_savesessionas(void)
}
sesshandle = open_settings_w_fsp(&sfr.sfFile);
if (sesshandle == NULL) return; /* XXX report error */
}
sesshandle = open_settings_w_fsp(&sfr.sfFile);
if (sesshandle == NULL) return; /* XXX report error */
- save_open_settings(sesshandle,
TRUE,
&s->cfg);
+ save_open_settings(sesshandle, &s->cfg);
close_settings_w(sesshandle);
s->hasfile = TRUE;
s->savefile = sfr.sfFile;
close_settings_w(sesshandle);
s->hasfile = TRUE;
s->savefile = sfr.sfFile;