Modernize dlopen interface code for FreeBSD and OpenBSD.

Remove the hard-wired assumption that __mips__ (and only __mips__) lacks
dlopen in FreeBSD and OpenBSD.  This assumption is outdated at least for
OpenBSD, as per report from an anonymous 9.1 tester.  We can perfectly well
use HAVE_DLOPEN instead to decide which code to use.

Some other cosmetic adjustments to make freebsd.c, netbsd.c, and openbsd.c
exactly alike.

diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c
index 4e634ef58867cba6a6cd1cdcdaf780e8ed150eac..ada6aed7a3d2b2ece9e3f77e8a67860eadf8aab8 100644 (file)
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -57,7 +57,7 @@ BSD44_derived_dlerror(void)
 void *
 BSD44_derived_dlopen(const char *file, int num)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
    snprintf(error_message, sizeof(error_message),
             "dlopen (%s) not supported", file);
    return NULL;
@@ -74,7 +74,7 @@ BSD44_derived_dlopen(const char *file, int num)
 void *
 BSD44_derived_dlsym(void *handle, const char *name)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
    snprintf(error_message, sizeof(error_message),
             "dlsym (%s) failed", name);
    return NULL;
@@ -89,7 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
        snprintf(buf, sizeof(buf), "_%s", name);
        name = buf;
    }
-#endif
+#endif /* !__ELF__ */
    if ((vp = dlsym(handle, (char *) name)) == NULL)
        snprintf(error_message, sizeof(error_message),
                 "dlsym (%s) failed", name);
@@ -100,8 +100,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 void
 BSD44_derived_dlclose(void *handle)
 {
-#if defined(__mips__)
-#else
+#if defined(HAVE_DLOPEN)
    dlclose(handle);
 #endif
 }

diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c
index 698986e0a1614a00df2ce2232ba63ed194508058..001e4ee689609a65c5ab7690e4364d2a0b98e028 100644 (file)
--- a/src/backend/port/dynloader/netbsd.c
+++ b/src/backend/port/dynloader/netbsd.c
@@ -78,10 +78,10 @@ BSD44_derived_dlsym(void *handle, const char *name)
    snprintf(error_message, sizeof(error_message),
             "dlsym (%s) failed", name);
    return NULL;
-#elif defined(__ELF__)
-   return dlsym(handle, name);
 #else
    void       *vp;
+
+#ifndef __ELF__
    char        buf[BUFSIZ];
 
    if (*name != '_')
@@ -89,6 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
        snprintf(buf, sizeof(buf), "_%s", name);
        name = buf;
    }
+#endif /* !__ELF__ */
    if ((vp = dlsym(handle, (char *) name)) == NULL)
        snprintf(error_message, sizeof(error_message),
                 "dlsym (%s) failed", name);

diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c
index 1bd6c3550deec429e5f0d0dd1a5fd0efbd58b631..e09199feb8a593d32a8466ce604b861d8453a2a5 100644 (file)
--- a/src/backend/port/dynloader/openbsd.c
+++ b/src/backend/port/dynloader/openbsd.c
@@ -57,7 +57,7 @@ BSD44_derived_dlerror(void)
 void *
 BSD44_derived_dlopen(const char *file, int num)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
    snprintf(error_message, sizeof(error_message),
             "dlopen (%s) not supported", file);
    return NULL;
@@ -74,14 +74,14 @@ BSD44_derived_dlopen(const char *file, int num)
 void *
 BSD44_derived_dlsym(void *handle, const char *name)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
    snprintf(error_message, sizeof(error_message),
             "dlsym (%s) failed", name);
    return NULL;
-#elif defined(__ELF__)
-   return dlsym(handle, name);
 #else
    void       *vp;
+
+#ifndef __ELF__
    char        buf[BUFSIZ];
 
    if (*name != '_')
@@ -89,6 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
        snprintf(buf, sizeof(buf), "_%s", name);
        name = buf;
    }
+#endif /* !__ELF__ */
    if ((vp = dlsym(handle, (char *) name)) == NULL)
        snprintf(error_message, sizeof(error_message),
                 "dlsym (%s) failed", name);
@@ -99,8 +100,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 void
 BSD44_derived_dlclose(void *handle)
 {
-#if defined(__mips__)
-#else
+#if defined(HAVE_DLOPEN)
    dlclose(handle);
 #endif
 }