d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Backslash-newline should not affect field splitting in read builtin.

Browse Source 
This was originally broken in r212339 in 2010.
This commit is contained in:
Jilles Tjoelker 2015-08-16 12:57:17 +00:00
parent 512e30ef9f
commit 4b6578dc8c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=286826
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/sh/miscbltin.c
View File

@ -191,9 +191,10 @@ readcmd(int argc __unused, char **argv __unused)
CHECKSTRSPACE(1, p);
if (backslash) {
backslash = 0;
startword = 0;
if (c != '\n')
if (c != '\n') {
startword = 0;
USTPUTC(c, p);
}
continue;
}
if (!rflag && c == '\\') {

1
bin/sh/tests/builtins/Makefile
View File

@ -121,6 +121,7 @@ FILES+= read4.0 read4.0.stdout
FILES+= read5.0
FILES+= read6.0
FILES+= read7.0
FILES+= read8.0
FILES+= return1.0
FILES+= return2.1
FILES+= return3.1

17
bin/sh/tests/builtins/read8.0 Normal file
View File

@ -0,0 +1,17 @@
# $FreeBSD$
read a b c <<\EOF
\
A\
\
\
\
B\
\
\
C\
\
\
\
EOF
[ "$a.$b.$c" = "A.B.C" ]