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 71e11906e52d14f78c3c05fd413dd44620fde9fd..773e3b7b407ad5438ef8a4542f0b4412a4fa7a14 100644 (file)
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -61,7 +61,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;
@@ -78,7 +78,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;
@@ -93,7 +93,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);
@@ -104,8 +104,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 5c80f59c98615358aeb1d8045c8aa6648fe83be9..5197c911e2cfd3abf17cb947118f2e4f841d4f22 100644 (file)
--- a/src/backend/port/dynloader/netbsd.c
+++ b/src/backend/port/dynloader/netbsd.c
@@ -82,10 +82,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 != '_')
@@ -93,6 +93,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 196245b30892dbbc7853a5799d7ebafc7c6cbdce..d4e92d75aa294809ff594ae40b938d10a4211f5c 100644 (file)
--- a/src/backend/port/dynloader/openbsd.c
+++ b/src/backend/port/dynloader/openbsd.c
@@ -61,7 +61,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;
@@ -78,14 +78,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 != '_')
@@ -93,6 +93,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);
@@ -103,8 +104,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
 }