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

add TMUX_SOCK like TMUX_PATH for the socket directory.

1 files changed, 6 insertions, 1 deletions

diff --git a/tmux.h b/tmux.h
index 97024310..cf8bbbf5 100644
--- a/tmux.h
+++ b/tmux.h
@@ -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;