diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2010-05-21 19:45:54 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2010-05-21 19:45:54 +0000 |
| commit | 8a324a2c6da85d60127d380975fd75aed53ce147 (patch) | |
| tree | 1c8756bd736927c71e6f555c12bacd8450b3de2c | |
| parent | 4c3c0e9df5ec760ac2f7eb2209196e225248f287 (diff) | |
Notes
| -rw-r--r-- | tools/regression/usr.bin/sed/multitest.t | 3 | ||||
| -rw-r--r-- | tools/regression/usr.bin/sed/regress.multitest.out/8.22 | 2 | ||||
| -rw-r--r-- | tools/regression/usr.bin/sed/regress.multitest.out/8.23 | 1 | ||||
| -rw-r--r-- | usr.bin/sed/compile.c | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/tools/regression/usr.bin/sed/multitest.t b/tools/regression/usr.bin/sed/multitest.t index 93220787bcce..67dcded3ec22 100644 --- a/tools/regression/usr.bin/sed/multitest.t +++ b/tools/regression/usr.bin/sed/multitest.t @@ -449,6 +449,9 @@ u2/g' lines1 mark '8.21' echo 'a\b(c' | $SED 'y%ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"%abcdefghijklmnopqrstuvwxyz,------%' + COMMENT='\n in a character class and a BRE' + mark '8.22' ; (echo 1; echo 2) | $SED -n '1{;N;s/[\n]/X/;p;}' + mark '8.23' ; (echo 1; echo 2) | $SED -n '1{;N;s/\n/X/;p;}' } test_error() diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.22 b/tools/regression/usr.bin/sed/regress.multitest.out/8.22 new file mode 100644 index 000000000000..1191247b6d9a --- /dev/null +++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.22 @@ -0,0 +1,2 @@ +1 +2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.23 b/tools/regression/usr.bin/sed/regress.multitest.out/8.23 new file mode 100644 index 000000000000..c66dd65b0993 --- /dev/null +++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.23 @@ -0,0 +1 @@ +1X2 diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c index 1db7f634bd7e..cea8e07b9c3b 100644 --- a/usr.bin/sed/compile.c +++ b/usr.bin/sed/compile.c @@ -432,8 +432,7 @@ compile_ccl(char **sp, char *t) for (c = *s; (*t = *s) != ']' || c != d; s++, t++) if ((c = *s) == '\0') return NULL; - } else if (*s == '\\' && s[1] == 'n') - *t = '\n', s++; + } return (*s == ']') ? *sp = ++s, ++t : NULL; } |
