Hash :
386315b3
Author :
Date :
2015-03-24T12:15:27
yesno: make EOL optional in ENABLE_NLS case also yesno behaves differently in a corner case depending on ENABLE_NLS. With an input of "y" followed by an EOF the input is considered to be "no", because the last character is replaced with '\0'. It was assumed that there is a newline, which doesn't have to be true. If ENABLE_NLS is not set, getchar() reads y and accepts it as "yes", looping through more getchar() calls until reaching newline or EOF. * lib/yesno.c (yesno): Check for EOL before replacing. * tests/test-yesno.sh: Add a test case (test along with gettext).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
#!/bin/sh
: ${srcdir=.}
. "$srcdir/init.sh"; path_prepend_ .
# For now, only test with C locale
LC_ALL=C
export LC_ALL
# Find out how to remove carriage returns from output. Solaris /usr/ucb/tr
# does not understand '\r'.
if echo solaris | tr -d '\r' | grep solais > /dev/null; then
cr='\015'
else
cr='\r'
fi
# Test with seekable stdin; the follow-on process must see remaining data.
tr @ '\177' <<EOF > in.tmp
nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn - entire line consumed
y@n - backspace does not change result
y
does not match either yesexpr or noexpr
n
EOF
cat <<EOF > xout.tmp
N
Y
Y
N
n
EOF
fail=0
(test-yesno; test-yesno 3; cat) < in.tmp > out1.tmp || fail=1
LC_ALL=C tr -d "$cr" < out1.tmp > out.tmp || fail=1
cmp xout.tmp out.tmp || fail=1
(test-yesno 3; test-yesno; cat) < in.tmp > out1.tmp || fail=1
LC_ALL=C tr -d "$cr" < out1.tmp > out.tmp || fail=1
cmp xout.tmp out.tmp || fail=1
# Test for behavior on pipe
cat <<EOF > xout.tmp
Y
N
EOF
echo yes | test-yesno 2 > out1.tmp || fail=1
LC_ALL=C tr -d "$cr" < out1.tmp > out.tmp || fail=1
cmp xout.tmp out.tmp || fail=1
# Test for behavior with no EOL at EOF
cat <<EOF > xout.tmp
Y
EOF
printf y | test-yesno 1 > out1.tmp || fail=1
LC_ALL=C tr -d "$cr" < out1.tmp > out.tmp || fail=1
cmp xout.tmp out.tmp || fail=1
# Test for behavior on EOF
cat <<EOF > xout.tmp
N
EOF
test-yesno </dev/null > out1.tmp || fail=1
LC_ALL=C tr -d "$cr" < out1.tmp > out.tmp || fail=1
cmp xout.tmp out.tmp || fail=1
# Test for behavior when stdin is closed
test-yesno 0 <&- > out1.tmp 2> err.tmp && fail=1
LC_ALL=C tr -d "$cr" < out1.tmp > out.tmp || fail=1
cmp xout.tmp out.tmp || fail=1
test -s err.tmp || fail=1
Exit $fail