diff options
| author |   nicm <nicm@openbsd.org> | 2020-05-16 14:26:33 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-05-16 14:26:33 +0000 |
| commit | 0a580537d56804fd0e1f98386b12eb32e697d95c (patch) | |
| tree | 04bdc3c81b2a3d25a35243dcaa57a3338066b08c /usr.bin/tmux/tmux.h | |
| parent | Add extension terminfo(5) capabilities for margins. (diff) | |
| download | wireguard-openbsd-0a580537d56804fd0e1f98386b12eb32e697d95c.tar.xz wireguard-openbsd-0a580537d56804fd0e1f98386b12eb32e697d95c.zip | |
Build list of paths and weed out duplicates before loading configs, and
add TMUX_SOCK like TMUX_PATH for the socket directory.
Diffstat (limited to 'usr.bin/tmux/tmux.h')
| -rw-r--r-- | usr.bin/tmux/tmux.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 7ebd976cb47..5968ede237d 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.1017 2020/05/16 14:22:51 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.1018 2020/05/16 14:26:33 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -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; |