launchable session without getting confused by it, we can relax the
restriction on storing a host name in DS, which has attracted a
steady stream of complaints over the past six or seven years.
git-svn-id: svn://svn.tartarus.org/sgt/putty@7266
cda61777-01e9-0310-a592-
d414129be87e
return 0;
}
isdef = !strcmp(ssd->sesslist.sessions[i], "Default Settings");
return 0;
}
isdef = !strcmp(ssd->sesslist.sessions[i], "Default Settings");
- load_settings(ssd->sesslist.sessions[i], !isdef, cfg);
+ load_settings(ssd->sesslist.sessions[i], cfg);
if (!isdef) {
strncpy(savedsession, ssd->sesslist.sessions[i],
SAVEDSESSION_LEN);
if (!isdef) {
strncpy(savedsession, ssd->sesslist.sessions[i],
SAVEDSESSION_LEN);
- char *errmsg = save_settings(savedsession, !isdef, cfg);
+ char *errmsg = save_settings(savedsession, cfg);
if (errmsg) {
dlg_error_msg(dlg, errmsg);
sfree(errmsg);
if (errmsg) {
dlg_error_msg(dlg, errmsg);
sfree(errmsg);
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);
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);
}
}
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;
/*
* Exports from settings.c.
*/
/*
* Exports from settings.c.
*/
-char *save_settings(char *section, int do_host, Config * cfg);
-void save_open_settings(void *sesskey, int do_host, Config *cfg);
-void load_settings(char *section, int do_host, Config * cfg);
-void load_open_settings(void *sesskey, int do_host, Config *cfg);
+char *save_settings(char *section, Config * cfg);
+void save_open_settings(void *sesskey, Config *cfg);
+void load_settings(char *section, Config * cfg);
+void load_open_settings(void *sesskey, Config *cfg);
void get_sesslist(struct sesslist *, int allocate);
void do_defaults(char *, Config *);
void registry_cleanup(void);
void get_sesslist(struct sesslist *, int allocate);
void do_defaults(char *, Config *);
void registry_cleanup(void);
write_setting_s(sesskey, name, buf);
}
write_setting_s(sesskey, name, buf);
}
-char *save_settings(char *section, int do_host, Config * cfg)
+char *save_settings(char *section, Config * cfg)
{
void *sesskey;
char *errmsg;
{
void *sesskey;
char *errmsg;
sesskey = open_settings_w(section, &errmsg);
if (!sesskey)
return errmsg;
sesskey = open_settings_w(section, &errmsg);
if (!sesskey)
return errmsg;
- save_open_settings(sesskey, do_host, cfg);
+ save_open_settings(sesskey, cfg);
close_settings_w(sesskey);
return NULL;
}
close_settings_w(sesskey);
return NULL;
}
-void save_open_settings(void *sesskey, int do_host, Config *cfg)
+void save_open_settings(void *sesskey, Config *cfg)
{
int i;
char *p;
write_setting_i(sesskey, "Present", 1);
{
int i;
char *p;
write_setting_i(sesskey, "Present", 1);
- if (do_host) {
- write_setting_s(sesskey, "HostName", cfg->host);
- }
+ write_setting_s(sesskey, "HostName", cfg->host);
write_setting_filename(sesskey, "LogFileName", cfg->logfilename);
write_setting_i(sesskey, "LogType", cfg->logtype);
write_setting_i(sesskey, "LogFileClash", cfg->logxfovr);
write_setting_filename(sesskey, "LogFileName", cfg->logfilename);
write_setting_i(sesskey, "LogType", cfg->logtype);
write_setting_i(sesskey, "LogFileClash", cfg->logxfovr);
write_setting_i(sesskey, "SerialFlowControl", cfg->serflow);
}
write_setting_i(sesskey, "SerialFlowControl", cfg->serflow);
}
-void load_settings(char *section, int do_host, Config * cfg)
+void load_settings(char *section, Config * cfg)
{
void *sesskey;
sesskey = open_settings_r(section);
{
void *sesskey;
sesskey = open_settings_r(section);
- load_open_settings(sesskey, do_host, cfg);
+ load_open_settings(sesskey, cfg);
close_settings_r(sesskey);
}
close_settings_r(sesskey);
}
-void load_open_settings(void *sesskey, int do_host, Config *cfg)
+void load_open_settings(void *sesskey, Config *cfg)
cfg->remote_cmd_ptr2 = NULL;
cfg->ssh_nc_host[0] = '\0';
cfg->remote_cmd_ptr2 = NULL;
cfg->ssh_nc_host[0] = '\0';
- if (do_host) {
- gpps(sesskey, "HostName", "", cfg->host, sizeof(cfg->host));
- } else {
- cfg->host[0] = '\0'; /* blank hostname */
- }
+ gpps(sesskey, "HostName", "", cfg->host, sizeof(cfg->host));
gppfile(sesskey, "LogFileName", &cfg->logfilename);
gppi(sesskey, "LogType", 0, &cfg->logtype);
gppi(sesskey, "LogFileClash", LGXF_ASK, &cfg->logxfovr);
gppfile(sesskey, "LogFileName", &cfg->logfilename);
gppi(sesskey, "LogType", 0, &cfg->logtype);
gppi(sesskey, "LogFileClash", LGXF_ASK, &cfg->logxfovr);
void do_defaults(char *session, Config * cfg)
{
void do_defaults(char *session, Config * cfg)
{
- load_settings(session, (session != NULL && *session), cfg);
+ load_settings(session, cfg);
}
static int sessioncmp(const void *av, const void *bv)
}
static int sessioncmp(const void *av, const void *bv)