Sync OpenBSD patchset 774:

Fall back on normal session choice method if $TMUX exists but is invalid
rather than rejecting.

1 files changed, 5 insertions, 9 deletions

diff --git a/cmd.c b/cmd.c
index 8cacabd3..8b602c13 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.142 2010-07-17 14:38:13 tcunha Exp $ */
+/* $Id: cmd.c,v 1.143 2010-10-24 00:32:35 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -339,15 +339,11 @@ cmd_current_session(struct cmd_ctx *ctx)
 	}
 
 	/* Use the session from the TMUX environment variable. */
-	if (data != NULL && data->pid != -1) {
-		if (data->pid != getpid())
-			return (NULL);
-		if (data->idx > ARRAY_LENGTH(&sessions))
-			return (NULL);
-		if ((s = ARRAY_ITEM(&sessions, data->idx)) == NULL)
-			return (NULL);
+	if (data != NULL &&
+	    data->pid == getpid() &&
+	    data->idx <= ARRAY_LENGTH(&sessions) &&
+	    (s = ARRAY_ITEM(&sessions, data->idx)) != NULL)
 		return (s);
-	}
 
 	return (cmd_choose_session(&sessions));
 }