summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-queue.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2019-05-25 10:46:55 +0000
committernicm <nicm@openbsd.org>2019-05-25 10:46:55 +0000
commit9a3a0de7a74c0eb28cfb859c956f268a6525de6e (patch)
tree216fcbe44cab99c61b1b190c16202b588421a67e /usr.bin/tmux/cmd-queue.c
parentUse client name when logging command queue. (diff)
downloadwireguard-openbsd-9a3a0de7a74c0eb28cfb859c956f268a6525de6e.tar.xz
wireguard-openbsd-9a3a0de7a74c0eb28cfb859c956f268a6525de6e.zip
Client name can actually be NULL, so use address in that case.
Diffstat (limited to 'usr.bin/tmux/cmd-queue.c')
-rw-r--r--usr.bin/tmux/cmd-queue.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c
index 6fd9f9bacb9..1346379b381 100644
--- a/usr.bin/tmux/cmd-queue.c
+++ b/usr.bin/tmux/cmd-queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.70 2019/05/25 10:44:09 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.71 2019/05/25 10:46:55 nicm Exp $ */
/*
* Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -36,7 +36,10 @@ cmdq_name(struct client *c)
if (c == NULL)
return ("<global>");
- xsnprintf(s, sizeof s, "<%s>", c->name);
+ if (c->name != NULL)
+ xsnprintf(s, sizeof s, "<%s>", c->name);
+ else
+ xsnprintf(s, sizeof s, "<%p>", c);
return (s);
}