X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=doio.c;h=3bad8f343ba5e7787d10e6dedbf8c782e9fff9c6;hb=f8f79f57f467ffff4d31dc518ce3f6d2364090a0;hp=1135a62750f734bf11c7bcf9784b74cf965241bf;hpb=6a93df2e699ee31021f3373dcafbb41d67f7f951;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/doio.c b/doio.c
index 1135a62..3bad8f3 100644
--- a/doio.c
+++ b/doio.c
@@ -94,7 +94,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 
     /* Collect default raw/crlf info from the op */
     if (PL_op && PL_op->op_type == OP_OPEN) {
-	/* set up disciplines */
+	/* set up IO layers */
 	U8 flags = PL_op->op_private;
 	in_raw = (flags & OPpOPEN_IN_RAW);
 	in_crlf = (flags & OPpOPEN_IN_CRLF);
@@ -179,7 +179,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 		 (ismodifying & (O_CREAT|appendtrunc)))
 		  TAINT_PROPER("sysopen");
 	}
-	mode[ix++] = '#'; /* Marker to openn to use numeric "sysopen" */
+	mode[ix++] = IoTYPE_NUMERIC; /* Marker to openn to use numeric "sysopen" */
 
 #if defined(USE_64_BIT_RAWIO) && defined(O_LARGEFILE)
 	rawmode |= O_LARGEFILE;	/* Transparently largefiley. */
@@ -212,7 +212,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 	    *--tend = '\0';
 
 	if (num_svs) {
-	    /* New style explict name, type is just mode and discipline/layer info */
+	    /* New style explicit name, type is just mode and layer info */
 	    STRLEN l = 0;
 #ifdef USE_STDIO
 	    if (SvROK(*svp) && !strchr(name,'&')) {
@@ -236,7 +236,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 	if ((*type == IoTYPE_RDWR) && /* scary */
            (*(type+1) == IoTYPE_RDONLY || *(type+1) == IoTYPE_WRONLY) &&
 	    ((!num_svs || (tend > type+1 && tend[-1] != IoTYPE_PIPE)))) {
-        TAINT_PROPER("open");
+	    TAINT_PROPER("open");
 	    mode[1] = *type++;
 	    writing = 1;
 	}
@@ -244,7 +244,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 	if (*type == IoTYPE_PIPE) {
 	    if (num_svs) {
 		if (type[1] != IoTYPE_STD) {
-	          unknown_desr:
+	          unknown_open_mode:
 		    Perl_croak(aTHX_ "Unknown open() mode '%.*s'", (int)olen, oname);
 		}
 		type++;
@@ -289,7 +289,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 		    }
 		}
 	    }
-	}
+	} /* IoTYPE_PIPE */
 	else if (*type == IoTYPE_WRONLY) {
 	    TAINT_PROPER("open");
 	    type++;
@@ -422,7 +422,9 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 		    fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
 		}
 	    } /* !& */
-	}
+	    if (!fp && type && *type && *type != ':' && !isIDFIRST(*type))
+	       goto unknown_open_mode;
+	} /* IoTYPE_WRONLY */
 	else if (*type == IoTYPE_RDONLY) {
 	    /*SUPPRESS 530*/
 	    for (type++; isSPACE(*type); type++) ;
@@ -453,8 +455,11 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 		}
 		fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
 	    }
-	}
-	else if ((num_svs && type[0] == IoTYPE_STD && type[1] == IoTYPE_PIPE) ||
+	    if (!fp && type && *type && *type != ':' && !isIDFIRST(*type))
+	       goto unknown_open_mode;
+	} /* IoTYPE_RDONLY */
+	else if ((num_svs && /* '-|...' or '...|' */
+		  type[0] == IoTYPE_STD && type[1] == IoTYPE_PIPE) ||
 	         (!num_svs && tend > type+1 && tend[-1] == IoTYPE_PIPE)) {
 	    if (num_svs) {
 		type += 2;   /* skip over '-|' */
@@ -499,9 +504,9 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 		}
 	    }
 	}
-	else {
+	else { /* layer(Args) */
 	    if (num_svs)
-		goto unknown_desr;
+		goto unknown_open_mode;
 	    name = type;
 	    IoTYPE(io) = IoTYPE_RDONLY;
 	    /*SUPPRESS 530*/
@@ -674,8 +679,8 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 	if (IoTYPE(io) == IoTYPE_SOCKET
 	    || (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(PL_statbuf.st_mode)) ) {
 	    char *s = mode;
-	    if (*s == 'I' || *s == '#')
-	     s++;
+	    if (*s == IoTYPE_IMPLICIT || *s == IoTYPE_NUMERIC)
+	      s++;
 	    *s = 'w';
 	    if (!(IoOFP(io) = PerlIO_openn(aTHX_ type,s,fd,0,0,NULL,0,svp))) {
 		PerlIO_close(fp);
@@ -1165,7 +1170,7 @@ fail_discipline:
 		if (!end)
 		    end = s+len;
 #ifndef PERLIO_LAYERS
-		Perl_croak(aTHX_ "Unknown discipline '%.*s'", end-s, s);
+		Perl_croak(aTHX_ "IO layers (like '%.*s') unavailable", end-s, s);
 #else
 		s = end;
 #endif
@@ -1395,11 +1400,13 @@ Perl_my_lstat(pTHX)
     return PL_laststatval;
 }
 
+#ifndef OS2
 bool
 Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp)
 {
     return do_aexec5(really, mark, sp, 0, 0);
 }
+#endif
 
 bool
 Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
@@ -1427,10 +1434,12 @@ Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
 	if ((!really && *PL_Argv[0] != '/') ||
 	    (really && *tmps != '/'))		/* will execvp use PATH? */
 	    TAINT_ENV();		/* testing IFS here is overkill, probably */
+	PERL_FPU_PRE_EXEC
 	if (really && *tmps)
 	    PerlProc_execvp(tmps,EXEC_ARGV_CAST(PL_Argv));
 	else
 	    PerlProc_execvp(PL_Argv[0],EXEC_ARGV_CAST(PL_Argv));
+	PERL_FPU_POST_EXEC
 	if (ckWARN(WARN_EXEC))
 	    Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s",
 		(really ? tmps : PL_Argv[0]), Strerror(errno));
@@ -1500,7 +1509,9 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report)
 		  *--s = '\0';
 	      if (s[-1] == '\'') {
 		  *--s = '\0';
+		  PERL_FPU_PRE_EXEC
 		  PerlProc_execl(PL_cshname,"csh", flags, ncmd, (char*)0);
+		  PERL_FPU_POST_EXEC
 		  *s = '\'';
 		  return FALSE;
 	      }
@@ -1543,7 +1554,9 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report)
 		}
 	    }
 	  doshell:
+	    PERL_FPU_PRE_EXEC
 	    PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char*)0);
+	    PERL_FPU_POST_EXEC
 	    return FALSE;
 	}
     }
@@ -1561,7 +1574,9 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report)
     }
     *a = Nullch;
     if (PL_Argv[0]) {
+	PERL_FPU_PRE_EXEC
 	PerlProc_execvp(PL_Argv[0],PL_Argv);
+	PERL_FPU_POST_EXEC
 	if (errno == ENOEXEC) {		/* for system V NIH syndrome */
 	    do_execfree();
 	    goto doshell;