PERL_MM_USE_DEFAULT

[p5sagit/p5-mst-13.2.git] / perlio.c

diff --git a/perlio.c b/perlio.c
index 0349795..dd9f394 100644 (file)
--- a/perlio.c
+++ b/perlio.c
@@ -300,6 +300,19 @@ PerlIO_debug(const char *fmt, ...)
     }
     if (dbg > 0) {
        dTHX;
+#ifdef USE_ITHREADS
+       /* Use fixed buffer as sv_catpvf etc. needs SVs */
+       char buffer[1024];
+       char *s;
+       STRLEN len;
+       s = CopFILE(PL_curcop);
+       if (!s)
+           s = "(none)";
+       sprintf(buffer, "%s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
+        len = strlen(buffer);
+       vsprintf(buffer+len, fmt, ap);
+       PerlLIO_write(dbg, buffer, strlen(buffer));
+#else
        SV *sv = newSVpvn("", 0);
        char *s;
        STRLEN len;
@@ -313,6 +326,7 @@ PerlIO_debug(const char *fmt, ...)
        s = SvPV(sv, len);
        PerlLIO_write(dbg, s, len);
        SvREFCNT_dec(sv);
+#endif
     }
     va_end(ap);
 }
@@ -2002,7 +2016,6 @@ PerlIO *
 PerlIOBase_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param)
 {
     PerlIO *nexto = PerlIONext(o);
-    PerlIO_debug("PerlIOBase_dup f=%p o=%p param=%p\n",f,o,param);
     if (*nexto) {
        PerlIO_funcs *tab = PerlIOBase(nexto)->tab;
        f = (*tab->Dup)(aTHX_ f, nexto, param);
@@ -2011,6 +2024,7 @@ PerlIOBase_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param)
        PerlIO_funcs *self = PerlIOBase(o)->tab;
        SV *arg = Nullsv;
        char buf[8];
+       PerlIO_debug("PerlIOBase_dup %s f=%p o=%p param=%p\n",self->name,f,o,param);
        if (self->Getarg) {
            arg = (*self->Getarg)(o);
            if (arg) {
@@ -2535,7 +2549,27 @@ PerlIOStdio_set_ptrcnt(PerlIO *f, STDCHAR * ptr, SSize_t cnt)
 PerlIO *
 PerlIOStdio_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param)
 {
- return PerlIOBase_dup(aTHX_ f, o, param);
+    /* This assumes no layers underneath - which is what
+       happens, but is not how I remember it. NI-S 2001/10/16
+     */
+    int fd = PerlLIO_dup(PerlIO_fileno(o));
+    if (fd >= 0) {
+       char buf[8];
+       FILE *stdio = PerlSIO_fdopen(fd, PerlIO_modestr(o, buf));
+       if (stdio) {
+           if ((f = PerlIOBase_dup(aTHX_ f, o, param))) {
+               PerlIOSelf(f, PerlIOStdio)->stdio = stdio;
+           }
+           else {
+               PerlSIO_fclose(stdio);
+           }
+       }
+       else {
+           PerlLIO_close(fd);
+           f = NULL;
+       }
+    }
+    return f;
 }
 
 PerlIO_funcs PerlIO_stdio = {