X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlio.c;h=60346b516c3d53002bfdd764f8581537531f103f;hb=8a6aa900aaa729fd6735df2eb96e87e52d2662e8;hp=b59737c6692cebf2853e3473afbfa01e4fd7f42c;hpb=18586f540e901386eb982e521eebc21ac6d8289c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perlio.c b/perlio.c
index b59737c..60346b5 100644
--- a/perlio.c
+++ b/perlio.c
@@ -5,6 +5,11 @@
  */
 
 /*
+ * Hour after hour for nearly three weary days he had jogged up and down,
+ * over passes, and through long dales, and across many streams.
+ */
+
+/*
  * If we have ActivePerl-like PERL_IMPLICIT_SYS then we need a dTHX to get
  * at the dispatch tables, even when we do not need it for other reasons.
  * Invent a dSYS macro to abstract this out
@@ -790,7 +795,8 @@ PerlIO_parse_layers(pTHX_ PerlIO_list_t *av, const char *names)
 		     * seen as an invalid separator character.
 		     */
 		    char q = ((*s == '\'') ? '"' : '\'');
-		    Perl_warn(aTHX_
+		    if (ckWARN(WARN_LAYER))
+		        Perl_warner(aTHX_ packWARN(WARN_LAYER),
 			      "perlio: invalid separator character %c%c%c in layer specification list %s",
 			      q, *s, q, s);
 		    return -1;
@@ -825,7 +831,8 @@ PerlIO_parse_layers(pTHX_ PerlIO_list_t *av, const char *names)
 			     */
 			case '\0':
 			    e--;
-			    Perl_warn(aTHX_
+		    	    if (ckWARN(WARN_LAYER))
+			        Perl_warner(aTHX_ packWARN(WARN_LAYER),
 				      "perlio: argument list not closed for layer \"%.*s\"",
 				      (int) (e - s), s);
 			    return -1;
@@ -838,6 +845,7 @@ PerlIO_parse_layers(pTHX_ PerlIO_list_t *av, const char *names)
 		    }
 		}
 		if (e > s) {
+		    bool warn_layer = ckWARN(WARN_LAYER);
 		    PerlIO_funcs *layer =
 			PerlIO_find_layer(aTHX_ s, llen, 1);
 		    if (layer) {
@@ -847,7 +855,8 @@ PerlIO_parse_layers(pTHX_ PerlIO_list_t *av, const char *names)
 					 &PL_sv_undef);
 		    }
 		    else {
-			Perl_warn(aTHX_ "perlio: unknown layer \"%.*s\"",
+		    	if (warn_layer)
+			    Perl_warner(aTHX_ packWARN(WARN_LAYER), "perlio: unknown layer \"%.*s\"",
 				  (int) llen, s);
 			return -1;
 		    }
@@ -2528,8 +2537,7 @@ PerlIOStdio_close(pTHX_ PerlIO *f)
     FILE *stdio = PerlIOSelf(f, PerlIOStdio)->stdio;
     if (PerlIOUnix_refcnt_dec(fileno(stdio)) > 0) {
 	/* Do not close it but do flush any buffers */
-	PerlIO_flush(f);
-	return 0;
+        return PerlIO_flush(f);
     }
     return (
 #ifdef SOCKS5_VERSION_NAME
@@ -2882,18 +2890,23 @@ PerlIOBuf_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers,
 		return NULL;
 	    } else {
 		fd = PerlIO_fileno(f);
-#ifdef PERLIO_USING_CRLF
-		/*
-		 * do something about failing setmode()? --jhi
-		 */
-		PerlLIO_setmode(fd, O_BINARY);
-#endif
 		if (init && fd == 2) {
 		    /*
 		     * Initial stderr is unbuffered
 		     */
 		    PerlIOBase(f)->flags |= PERLIO_F_UNBUF;
 		}
+#ifdef PERLIO_USING_CRLF
+#  ifdef PERLIO_IS_BINMODE_FD
+		if (PERLIO_IS_BINMODE_FD(fd))
+		    PerlIO_binmode(f,  '<'/*not used*/, O_BINARY, Nullch);
+		else
+#  endif
+		/*
+		 * do something about failing setmode()? --jhi
+		 */
+		PerlLIO_setmode(fd, O_BINARY);
+#endif
 	    }
 	}
     }
@@ -3483,8 +3496,8 @@ PerlIOCrlf_get_cnt(pTHX_ PerlIO *f)
 	PerlIO_get_base(f);
     if (PerlIOBase(f)->flags & PERLIO_F_RDBUF) {
 	PerlIOCrlf *c = PerlIOSelf(f, PerlIOCrlf);
-	if ((PerlIOBase(f)->flags & PERLIO_F_CRLF) && !c->nl) {
-	    STDCHAR *nl = b->ptr;
+	if ((PerlIOBase(f)->flags & PERLIO_F_CRLF) && (!c->nl || *c->nl == 0xd)) {
+	    STDCHAR *nl = (c->nl) ? c->nl : b->ptr;
 	  scan:
 	    while (nl < b->end && *nl != 0xd)
 		nl++;
@@ -3549,7 +3562,6 @@ PerlIOCrlf_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt)
 {
     PerlIOBuf *b = PerlIOSelf(f, PerlIOBuf);
     PerlIOCrlf *c = PerlIOSelf(f, PerlIOCrlf);
-    IV flags = PerlIOBase(f)->flags;
     if (!b->buf)
 	PerlIO_get_base(f);
     if (!ptr) {
@@ -3566,9 +3578,11 @@ PerlIOCrlf_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt)
 	ptr -= cnt;
     }
     else {
+#if 0
 	/*
 	 * Test code - delete when it works ...
 	 */
+	IV flags = PerlIOBase(f)->flags;
 	STDCHAR *chk = (c->nl) ? (c->nl+1) : b->end;
         if (ptr+cnt == c->nl && c->nl+1 == b->end && *c->nl == 0xd) {
 	  /* Defered CR at end of buffer case - we lied about count */
@@ -3577,10 +3591,11 @@ PerlIOCrlf_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt)
 	chk -= cnt;
 
 	if (ptr != chk ) {
-	    Perl_warn(aTHX_ "ptr wrong %p != %p fl=%08" UVxf
+	    Perl_croak(aTHX_ "ptr wrong %p != %p fl=%08" UVxf
 		       " nl=%p e=%p for %d", ptr, chk, flags, c->nl,
 		       b->end, cnt);
 	}
+#endif
     }
     if (c->nl) {
 	if (ptr > c->nl) {