[patch] Proposed fix

parrot-TT2107a.patch (text/plain), 1.27 KB, created by Martin von Gagern on 2011-08-02 14:10:41 UTC

Fix dynloading of libraries from exact file name.

This should fix a problem introduced by 91161252e461284a causing
loadlib to fail if its argument is a full file name including
extension and all, and not located in the parrot runtime directory.

2011-08-02 Martin von Gagern

References:
http://trac.parrot.org/parrot/ticket/2107
https://bugs.gentoo.org/377379
https://bugs.gentoo.org/349297
https://github.com/parrot/parrot/commit/91161252e461284a1077#L1R350

Index: parrot-3.6.0/src/dynext.c
===================================================================
--- parrot-3.6.0.orig/src/dynext.c
+++ parrot-3.6.0/src/dynext.c
@@ -346,7 +346,7 @@ get_path(PARROT_INTERP, ARGIN_NULLOK(STR
 
     /* And on cygwin replace a leading "lib" by "cyg". */
 #ifdef __CYGWIN__
-    if (!STRING_length(lib) >= 3 && memcmp(lib->strstart, "lib", 3) == 0) {
+    if (STRING_length(lib) >= 3 && memcmp(lib->strstart, "lib", 3) == 0) {
         path = Parrot_str_concat(interp, CONST_STRING(interp, "cyg"),
             STRING_substr(interp, lib, 3, lib->strlen - 3));
 
@@ -357,7 +357,7 @@ get_path(PARROT_INTERP, ARGIN_NULLOK(STR
     }
 #endif
 
-    if (!STRING_length(lib)) {
+    if (STRING_length(lib)) {
         *handle = dlopen_string(interp, flags, lib);
         if (*handle)
             return lib;