From 5d437294ccd08d0cd1eabe06b69e2fb7a62f00d7 Mon Sep 17 00:00:00 2001 From: pfg Date: Thu, 16 Aug 2018 18:35:39 +0000 Subject: [PATCH] Revert r337419. The fix is only partial and causes an asymmetry which breaks a test in multi_test.sh. We should consider both parts of the issue found in OpenBSD[1], but for now just revert the change. [1] http://undeadly.org/cgi?action=article;sid=20180728110010 Reported by: asomers --- usr.bin/sed/compile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c index df64a5c598c2..4427faeff4a2 100644 --- a/usr.bin/sed/compile.c +++ b/usr.bin/sed/compile.c @@ -393,11 +393,11 @@ compile_delimited(char *p, char *d, int is_tr) if ((d = compile_ccl(&p, d)) == NULL) errx(1, "%lu: %s: unbalanced brackets ([])", linenum, fname); continue; - } else if (*p == '\\' && p[1] == c) { - p++; } else if (*p == '\\' && p[1] == '[') { *d++ = *p++; - } else if (*p == '\\' && p[1] == 'n') { + } else if (*p == '\\' && p[1] == c) + p++; + else if (*p == '\\' && p[1] == 'n') { *d++ = '\n'; p += 2; continue;