diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-09-03 21:02:55 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-09-03 21:02:55 +0000 |
| commit | 884ebb6dabe265ff67cfc75201263b3f3ef8ec99 (patch) | |
| tree | 110d06c69defce0329502f51b8ed163103843635 /cmd-server-info.c | |
| parent | c274551db67a3002f12afa127c32509ae194e3e5 (diff) | |
Sync OpenBSD patchset 309:
Accept -l to make it easier for people who use tmux as a login shell to use
$SHELL. Originally from martynas@, tweaked by me.
Diffstat (limited to 'cmd-server-info.c')
| -rw-r--r-- | cmd-server-info.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd-server-info.c b/cmd-server-info.c index 93f56e6f..eba89699 100644 --- a/cmd-server-info.c +++ b/cmd-server-info.c @@ -1,4 +1,4 @@ -/* $Id: cmd-server-info.c,v 1.26 2009-08-20 11:35:16 tcunha Exp $ */ +/* $Id: cmd-server-info.c,v 1.27 2009-09-03 21:02:55 tcunha Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -68,8 +68,9 @@ 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", - socket_path, debug_level, be_quiet ? ", quiet" : ""); + ctx->print(ctx, "socket path %s, debug level %d%s%s", + socket_path, debug_level, be_quiet ? ", quiet" : "", + login_shell ? ", login shell" : ""); if (uname(&un) == 0) { ctx->print(ctx, "system is %s %s %s %s", un.sysname, un.release, un.version, un.machine); |