From 6257be6371e3848a64891b7b88c77e364ea1d9cc Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Thu, 15 Oct 2009 01:48:24 +0000
Subject: [PATCH] Sync OpenBSD patchset 406:

Do this in a better way - print messages when exiting with nonzero.

Also remove the login shell information from server-info, only the client
should care about it.
---
 client.c          | 49 ++++++++++++++++++++++++-----------------------
 cmd-server-info.c |  7 +++----
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/client.c b/client.c
index 3f774c90..428ce50e 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.76 2009-10-15 01:45:13 tcunha Exp $ */
+/* $OpenBSD: client.c,v 1.24 2009/10/13 13:15:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -220,32 +220,33 @@ out:
 	 * Print exit status message, unless running as a login shell where it
 	 * would either be pointless or irritating.
 	 */
-	if (!login_shell) {
-		if (sigterm) {
-			printf("[terminated]\n");
-			return (1);
-		}
-		switch (cctx->exittype) {
-		case CCTX_DIED:
-			printf("[lost server]\n");
-			return (0);
-		case CCTX_SHUTDOWN:
+	if (sigterm) {
+		printf("[terminated]\n");
+		return (1);
+	}
+	switch (cctx->exittype) {
+	case CCTX_DIED:
+		printf("[lost server]\n");
+		return (0);
+	case CCTX_SHUTDOWN:
+ 		if (!login_shell)
 			printf("[server exited]\n");
-			return (0);
-		case CCTX_EXIT:
-			if (cctx->errstr != NULL) {
-				printf("[error: %s]\n", cctx->errstr);
-				return (1);
-			}
-			printf("[exited]\n");
-			return (0);
-		case CCTX_DETACH:
-			printf("[detached]\n");
-			return (0);
-		default:
-			printf("[unknown error]\n");
+		return (0);
+	case CCTX_EXIT:
+		if (cctx->errstr != NULL) {
+			printf("[error: %s]\n", cctx->errstr);
 			return (1);
 		}
+ 		if (!login_shell)
+			printf("[exited]\n");
+		return (0);
+	case CCTX_DETACH:
+		if (!login_shell)
+			printf("[detached]\n");
+		return (0);
+	default:
+		printf("[unknown error]\n");
+		return (1);
 	}
 }
 
diff --git a/cmd-server-info.c b/cmd-server-info.c
index aef02777..437de2d2 100644
--- a/cmd-server-info.c
+++ b/cmd-server-info.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-server-info.c,v 1.28 2009-09-07 23:59:19 tcunha Exp $ */
+/* $OpenBSD: cmd-server-info.c,v 1.11 2009/10/13 13:15:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -68,9 +68,8 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 	*strchr(tim, '\n') = '\0';
 	ctx->print(ctx,
 	    "tmux " BUILD ", pid %ld, started %s", (long) getpid(), tim);
-	ctx->print(ctx, "socket path %s, debug level %d%s%s",
-	    socket_path, debug_level, be_quiet ? ", quiet" : "",
-	    login_shell ? ", login shell" : "");
+	ctx->print(ctx, "socket path %s, debug level %d%s",
+	    socket_path, debug_level, be_quiet ? ", quiet" : "");
         if (uname(&un) == 0) {
                 ctx->print(ctx, "system is %s %s %s %s",
 		    un.sysname, un.release, un.version, un.machine);