summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-12-11 15:11:19 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-12-11 15:11:19 -0500
commit931de139ed875e6c593d0bdb692fccf181da46bb (patch)
tree56008d12a6d452ac38207ab1772656ca636f9415
parent6f2bc6bff8786f96265b170249b4cd4bc3e99247 (diff)
downloadmoreutils-931de139ed875e6c593d0bdb692fccf181da46bb.tar.gz
vipe: Avoid dying on empty input. Thanks, Anders Kaseorg Closes: #508491
-rw-r--r--debian/changelog7
-rwxr-xr-xvipe4
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 5c8ae6e..f0a4149 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+moreutils (0.34) UNRELEASED; urgency=low
+
+ * vipe: Avoid dying on empty input. Thanks, Anders Kaseorg
+ Closes: #508491
+
+ -- Joey Hess <joeyh@debian.org> Thu, 11 Dec 2008 15:10:56 -0500
+
moreutils (0.33) unstable; urgency=low
* Support installing moreutils into prefixes other than /usr (Evan Broder)
diff --git a/vipe b/vipe
index 8cee2b1..4874fe3 100755
--- a/vipe
+++ b/vipe
@@ -43,7 +43,7 @@ $/=undef;
my ($fh, $tmp)=tempfile();
die "cannot create tempfile" unless $fh;
-print $fh <STDIN> || die "write temp: $!";
+print ($fh <STDIN>) || die "write temp: $!";
close $fh;
close STDIN;
open(STDIN, "</dev/tty") || die "reopen stdin: $!";
@@ -67,6 +67,6 @@ if ($ret != 0) {
}
open (IN, $tmp) || die "$0: cannot read $tmp: $!\n";
-print OUT <IN> || die "write failure: $!";
+print (OUT <IN>) || die "write failure: $!";
close IN;
unlink($tmp);