summaryrefslogtreecommitdiff
path: root/perl.c
diff options
context:
space:
mode:
authorMalcolm Beattie <mbeattie@sable.ox.ac.uk>1997-11-25 15:42:07 +0000
committerMalcolm Beattie <mbeattie@sable.ox.ac.uk>1997-11-25 15:42:07 +0000
commit48bfcc53740a66ec5a66616b846e1db9955c1c69 (patch)
tree2de7728957d83a013605f4f68638b4bbef4565a2 /perl.c
parentfd206186f8bcdcb1b41bbddfb851c60acb937fcd (diff)
parentd40103885dfef00fdafa10024e6e4d5e414d1403 (diff)
downloadperl-48bfcc53740a66ec5a66616b846e1db9955c1c69.tar.gz
Integrate from ansi branch to mainline.
p4raw-id: //depot/perl@296
Diffstat (limited to 'perl.c')
-rw-r--r--perl.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/perl.c b/perl.c
index 923eea5c7f..381d5748a2 100644
--- a/perl.c
+++ b/perl.c
@@ -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 */