X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FIO%2FIO.xs;h=39e4486f995b44f70a8cbfcd8c1dff496ff3cc38;hb=0bb78401313e0347fd894143d813c3036c2eccb4;hp=a798813f1420cd1177851a27dcdf1dd6f91e23b9;hpb=6e22d04617c44509b8a480505826f9b13b2f0dd6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/IO/IO.xs b/ext/IO/IO.xs
index a798813..39e4486 100644
--- a/ext/IO/IO.xs
+++ b/ext/IO/IO.xs
@@ -26,6 +26,13 @@
 #endif
 
 #ifdef PerlIO
+#if defined(MACOS_TRADITIONAL) && defined(USE_SFIO)
+#define PERLIO_IS_STDIO 1
+#undef setbuf
+#undef setvbuf
+#define setvbuf		_stdsetvbuf
+#define setbuf(f,b)	( __sf_setbuf(f,b) )
+#endif
 typedef int SysRet;
 typedef PerlIO * InputStream;
 typedef PerlIO * OutputStream;
@@ -55,64 +62,35 @@ not_here(char *s)
 #endif
 
 static int
-io_blocking(InputStream f, int block)
+io_blocking(pTHX_ InputStream f, int block)
 {
+#if defined(HAS_FCNTL)
     int RETVAL;
     if(!f) {
 	errno = EBADF;
 	return -1;
     }
-#if defined(HAS_FCNTL)
     RETVAL = fcntl(PerlIO_fileno(f), F_GETFL, 0);
     if (RETVAL >= 0) {
 	int mode = RETVAL;
+	int newmode = mode;
 #ifdef O_NONBLOCK
 	/* POSIX style */
-#if defined(O_NDELAY) && O_NDELAY != O_NONBLOCK
-	/* Ooops has O_NDELAY too - make sure we don't
-	 * get SysV behaviour by mistake. */
 
-	/* E.g. In UNICOS and UNICOS/mk a F_GETFL returns an O_NDELAY
+# ifndef O_NDELAY
+#  define O_NDELAY O_NONBLOCK
+# endif
+	/* Note: UNICOS and UNICOS/mk a F_GETFL returns an O_NDELAY
 	 * after a successful F_SETFL of an O_NONBLOCK. */
 	RETVAL = RETVAL & (O_NONBLOCK | O_NDELAY) ? 0 : 1;
 
-	if (block >= 0) {
-	    if ((mode & O_NDELAY) || ((block == 0) && !(mode & O_NONBLOCK))) {
-	        int ret;
-	        mode = (mode & ~O_NDELAY) | O_NONBLOCK;
-	        ret = fcntl(PerlIO_fileno(f),F_SETFL,mode);
-	        if(ret < 0)
-		    RETVAL = ret;
-	    }
-	    else
-              if ((mode & O_NDELAY) || ((block > 0) && (mode & O_NONBLOCK))) {
-	        int ret;
-	        mode &= ~(O_NONBLOCK | O_NDELAY);
-	        ret = fcntl(PerlIO_fileno(f),F_SETFL,mode);
-	        if(ret < 0)
-		    RETVAL = ret;
-              }
+	if (block == 0) {
+	    newmode &= ~O_NDELAY;
+	    newmode |= O_NONBLOCK;
+	} else if (block > 0) {
+	    newmode &= ~(O_NDELAY|O_NONBLOCK);
 	}
 #else
-	/* Standard POSIX */
-	RETVAL = RETVAL & O_NONBLOCK ? 0 : 1;
-
-	if ((block == 0) && !(mode & O_NONBLOCK)) {
-	    int ret;
-	    mode |= O_NONBLOCK;
-	    ret = fcntl(PerlIO_fileno(f),F_SETFL,mode);
-	    if(ret < 0)
-		RETVAL = ret;
-	 }
-	else if ((block > 0) && (mode & O_NONBLOCK)) {
-	    int ret;
-	    mode &= ~O_NONBLOCK;
-	    ret = fcntl(PerlIO_fileno(f),F_SETFL,mode);
-	    if(ret < 0)
-		RETVAL = ret;
-	 }
-#endif
-#else
 	/* Not POSIX - better have O_NDELAY or we can't cope.
 	 * for BSD-ish machines this is an acceptable alternative
 	 * for SysV we can't tell "would block" from EOF but that is
@@ -120,25 +98,22 @@ io_blocking(InputStream f, int block)
 	 */
 	RETVAL = RETVAL & O_NDELAY ? 0 : 1;
 
-	if ((block == 0) && !(mode & O_NDELAY)) {
-	    int ret;
-	    mode |= O_NDELAY;
-	    ret = fcntl(PerlIO_fileno(f),F_SETFL,mode);
-	    if(ret < 0)
-		RETVAL = ret;
-	 }
-	else if ((block > 0) && (mode & O_NDELAY)) {
+	if (block == 0) {
+	    newmode |= O_NDELAY;
+	} else if (block > 0) {
+	    newmode &= ~O_NDELAY;
+	}
+#endif
+	if (newmode != mode) {
 	    int ret;
-	    mode &= ~O_NDELAY;
-	    ret = fcntl(PerlIO_fileno(f),F_SETFL,mode);
-	    if(ret < 0)
+	    ret = fcntl(PerlIO_fileno(f),F_SETFL,newmode);
+	    if (ret < 0)
 		RETVAL = ret;
-	 }
-#endif
+	}
     }
     return RETVAL;
 #else
- return -1;
+    return -1;
 #endif
 }
 
@@ -235,7 +210,7 @@ PPCODE:
     for(i=1, j=0  ; j < nfd ; j++) {
 	fds[j].fd = SvIV(ST(i));
 	i++;
-	fds[j].events = SvIV(ST(i));
+	fds[j].events = (short)SvIV(ST(i));
 	i++;
 	fds[j].revents = 0;
     }
@@ -261,7 +236,7 @@ io_blocking(handle,blk=-1)
 PROTOTYPE: $;$
 CODE:
 {
-    int ret = io_blocking(handle, items == 1 ? -1 : blk ? 1 : 0);
+    int ret = io_blocking(aTHX_ handle, items == 1 ? -1 : blk ? 1 : 0);
     if(ret >= 0)
 	XSRETURN_IV(ret);
     else