extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-13 15:37:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use ~/.tmate.conf to load tmate specific settings

Browse Source 
Closes #10
This commit is contained in:
Nicolas Viennot
2013-10-04 17:50:55 -04:00
parent 0d182e707e
commit ed4020b589
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tmux.c
View File

@ -40,7 +40,7 @@ struct environ global_environ;
struct event_base *ev_base;
char *cfg_file;
char *cfg_file, *tmate_cfg_file;
char *shell_cmd;
int debug_level;
time_t start_time;
@ -367,13 +367,14 @@ main(int argc, char **argv)
}
/* Locate the configuration file. */
home = getenv("HOME");
if (home == NULL || *home == '\0') {
pw = getpwuid(getuid());
if (pw != NULL)
home = pw->pw_dir;
}
if (cfg_file == NULL) {
home = getenv("HOME");
if (home == NULL || *home == '\0') {
pw = getpwuid(getuid());
if (pw != NULL)
home = pw->pw_dir;
}
xasprintf(&cfg_file, "%s/%s", home, DEFAULT_CFG);
if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
free(cfg_file);
@ -381,6 +382,12 @@ main(int argc, char **argv)
}
}
xasprintf(&tmate_cfg_file, "%s/%s", home, DEFAULT_TMATE_CFG);
if (access(tmate_cfg_file, R_OK) != 0 && errno == ENOENT) {
free(tmate_cfg_file);
tmate_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.