aboutsummaryrefslogtreecommitdiff
path: root/status.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2011-01-07 14:32:26 +0000
committerTiago Cunha <tcunha@gmx.com>2011-01-07 14:32:26 +0000
commit3aaf5b9b1e4b5249a86db97d67291e22b90e1fef (patch)
tree18dcea38980827269fc8f4113cff915613de1c1f /status.c
parentb463d3de54c5d940341968aee3307cb83e3629b8 (diff)
downloadrtmux-3aaf5b9b1e4b5249a86db97d67291e22b90e1fef.tar.gz
rtmux-3aaf5b9b1e4b5249a86db97d67291e22b90e1fef.tar.bz2
rtmux-3aaf5b9b1e4b5249a86db97d67291e22b90e1fef.zip
Sync OpenBSD patchset 827:
Handle a # at the end of a replacement string (such as status-left) correctly. Found by Thomas Adam.
Diffstat (limited to 'status.c')
-rw-r--r--status.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/status.c b/status.c
index 911e8785..b694068a 100644
--- a/status.c
+++ b/status.c
@@ -1,4 +1,4 @@
-/* $Id: status.c,v 1.153 2011-01-03 23:52:38 tcunha Exp $ */
+/* $Id: status.c,v 1.154 2011-01-07 14:32:26 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -469,7 +469,7 @@ status_replace(struct client *c,
break;
ch = *iptr++;
- if (ch != '#') {
+ if (ch != '#' || *iptr == '\0') {
*optr++ = ch;
continue;
}