===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/client.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- src/usr.bin/tmux/client.c	2009/10/26 21:38:18	1.27
+++ src/usr.bin/tmux/client.c	2009/11/02 13:41:25	1.28
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.27 2009/10/26 21:38:18 nicm Exp $ */
+/* $OpenBSD: client.c,v 1.28 2009/11/02 13:41:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -55,19 +55,6 @@
 		strlcpy(rpathbuf, path, sizeof rpathbuf);
 	setproctitle("client (%s)", rpathbuf);
 
-	if (lstat(path, &sb) != 0) {
-		if (cmdflags & CMD_STARTSERVER && errno == ENOENT) {
-			if ((fd = server_start(path)) == -1)
-				goto start_failed;
-			goto server_started;
-		}
-		goto not_found;
-	}
-	if (!S_ISSOCK(sb.st_mode)) {
-		errno = ENOTSOCK;
-		goto not_found;
-	}
-
 	memset(&sa, 0, sizeof sa);
 	sa.sun_family = AF_UNIX;
 	size = strlcpy(sa.sun_path, path, sizeof sa.sun_path);
@@ -80,9 +67,14 @@
 		fatal("socket failed");
 
 	if (connect(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) {
-		if (errno == ECONNREFUSED) {
-			if (unlink(path) != 0 || !(cmdflags & CMD_STARTSERVER))
+		if (!(cmdflags & CMD_STARTSERVER))
+			goto not_found;
+		switch (errno) {
+		case ECONNREFUSED:
+			if (unlink(path) != 0)
 				goto not_found;
+			/* FALLTHROUGH */
+		case ENOENT:
 			if ((fd = server_start(path)) == -1)
 				goto start_failed;
 			goto server_started;