patch to ext/IO/lib/IO/Socket/INET.pm fixes Bug ID (20010803.022)

[p5sagit/p5-mst-13.2.git] / ext / IO / IO.xs

diff --git a/ext/IO/IO.xs b/ext/IO/IO.xs
index 3abc94b..6741905 100644 (file)
--- a/ext/IO/IO.xs
+++ b/ext/IO/IO.xs
@@ -361,33 +361,47 @@ fflush(handle)
        RETVAL
 
 void
-setbuf(handle, buf)
+setbuf(handle, ...)
        OutputStream    handle
-       char *          buf = SvPOK(ST(1)) ? sv_grow(ST(1), BUFSIZ) : 0;
     CODE:
        if (handle)
 #ifdef PERLIO_IS_STDIO
+        {
+           char *buf = items == 2 && SvPOK(ST(1)) ?
+             sv_grow(ST(1), BUFSIZ) : 0;
            setbuf(handle, buf);
+       }
 #else
            not_here("IO::Handle::setbuf");
 #endif
 
 SysRet
-setvbuf(handle, buf, type, size)
-       OutputStream    handle
-       char *          buf = SvPOK(ST(1)) ? sv_grow(ST(1), SvIV(ST(3))) : 0;
-       int             type
-       int             size
+setvbuf(...)
     CODE:
+       if (items != 4)
+            Perl_croak(aTHX_ "Usage: IO::Handle::setvbuf(handle, buf, type, size)");
 #if defined(PERLIO_IS_STDIO) && defined(_IOFBF) && defined(HAS_SETVBUF)
+    {
+        OutputStream   handle = 0;
+       char *          buf = SvPOK(ST(1)) ? sv_grow(ST(1), SvIV(ST(3))) : 0;
+       int             type;
+       int             size;
+
+       if (items == 4) {
+           handle = IoOFP(sv_2io(ST(0)));
+           buf    = SvPOK(ST(1)) ? sv_grow(ST(1), SvIV(ST(3))) : 0;
+           type   = (int)SvIV(ST(2));
+           size   = (int)SvIV(ST(3));
+       }
        if (!handle)                    /* Try input stream. */
            handle = IoIFP(sv_2io(ST(0)));
-       if (handle)
+       if (items == 4 && handle)
            RETVAL = setvbuf(handle, buf, type, size);
        else {
            RETVAL = -1;
            errno = EINVAL;
        }
+    }
 #else
        RETVAL = (SysRet) not_here("IO::Handle::setvbuf");
 #endif
@@ -420,20 +434,27 @@ sockatmark (sock)
    InputStream sock
    PROTOTYPE: $
    PREINIT:
-     int fd,flag=0;
+     int fd;
    CODE:
    {
      fd = PerlIO_fileno(sock);
 #ifdef HAS_SOCKATMARK
-     flag = sockatmark(fd);
+     RETVAL = sockatmark(fd);
 #else
+     {
+       int flag = 0;
 #   ifdef SIOCATMARK
-     if (ioctl(fd, SIOCATMARK, &flag) != 0)
-       XSRETURN_UNDEF;
+       #ifdef NETWARE
+       if (ioctl(fd, SIOCATMARK, (void*)&flag) != 0)
+       #else
+          if (ioctl(fd, SIOCATMARK, &flag) != 0)
+       #endif
+        XSRETURN_UNDEF;
 #   else
-     not_here("IO::Socket::atmark");
-#  endif
-     RETVAL = flag;
+       not_here("IO::Socket::atmark");
+#   endif
+       RETVAL = flag;
+     }
 #endif
    }
    OUTPUT: