various fixes for clean build and test on win32; configpm broken,

[p5sagit/p5-mst-13.2.git] / ext / DynaLoader / dlutils.c

diff --git a/ext/DynaLoader/dlutils.c b/ext/DynaLoader/dlutils.c
index 0ce0821..3bd58ed 100644 (file)
--- a/ext/DynaLoader/dlutils.c
+++ b/ext/DynaLoader/dlutils.c
@@ -9,77 +9,66 @@
 /* pointer to allocated memory for last error message */
 static char *LastError  = (char*)NULL;
 
+/* flag for immediate rather than lazy linking (spots unresolved symbol) */
+static int dl_nonlazy = 0;
+
+#ifdef DL_LOADONCEONLY
+static HV *dl_loaded_files = Nullhv;   /* only needed on a few systems */
+#endif
 
 
 #ifdef DEBUGGING
-/* currently not connected to $DynaLoader::dl_error but should be */
-static int dl_debug = 0;
-#define DLDEBUG(level,code)    if(dl_debug>=level){ code; }
+static int dl_debug = 0;       /* value copied from $DynaLoader::dl_error */
+#define DLDEBUG(level,code)    if (dl_debug>=level) { code; }
 #else
 #define DLDEBUG(level,code)
 #endif
 
 
 static void
-dl_generic_private_init()      /* called by dl_*.xs dl_private_init() */
+dl_generic_private_init(CPERLarg)      /* called by dl_*.xs dl_private_init() */
 {
+    char *perl_dl_nonlazy;
 #ifdef DEBUGGING
-    char *perl_dl_debug = getenv("PERL_DL_DEBUG");
-    if (perl_dl_debug)
-       dl_debug = atoi(perl_dl_debug);
+    dl_debug = SvIV( perl_get_sv("DynaLoader::dl_debug", 0x04) );
+#endif
+    if ( (perl_dl_nonlazy = getenv("PERL_DL_NONLAZY")) != NULL )
+       dl_nonlazy = atoi(perl_dl_nonlazy);
+    if (dl_nonlazy)
+       DLDEBUG(1,PerlIO_printf(PerlIO_stderr(), "DynaLoader bind mode is 'non-lazy'\n"));
+#ifdef DL_LOADONCEONLY
+    if (!dl_loaded_files)
+       dl_loaded_files = newHV(); /* provide cache for dl_*.xs if needed */
 #endif
 }
 
 
 /* SaveError() takes printf style args and saves the result in LastError */
-#ifdef STANDARD_C
 static void
-SaveError(char* pat, ...)
-#else
-/*VARARGS0*/
-static void
-SaveError(pat, va_alist)
-    char *pat;
-    va_dcl
-#endif
+SaveError(CPERLarg_ char* pat, ...)
 {
     va_list args;
+    SV *msv;
     char *message;
-    int len;
+    STRLEN len;
 
-    /* This code is based on croak/warn but I'm not sure where mess() */
-    /* gets its buffer space from! */
+    /* This code is based on croak/warn, see mess() in util.c */
 
-#ifdef I_STDARG
     va_start(args, pat);
-#else
-    va_start(args);
-#endif
-    message = mess(pat, &args);
+    msv = mess(pat, &args);
     va_end(args);
 
-    len = strlen(message) + 1 ;        /* include terminating null char */
+    message = SvPV(msv,len);
+    len++;             /* include terminating null char */
 
     /* Allocate some memory for the error message */
     if (LastError)
         LastError = (char*)saferealloc(LastError, len) ;
     else
-        LastError = safemalloc(len) ;
+        LastError = (char *) safemalloc(len) ;
 
     /* Copy message into LastError (including terminating null char)   */
     strncpy(LastError, message, len) ;
-    DLDEBUG(2,fprintf(stderr,"DynaLoader: stored error msg '%s'\n",LastError));
-}
-
-
-/* prepend underscore to s. write into buf. return buf. */
-char *
-dl_add_underscore(s, buf)
-char *s;
-char *buf;
-{
-    *buf = '_';
-    (void)strcpy(buf + 1, s);
-    return buf;
+    DLDEBUG(2,PerlIO_printf(PerlIO_stderr(), "DynaLoader: stored error msg '%s'\n",LastError));
 }