Build list of paths and weed out duplicates before loading configs, and

add TMUX_SOCK like TMUX_PATH for the socket directory.
This commit is contained in:
nicm
2020-05-16 14:26:33 +00:00
parent 4e0a718666
commit a29196ca6a
4 changed files with 105 additions and 67 deletions

7
tmux.h
View File

@ -63,10 +63,13 @@ struct winlink;
/* Client-server protocol version. */
#define PROTOCOL_VERSION 8
/* Default configuration files. */
/* Default configuration files and socket paths. */
#ifndef TMUX_CONF
#define TMUX_CONF "/etc/tmux.conf:~/.tmux.conf"
#endif
#ifndef TMUX_SOCK
#define TMUX_SOCK "$TMUX_TMPDIR:" _PATH_TMP
#endif
/* Minimum layout cell size, NOT including border lines. */
#define PANE_MINIMUM 1
@ -1746,6 +1749,8 @@ const char *sig2name(int);
const char *find_cwd(void);
const char *find_home(void);
const char *getversion(void);
void expand_paths(const char *, char ***, u_int *);
/* proc.c */
struct imsg;