Mirrors/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2026-01-23 02:24:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse source 
Conflicts:
	client.c
This commit is contained in:
Thomas Adam 2014-08-09 20:31:36 +01:00
commit a131b82e95
17 changed files with 249 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cmd.c
View file

@ -794,8 +794,11 @@ cmd_find_session(struct cmd_q *cmdq, const char *arg, int prefer_unattached)
int ambiguous;
/* A NULL argument means the current session. */
if (arg == NULL)
return (cmd_current_session(cmdq, prefer_unattached));
if (arg == NULL) {
if ((s = cmd_current_session(cmdq, prefer_unattached)) == NULL)
cmdq_error(cmdq, "can't establish current session");
return (s);
}
/* Lookup as pane id or window id. */
if ((wp = cmd_lookup_paneid(arg)) != NULL)
@ -812,7 +815,9 @@ cmd_find_session(struct cmd_q *cmdq, const char *arg, int prefer_unattached)
/* An empty session name is the current session. */
if (*tmparg == '\0') {
free(tmparg);
return (cmd_current_session(cmdq, prefer_unattached));
if ((s = cmd_current_session(cmdq, prefer_unattached)) == NULL)
cmdq_error(cmdq, "can't establish current session");
return (s);
}
/* Find the session, if any. */