Moved bignum from lib/ to ext/

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

diff --git a/ext/DynaLoader/dl_vms.xs b/ext/DynaLoader/dl_vms.xs
index 3ae76b8..7029c97 100644 (file)
--- a/ext/DynaLoader/dl_vms.xs
+++ b/ext/DynaLoader/dl_vms.xs
@@ -49,11 +49,6 @@
 #include "perl.h"
 #include "XSUB.h"
 
-/* N.B.:
- * dl_debug and dl_last_error are static vars; you'll need to deal
- * with them appropriately if you need context independence
- */
-
 #include <descrip.h>
 #include <fscndef.h>
 #include <lib$routines.h>
@@ -104,21 +99,12 @@ copy_errmsg(msg,unused)
     dTHX;
     dMY_CXT;
     if (*(msg->dsc$a_pointer) == '%') { /* first line */
-      if (dl_last_error)
-        strncpy((dl_last_error = saferealloc(dl_last_error,msg->dsc$w_length+1)),
-                 msg->dsc$a_pointer, msg->dsc$w_length);
-      else
-        strncpy((dl_last_error = safemalloc(msg->dsc$w_length+1)),
-                 msg->dsc$a_pointer, msg->dsc$w_length);
-      dl_last_error[msg->dsc$w_length] = '\0';
+        sv_setpvn(MY_CXT.x_dl_last_error, msg->dsc$a_pointer, (STRLEN)msg->dsc$w_length);
     }
     else { /* continuation line */
-      int errlen = strlen(dl_last_error);
-      dl_last_error = saferealloc(dl_last_error, errlen + msg->dsc$w_length + 2);
-      dl_last_error[errlen] = '\n';  dl_last_error[errlen+1] = '\0';
-      strncat(dl_last_error, msg->dsc$a_pointer, msg->dsc$w_length);
-      dl_last_error[errlen+msg->dsc$w_length+1] = '\0';
+        sv_catpvn(MY_CXT.x_dl_last_error, msg->dsc$a_pointer, (STRLEN)msg->dsc$w_length);
     }
+    DLDEBUG(2,PerlIO_printf(Perl_debug_log, "Saved error message: %s\n", dl_last_error));
     return 0;
 }
 
@@ -136,19 +122,6 @@ dl_set_error(sts,stv)
     _ckvmssts(sys$putmsg(vec,copy_errmsg,0,0));
 }
 
-static unsigned int
-findsym_handler(void *sig, void *mech)
-{
-    dTHX;
-    unsigned long int myvec[8],args, *usig = (unsigned long int *) sig;
-    /* Be paranoid and assume signal vector passed in might be readonly */
-    myvec[0] = args = usig[0] > 10 ? 9 : usig[0] - 1;
-    while (--args) myvec[args] = usig[args];
-    _ckvmssts(sys$putmsg(myvec,copy_errmsg,0,0));
-    DLDEBUG(2,PerlIO_printf(Perl_debug_log, "findsym_handler: received\n\t%s\n",dl_last_error));
-    return SS$_CONTINUE;
-}
-
 /* wrapper for lib$find_image_symbol, so signalled errors can be saved
  * for dl_error and then returned */
 static unsigned long int
@@ -158,7 +131,7 @@ my_find_image_symbol(struct dsc$descriptor_s *imgname,
                      struct dsc$descriptor_s *defspec)
 {
   unsigned long int retsts;
-  VAXC$ESTABLISH(findsym_handler);
+  VAXC$ESTABLISH(lib$sig_to_ret);
   retsts = lib$find_image_symbol(imgname,symname,entry,defspec,DL_CASE_SENSITIVE);
   return retsts;
 }
@@ -170,7 +143,7 @@ dl_private_init(pTHX)
     dl_generic_private_init(aTHX);
     {
        dMY_CXT;
-       dl_require_symbols = get_av("DynaLoader::dl_require_symbols", 0x4);
+       dl_require_symbols = get_av("DynaLoader::dl_require_symbols", GV_ADDMULTI);
        /* Set up the static control blocks for dl_expand_filespec() */
        dl_fab = cc$rms_fab;
        dl_nam = cc$rms_nam;
@@ -350,7 +323,7 @@ dl_find_symbol(librefptr,symname)
     DLDEBUG(2,PerlIO_printf(Perl_debug_log, "\tentry point is %d\n",
                       (unsigned long int) entry));
     if (!(sts & 1)) {
-      /* error message already saved by findsym_handler */
+      dl_set_error(sts,0);
       ST(0) = &PL_sv_undef;
     }
     else ST(0) = sv_2mortal(newSViv(PTR2IV(entry)));
@@ -385,4 +358,20 @@ dl_error()
     OUTPUT:
       RETVAL
 
+#if defined(USE_ITHREADS)
+
+void
+CLONE(...)
+    CODE:
+    MY_CXT_CLONE;
+
+    /* MY_CXT_CLONE just does a memcpy on the whole structure, so to avoid
+     * using Perl variables that belong to another thread, we create our 
+     * own for this thread.
+     */
+    MY_CXT.x_dl_last_error = newSVpvn("", 0);
+    dl_require_symbols = get_av("DynaLoader::dl_require_symbols", GV_ADDMULTI);
+
+#endif
+
 # end.