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 b90d5beb04d5394f619070622f183fa39f419418..b4000af489ade20adb0c94fcd872e73f9e7f04b0 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 8ec29f2720d19c4e5812c889fee27af9a8ddbfce..99054d0d6ca7844050a6abdbabb285730b67d332 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 4ad018e4b4b18b853f7b008b9a8893f1a421719b..45cf4fd35f6a6056caf8443c1c03614fefe7367e 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
 }