circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-14 20:58:53 +00:00
Code Issues Projects Releases Wiki Activity

Do not attempt to read .tmux.conf if we can't figure out a home

Browse Source 
directory, from Tiago Cunha.
This commit is contained in:
nicm 2014-01-15 11:46:28 +00:00
parent 3368b602a8
commit 938768ed3d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tmux.c
View File

@ -202,8 +202,9 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
struct passwd *pw; struct passwd *pw;
char *s, *path, *label, *home, **var, tmp[MAXPATHLEN]; char *s, *path, *label, **var, tmp[MAXPATHLEN];
char in[256]; char in[256];
const char *home;
long long pid; long long pid;
int opt, flags, quiet, keys, session; int opt, flags, quiet, keys, session;
@ -325,11 +326,15 @@ main(int argc, char **argv)
pw = getpwuid(getuid()); pw = getpwuid(getuid());
if (pw != NULL) if (pw != NULL)
home = pw->pw_dir; home = pw->pw_dir;
else
home = NULL;
} }
xasprintf(&cfg_file, "%s/.tmux.conf", home); if (home != NULL) {
if (access(cfg_file, R_OK) != 0 && errno == ENOENT) { xasprintf(&cfg_file, "%s/.tmux.conf", home);
free(cfg_file); if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
cfg_file = NULL; free(cfg_file);
cfg_file = NULL;
}
} }
} }