mirror of
https://github.com/tmate-io/tmate.git
synced 2025-03-15 00:29:20 +01:00
parent
6e84bab68c
commit
c63c8fbf90
16
cfg.c
16
cfg.c
@ -71,7 +71,7 @@ start_cfg(void)
|
||||
cfg_add_cause("%s: %s", TMUX_CONF, strerror(errno));
|
||||
|
||||
if (cfg_file == NULL && (home = find_home()) != NULL) {
|
||||
xasprintf(&cfg_file, "%s/.tmux.conf", home);
|
||||
xasprintf(&cfg_file, "%s/.tmate.conf", home);
|
||||
if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
|
||||
free(cfg_file);
|
||||
cfg_file = NULL;
|
||||
@ -81,20 +81,6 @@ start_cfg(void)
|
||||
cfg_add_cause("%s: %s", cfg_file, cause);
|
||||
free(cause);
|
||||
|
||||
#ifdef TMATE
|
||||
cause = NULL;
|
||||
if ((home = find_home()) != NULL) {
|
||||
xasprintf(&tmate_cfg_file, "%s/.tmate.conf", home);
|
||||
if (access(tmate_cfg_file, R_OK) != 0 && errno == ENOENT) {
|
||||
free(tmate_cfg_file);
|
||||
tmate_cfg_file = NULL;
|
||||
}
|
||||
}
|
||||
if (tmate_cfg_file != NULL && load_cfg(tmate_cfg_file, cfg_cmd_q, &cause) == -1)
|
||||
cfg_add_cause("%s: %s", cfg_file, cause);
|
||||
free(cause);
|
||||
#endif
|
||||
|
||||
cmdq_continue(cfg_cmd_q);
|
||||
}
|
||||
|
||||
|
@ -249,7 +249,7 @@ session_destroy(struct session *s)
|
||||
next_session_id = 0;
|
||||
run_initial_client_cmd();
|
||||
} else {
|
||||
tmate_info("Session terminated");
|
||||
tmate_info("Session closed");
|
||||
tmate_write_fin();
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user