diff options
| author | M. J. T. Guy <mjtg@cus.cam.ac.uk> | 1999-06-09 19:27:51 +0100 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-07-06 09:37:37 +0000 |
| commit | af7d13df55983dddc63f9a0d17150fe82dfa08fb (patch) | |
| tree | edc03861618eddbdff90248a8a7ae687265fecc4 | |
| parent | d6c467ebacb76375f2e45f73c8dc7672a175cfa8 (diff) | |
| download | perl-af7d13df55983dddc63f9a0d17150fe82dfa08fb.tar.gz | |
fix for C<$/ = 42> setting paragraph mode (applied with small
tweak)
Message-Id: <E10rm8l-00023T-00@ursa.cus.cam.ac.uk>
Subject: Re: [ID 19990608.002] Possible bug with binmode and <FH> on Perl 5.005_03 Win32
p4raw-id: //depot/perl@3610
| -rw-r--r-- | perl.h | 4 | ||||
| -rwxr-xr-x | t/base/rs.t | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -2379,8 +2379,8 @@ enum { /* pass one of these to get_vtbl */ /* Various states of an input record separator SV (rs, nrs) */ #define RsSNARF(sv) (! SvOK(sv)) -#define RsSIMPLE(sv) (SvOK(sv) && SvCUR(sv)) -#define RsPARA(sv) (SvOK(sv) && ! SvCUR(sv)) +#define RsSIMPLE(sv) (SvOK(sv) && (! SvPOK(sv) || SvCUR(sv))) +#define RsPARA(sv) (SvPOK(sv) && ! SvCUR(sv)) #define RsRECORD(sv) (SvROK(sv) && (SvIV(SvRV(sv)) > 0)) /* Enable variables which are pointers to functions */ diff --git a/t/base/rs.t b/t/base/rs.t index 52a957260f..07cc8fd447 100755 --- a/t/base/rs.t +++ b/t/base/rs.t @@ -24,7 +24,7 @@ $bar = <TESTFILE>; if ($bar eq "12\n") {print "ok 2\n";} else {print "not ok 2\n";} # Try a non line terminator -$/ = "3"; +$/ = 3; $bar = <TESTFILE>; if ($bar eq "123") {print "ok 3\n";} else {print "not ok 3\n";} |