aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-06-04 18:01:17 +0100
committerThomas Adam <thomas@xteddy.org>2020-06-04 18:01:17 +0100
commitc8bddfba2bc896dd8a73493d507fae64aaf214a6 (patch)
tree874a7fbaef6208979f52759bdea842993cd6a744
parent81ba6477ff6b8b6d3811d7f902a6d34cbba7533b (diff)
parent4403afe29c2106371ff43c28b9f0a3ed50fd61ee (diff)
downloadrtmux-c8bddfba2bc896dd8a73493d507fae64aaf214a6.tar.gz
rtmux-c8bddfba2bc896dd8a73493d507fae64aaf214a6.tar.bz2
rtmux-c8bddfba2bc896dd8a73493d507fae64aaf214a6.zip
Merge branch 'obsd-master'
-rw-r--r--cmd-parse.y4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd-parse.y b/cmd-parse.y
index 6ec2eca3..0a0b1993 100644
--- a/cmd-parse.y
+++ b/cmd-parse.y
@@ -535,9 +535,11 @@ argument_statements : statement '}'
{
$$ = $1;
}
- | statements '}'
+ | statements statement '}'
{
$$ = $1;
+ TAILQ_CONCAT($$, $2, entry);
+ free($2);
}
%%