diff options
author | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-11-25 15:42:07 +0000 |
---|---|---|
committer | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-11-25 15:42:07 +0000 |
commit | 48bfcc53740a66ec5a66616b846e1db9955c1c69 (patch) | |
tree | 2de7728957d83a013605f4f68638b4bbef4565a2 /perl.c | |
parent | fd206186f8bcdcb1b41bbddfb851c60acb937fcd (diff) | |
parent | d40103885dfef00fdafa10024e6e4d5e414d1403 (diff) | |
download | perl-48bfcc53740a66ec5a66616b846e1db9955c1c69.tar.gz |
Integrate from ansi branch to mainline.
p4raw-id: //depot/perl@296
Diffstat (limited to 'perl.c')
-rw-r--r-- | perl.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1686,6 +1686,9 @@ GNU General Public License, which may be found in the Perl 5.0 source kit.\n\n") break; case '-': case 0: +#ifdef WIN32 + case '\r': +#endif case '\n': case '\t': break; @@ -1987,7 +1990,7 @@ SV *sv; if (strEQ(origfilename,"-")) scriptname = ""; if (fdscript >= 0) { - rsfp = PerlIO_fdopen(fdscript,"r"); + rsfp = PerlIO_fdopen(fdscript,PERL_SCRIPT_MODE); #if defined(HAS_FCNTL) && defined(F_SETFD) if (rsfp) fcntl(PerlIO_fileno(rsfp),F_SETFD,1); /* ensure close-on-exec */ @@ -2071,7 +2074,7 @@ sed %s -e \"/^[^#]/b\" \ rsfp = PerlIO_stdin(); } else { - rsfp = PerlIO_open(scriptname,"r"); + rsfp = PerlIO_open(scriptname,PERL_SCRIPT_MODE); #if defined(HAS_FCNTL) && defined(F_SETFD) if (rsfp) fcntl(PerlIO_fileno(rsfp),F_SETFD,1); /* ensure close-on-exec */ |