diff options
| author | Stepan Kasal <skasal@redhat.com> | 2009-06-03 12:03:55 +0200 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2009-06-08 14:06:10 +0200 |
| commit | d7dfc388e04f41b8a0f5d8ef6e15ab3b79f483c8 (patch) | |
| tree | f47e9a43533facce67be0f722e2e561d3129cbeb | |
| parent | e39d780342f3e91579069fdc80eda72bfe639ae7 (diff) | |
| download | perl-d7dfc388e04f41b8a0f5d8ef6e15ab3b79f483c8.tar.gz | |
fix RT 39060, errno incorrectly set in perlio
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | perlio.c | 12 | ||||
| -rw-r--r-- | t/io/errno.t | 26 |
3 files changed, 34 insertions, 5 deletions
@@ -3907,6 +3907,7 @@ t/io/binmode.t See if binmode() works t/io/crlf.t See if :crlf works t/io/crlf_through.t See if pipe passes data intact with :crlf t/io/dup.t See if >& works right +t/io/errno.t See if $! is correctly set t/io/fflush.t See if auto-flush on fork/exec/system/qx works t/io/fs.t See if directory manipulations work t/io/inplace.t See if inplace editing works @@ -1784,12 +1784,14 @@ PerlIO_has_base(PerlIO *f) int PerlIO_fast_gets(PerlIO *f) { - if (PerlIOValid(f) && (PerlIOBase(f)->flags & PERLIO_F_FASTGETS)) { - const PerlIO_funcs * const tab = PerlIOBase(f)->tab; + if (PerlIOValid(f)) { + if (PerlIOBase(f)->flags & PERLIO_F_FASTGETS) { + const PerlIO_funcs * const tab = PerlIOBase(f)->tab; - if (tab) - return (tab->Set_ptrcnt != NULL); - SETERRNO(EINVAL, LIB_INVARG); + if (tab) + return (tab->Set_ptrcnt != NULL); + SETERRNO(EINVAL, LIB_INVARG); + } } else SETERRNO(EBADF, SS_IVCHAN); diff --git a/t/io/errno.t b/t/io/errno.t new file mode 100644 index 0000000000..b55e3db6bb --- /dev/null +++ b/t/io/errno.t @@ -0,0 +1,26 @@ +#!./perl +# vim: ts=4 sts=4 sw=4: + +# $! may not be set if EOF was reached without any error. +# http://rt.perl.org/rt3/Ticket/Display.html?id=39060 + +use strict; +require './test.pl'; + +plan( tests => 16 ); + +my $test_prog = 'while(<>){print}; print $!'; + +for my $perlio ('perlio', 'stdio') { + $ENV{PERLIO} = $perlio; + for my $test_in ("test\n", "test") { + my $test_in_esc = $test_in; + $test_in_esc =~ s/\n/\\n/g; + for my $rs_code ('', '$/=undef', '$/=\2', '$/=\1024') { + is( runperl( prog => "$rs_code; $test_prog", + stdin => $test_in, stderr => 1), + $test_in, + "Wrong errno, PERLIO=$ENV{PERLIO} stdin='$test_in_esc'"); + } + } +} |