X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Name.xs;h=d7fd127edf51206d57dbe6de3ef968a26dd419ec;hb=3967e6284e615ea53e8a93cd03376babe9f5339c;hp=6a4dc320a81a997e0efb20d7c134e89172527964;hpb=bbd0130659727a45e7f214cb8086cddbaecd5dec;p=p5sagit%2FSub-Name.git

diff --git a/Name.xs b/Name.xs
index 6a4dc32..d7fd127 100644
--- 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.
  */
 
@@ -10,6 +10,18 @@
 
 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
+
+#ifndef Newxz
+#define Newxz(ptr, num, type)	Newz(0, ptr, num, type)
+#endif
+
 MODULE = Sub::Name  PACKAGE = Sub::Name
 
 PROTOTYPES: DISABLE
@@ -22,7 +34,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);
@@ -33,7 +46,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)
@@ -47,33 +61,68 @@ 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) {
+		char *namepv = savepvn(name, end - name);
+		stash = GvHV(gv_fetchpv(namepv, TRUE, SVt_PVHV));
+		Safefree(namepv);
+                name = end;
+        }
+
+	/* under debugger, provide information about sub location */
+	if (PL_DBsub && CvGV(cv)) {
+		HV *hv = GvHV(PL_DBsub);
+
+		char* new_pkg = HvNAME(stash);
+
+		char* old_name = GvNAME( CvGV(cv) );
+		char* old_pkg = HvNAME( GvSTASH(CvGV(cv)) );
+
+		int old_len = strlen(old_name) + strlen(old_pkg);
+		int new_len = strlen(name) + strlen(new_pkg);
+
+		char* full_name;
+		Newxz(full_name, (old_len > new_len ? old_len : new_len) + 3, char);
+
+		strcat(full_name, old_pkg);
+		strcat(full_name, "::");
+		strcat(full_name, old_name);
+
+		SV** old_data = hv_fetch(hv, full_name, strlen(full_name), 0);
+
+		if (old_data) {
+			strcpy(full_name, new_pkg);
+			strcat(full_name, "::");
+			strcat(full_name, name);
+
+			SvREFCNT_inc(*old_data);
+			if (!hv_store(hv, full_name, strlen(full_name), *old_data, 0))
+				SvREFCNT_dec(*old_data);
+		}
+		Safefree(full_name);
 	}
+
 	gv = (GV *) newSV(0);
 	gv_init(gv, stash, name, s - name, TRUE);
-#ifndef USE_5005THREADS
-	if (CvPADLIST(cv)) {
-		/* cheap way to refcount the gv */
-		av_store((AV *) AvARRAY(CvPADLIST(cv))[0], 0, (SV *) gv);
-	}
-#endif
-	else {
-		/* expensive way to refcount the gv */
-		MAGIC *mg = SvMAGIC(cv);
-		while (mg && mg->mg_virtual != &subname_vtbl)
-			mg = mg->mg_moremagic;
-		if (!mg)
-			mg = sv_magicext((SV *) cv, NULL, PERL_MAGIC_ext,
-					&subname_vtbl, NULL, 0);
-		if (mg->mg_flags & MGf_REFCOUNTED)
-			SvREFCNT_dec(mg->mg_obj);
-		mg->mg_flags |= MGf_REFCOUNTED;
-		mg->mg_obj = (SV *) gv;
+
+	mg = SvMAGIC(cv);
+	while (mg && mg->mg_virtual != &subname_vtbl)
+		mg = mg->mg_moremagic;
+	if (!mg) {
+		Newxz(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);