Adding upstream version 1:0.1.9998svn3589+dfsg.upstream/1%0.1.9998svn3589+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 33 insertions, 0 deletions

diff --git a/src/grep/tests/grep-dev-null b/src/grep/tests/grep-dev-null
new file mode 100755
index 0000000..49a9385
--- /dev/null
+++ b/src/grep/tests/grep-dev-null
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Case-insensitive grep with a 0-size input file would fail in grep up to 2.6.3
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+require_en_utf8_locale_
+
+LC_ALL=en_US.UTF-8
+export LC_ALL
+
+echo x | returns_ 1 grep -f /dev/null || fail=1
+echo x | returns_ 1 grep -if /dev/null || fail=1
+echo x | returns_ 1 grep -Ff /dev/null || fail=1
+echo x | returns_ 1 grep -Fif /dev/null || fail=1
+
+returns_ 1 grep -f /dev/null < /dev/null || fail=1
+returns_ 1 grep -if /dev/null < /dev/null || fail=1
+returns_ 1 grep -Ff /dev/null < /dev/null || fail=1
+returns_ 1 grep -Fif /dev/null < /dev/null || fail=1
+
+Exit $fail
diff --git a/src/grep/tests/grep-dev-null-out b/src/grep/tests/grep-dev-null-out
new file mode 100755
index 0000000..397a3f1
--- /dev/null
+++ b/src/grep/tests/grep-dev-null-out
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Outputting to /dev/null.
+
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+require_timeout_
+
+${AWK-awk} 'BEGIN {while (1) print "x"}' </dev/null |
+  returns_ 124 timeout 10 grep x >/dev/null || fail=1
+
+echo abc | grep b >>/dev/null || fail=1
+
+Exit $fail