fix TAP output

[p5sagit/Sub-Name.git] / Name.xs

diff --git a/Name.xs b/Name.xs
index a338c3c..20c9b71 100644 (file)
--- a/Name.xs
+++ b/Name.xs
@@ -1,6 +1,6 @@
-/* $Id: Name.xs,v 1.5 2004/08/18 13:21:44 xmath Exp $
- * Copyright (C) 2004  Matthijs van Duin.  All rights reserved.
- * This program is free software; you can redistribute it and/or modify 
+/* Copyright (C) 2004, 2008  Matthijs van Duin.  All rights reserved.
+ * Copyright (C) 2014, cPanel Inc.  All rights reserved.
+ * This program is free software; you can redistribute it and/or modify
  * it under the same terms as Perl itself.
  */
 
@@ -8,10 +8,17 @@
 #include "perl.h"
 #include "XSUB.h"
 
-#ifdef USE_5005THREADS
-#error "Not compatible with 5.005 threads"
+static MGVTBL subname_vtbl;
+
+#ifndef PERL_MAGIC_ext
+# define PERL_MAGIC_ext '~'
+#endif
+
+#ifndef SvMAGIC_set
+#define SvMAGIC_set(sv, val) (SvMAGIC(sv) = (val))
 #endif
 
+
 MODULE = Sub::Name  PACKAGE = Sub::Name
 
 PROTOTYPES: DISABLE
@@ -24,7 +31,8 @@ subname(name, sub)
        CV *cv = NULL;
        GV *gv;
        HV *stash = CopSTASH(PL_curcop);
-       char *s, *end = NULL, saved;
+       char *s, *end = NULL;
+       MAGIC *mg;
     PPCODE:
        if (!SvROK(sub) && SvGMAGICAL(sub))
                mg_get(sub);
@@ -35,7 +43,8 @@ subname(name, sub)
        else if (!SvOK(sub))
                croak(PL_no_usym, "a subroutine");
        else if (PL_op->op_private & HINT_STRICT_REFS)
-               croak(PL_no_symref, SvPV_nolen(sub), "a subroutine");
+               croak("Can't use string (\"%.32s\") as %s ref while \"strict refs\" in use",
+                     SvPV_nolen(sub), "a subroutine");
        else if ((gv = gv_fetchpv(SvPV_nolen(sub), FALSE, SVt_PVCV)))
                cv = GvCVu(gv);
        if (!cv)
@@ -49,15 +58,32 @@ subname(name, sub)
                        end = s;
        }
        s--;
-       if (end) {
-               saved = *end;
-               *end = 0;
-               stash = GvHV(gv_fetchpv(name, TRUE, SVt_PVHV));
-               *end = saved;
-               name = end;
-       }
+        if (end) {
+               stash = GvHV(gv_fetchpv(savepvn(name, end - name), TRUE, SVt_PVHV));
+                name = end;
+        }
        gv = (GV *) newSV(0);
        gv_init(gv, stash, name, s - name, TRUE);
-       av_store((AV *) AvARRAY(CvPADLIST(cv))[0], 0, (SV *) gv);
+
+       mg = SvMAGIC(cv);
+       while (mg && mg->mg_virtual != &subname_vtbl)
+               mg = mg->mg_moremagic;
+       if (!mg) {
+               Newz(702, mg, 1, MAGIC);
+               mg->mg_moremagic = SvMAGIC(cv);
+               mg->mg_type = PERL_MAGIC_ext;
+               mg->mg_virtual = &subname_vtbl;
+               SvMAGIC_set(cv, mg);
+       }
+       if (mg->mg_flags & MGf_REFCOUNTED)
+               SvREFCNT_dec(mg->mg_obj);
+       mg->mg_flags |= MGf_REFCOUNTED;
+       mg->mg_obj = (SV *) gv;
+       SvRMAGICAL_on(cv);
+       CvANON_off(cv);
+#ifndef CvGV_set
        CvGV(cv) = gv;
+#else
+       CvGV_set(cv, gv);
+#endif
        PUSHs(sub);