circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Work out config file when needed not at startup.

Browse Source
This commit is contained in:
nicm
2015-09-01 10:10:59 +00:00
parent 83157c02d6
commit 952ba84611
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tmux.c
View File

@@ -41,7 +41,6 @@ struct options global_s_options; /* session options */
struct options global_w_options; /* window options */
struct environ global_environ;
char *cfg_file;
char *shell_cmd;
int debug_level;
time_t start_time;
@@ -171,8 +170,11 @@ setblocking(int fd, int state)
const char *
find_home(void)
{
struct passwd *pw;
const char *home;
struct passwd *pw;
static const char *home;
if (home != NULL)
return (home);
home = getenv("HOME");
if (home == NULL || *home == '\0') {
@@ -189,9 +191,8 @@ find_home(void)
int
main(int argc, char **argv)
{
char *s, *path, *label, **var, tmp[PATH_MAX];
const char *home;
int opt, flags, keys;
char *s, *path, *label, **var, tmp[PATH_MAX];
int opt, flags, keys;
#ifdef DEBUG
malloc_options = (char *) "AFGJPX";
@@ -221,8 +222,7 @@ main(int argc, char **argv)
flags |= CLIENT_CONTROL;
break;
case 'f':
free(cfg_file);
cfg_file = xstrdup(optarg);
set_cfg_file(optarg);
break;
case 'l':
flags |= CLIENT_LOGIN;
@@ -306,18 +306,6 @@ main(int argc, char **argv)
options_set_number(&global_w_options, "mode-keys", keys);
}
/* Locate the configuration file. */
if (cfg_file == NULL) {
home = find_home();
if (home != NULL) {
xasprintf(&cfg_file, "%s/.tmux.conf", home);
if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
free(cfg_file);
cfg_file = NULL;
}
}
}
/*
* Figure out the socket path. If specified on the command-line with -S
* or -L, use it, otherwise try $TMUX or assume -L default.