circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-12 17:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 633:

Browse Source 
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:
Tiago Cunha 2010-02-05 01:32:10 +00:00
parent 82ba7e69ec
commit d398bbc53b
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.198 2010-02-05 01:31:06 tcunha Exp $ */
/* $Id: tmux.c,v 1.199 2010-02-05 01:32:10 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -446,13 +446,30 @@ main(int argc, char **argv)
}
}
if (label == NULL)
label = xstrdup("default");
if (path == NULL && (path = makesockpath(label)) == NULL) {
log_warn("can't create socket");
exit(1);
/*
* 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");
}
/* -L or default set. */
if (label != NULL) {
if ((path = makesockpath(label)) == NULL) {
log_warn("can't create socket");
exit(1);
}
}
}
xfree(label);
if (label != NULL)
xfree(label);
if (shellcmd != NULL) {
msg = MSG_SHELL;