summaryrefslogtreecommitdiffstats
path: root/cmd-server-info.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-10-15 01:48:24 +0000
committerTiago Cunha <tcunha@gmx.com>2009-10-15 01:48:24 +0000
commit6257be6371e3848a64891b7b88c77e364ea1d9cc (patch)
treecd540722f7882d7121c5e2b4f158c6e43f0984fa /cmd-server-info.c
parent9800dc469718720861a143228e04c1dad60cf6c7 (diff)
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.
Diffstat (limited to 'cmd-server-info.c')
-rw-r--r--cmd-server-info.c7
1 files changed, 3 insertions, 4 deletions
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);