From a6f1c49ac0bbb063bd1da9093fa0b575d2e60b3f Mon Sep 17 00:00:00 2001
From: schwarze <schwarze@openbsd.org>
Date: Tue, 4 Jul 2017 22:49:59 +0000
Subject: [PATCH] Fix handling of \} on roff request lines. Cures bogus error
 messages in pages generated with pod2man(1).

---
 regress/usr.bin/mandoc/roff/cond/ie.in        | 12 +++++-
 regress/usr.bin/mandoc/roff/cond/ie.out_ascii |  3 +-
 usr.bin/mandoc/roff.c                         | 38 +++++++++++--------
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/regress/usr.bin/mandoc/roff/cond/ie.in b/regress/usr.bin/mandoc/roff/cond/ie.in
index bb76765d85b..580f4270302 100644
--- a/regress/usr.bin/mandoc/roff/cond/ie.in
+++ b/regress/usr.bin/mandoc/roff/cond/ie.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: ie.in,v 1.5 2017/07/04 14:53:26 schwarze Exp $
-.TH IE 1 "December 16, 2014"
+.\" $OpenBSD: ie.in,v 1.6 2017/07/04 22:49:59 schwarze Exp $
+.TH IE 1 "July 4, 2017"
 .SH NAME
 if \- the roff conditional instruction with else-clause
 .SH DESCRIPTION
@@ -10,6 +10,14 @@ Text following the true condition.
 .el One-line else after true.
 .el Another else after true.
 .br
+.ie n \{\
+Two-line
+true condition.
+.br\}
+.el \{\
+Two-line
+else after true.
+.br\}
 .ie t One-line false condition.
 Text following the false condition.
 .br
diff --git a/regress/usr.bin/mandoc/roff/cond/ie.out_ascii b/regress/usr.bin/mandoc/roff/cond/ie.out_ascii
index 73d3d97cb9e..3dee8d40f35 100644
--- a/regress/usr.bin/mandoc/roff/cond/ie.out_ascii
+++ b/regress/usr.bin/mandoc/roff/cond/ie.out_ascii
@@ -8,6 +8,7 @@ NNAAMMEE
 DDEESSCCRRIIPPTTIIOONN
        One-line true condition.
        Text following the true condition.
+       Two-line true condition.
        Text following the false condition.
        Two-line else after false.
        Else after empty condition.
@@ -16,4 +17,4 @@ DDEESSCCRRIIPPTTIIOONN
 
 
 
-OpenBSD                        December 16, 2014                         IE(1)
+OpenBSD                          July 4, 2017                            IE(1)
diff --git a/usr.bin/mandoc/roff.c b/usr.bin/mandoc/roff.c
index 1311d4897bf..6d085c53b32 100644
--- a/usr.bin/mandoc/roff.c
+++ b/usr.bin/mandoc/roff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: roff.c,v 1.189 2017/06/25 07:23:53 bentley Exp $ */
+/*	$OpenBSD: roff.c,v 1.190 2017/07/04 22:49:59 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -1924,15 +1924,6 @@ roff_cond_sub(ROFF_ARGS)
 
 	rr = r->last->rule;
 	roffnode_cleanscope(r);
-	t = roff_parse(r, buf->buf, &pos, ln, ppos);
-
-	/*
-	 * Fully handle known macros when they are structurally
-	 * required or when the conditional evaluated to true.
-	 */
-
-	if (t != TOKEN_NONE && (rr || roffs[t].flags & ROFFMAC_STRUCT))
-		return (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);
 
 	/*
 	 * If `\}' occurs on a macro line without a preceding macro,
@@ -1946,14 +1937,29 @@ roff_cond_sub(ROFF_ARGS)
 	/* Always check for the closing delimiter `\}'. */
 
 	while ((ep = strchr(ep, '\\')) != NULL) {
-		if (*(++ep) == '}') {
-			*ep = '&';
-			roff_ccond(r, ln, ep - buf->buf - 1);
-		}
-		if (*ep != '\0')
+		switch (ep[1]) {
+		case '}':
+			memmove(ep, ep + 2, strlen(ep + 2) + 1);
+			roff_ccond(r, ln, ep - buf->buf);
+			break;
+		case '\0':
 			++ep;
+			break;
+		default:
+			ep += 2;
+			break;
+		}
 	}
-	return rr ? ROFF_CONT : ROFF_IGN;
+
+	/*
+	 * Fully handle known macros when they are structurally
+	 * required or when the conditional evaluated to true.
+	 */
+
+	t = roff_parse(r, buf->buf, &pos, ln, ppos);
+	return t != TOKEN_NONE && (rr || roffs[t].flags & ROFFMAC_STRUCT)
+	    ? (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs) : rr
+	    ? ROFF_CONT : ROFF_IGN;
 }
 
 static enum rofferr
-- 
2.20.1