mirror of
https://github.com/tmux/tmux.git
synced 2025-04-22 12:28:48 +00:00
Read the path from $TMUX if it is present and -L and -S are not given. Based on
a diff from Micah Cowan.
This commit is contained in:
parent
604b02cfaa
commit
e7c6f81016
21
tmux.c
21
tmux.c
@ -443,12 +443,29 @@ main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
if (label == 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.
|
||||
*/
|
||||
if (path == NULL) {
|
||||
/* No -L. Try $TMUX, or default. */
|
||||
if (label == NULL) {
|
||||
if ((path = getenv("TMUX")) != NULL) {
|
||||
path = xstrdup(path);
|
||||
path[strcspn(path, ",")] = '\0';
|
||||
} else
|
||||
label = xstrdup("default");
|
||||
if (path == NULL && (path = makesockpath(label)) == NULL) {
|
||||
}
|
||||
|
||||
/* -L or default set. */
|
||||
if (label != NULL) {
|
||||
if ((path = makesockpath(label)) == NULL) {
|
||||
log_warn("can't create socket");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (label != NULL)
|
||||
xfree(label);
|
||||
|
||||
if (shellcmd != NULL) {
|
||||
|
Loading…
Reference in New Issue
Block a user