From 1c853c68602cf713fe3de98ae2ea5a48a1120abc Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Mon, 2 Nov 2009 16:24:29 +0000
Subject: [PATCH] When matching the session names with -t, look for exact
 matches first before trying partial matches.

Avoids problems where two ambiguous matches are present before an exact match
(eg foo1, foo2, foo would give an error on trying -tfoo), reported by Natacha
Port? natbsd at instinctive dot eu.
---
 cmd.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/cmd.c b/cmd.c
index 96a06b6c..7ce88f47 100644
--- a/cmd.c
+++ b/cmd.c
@@ -488,19 +488,25 @@ cmd_lookup_session(const char *name, int *ambiguous)
 	*ambiguous = 0;
 
 	/*
-	 * Look for matches. Session names must be unique so an exact match
-	 * can't be ambigious and can just be returned.
+	 * Look for matches. First look for exact matches - session names must
+	 * be unique so an exact match can't be ambigious and can just be
+	 * returned.
+	 */
+	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {	
+		if ((s = ARRAY_ITEM(&sessions, i)) == NULL)
+			continue;
+		if (strcmp(name, s->name) == 0)
+			return (s);
+	}
+
+	/*
+	 * Otherwise look for partial matches, returning early if it is found to
+	 * be ambiguous.
 	 */
 	sfound = NULL;
 	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {	
 		if ((s = ARRAY_ITEM(&sessions, i)) == NULL)
 			continue;
-
-		/* Check for an exact match and return it if found. */
-		if (strcmp(name, s->name) == 0)
-			return (s);
-		
-		/* Then check for pattern matches. */
 		if (strncmp(name, s->name, strlen(name)) == 0 ||
 		    fnmatch(name, s->name, 0) == 0) {
 			if (sfound != NULL) {
@@ -510,7 +516,6 @@ cmd_lookup_session(const char *name, int *ambiguous)
 			sfound = s;
 		}
 	}
-		
  	return (sfound);
 }