From cbe5f73aa079cbda483fe5e6d82a812124b2ff35 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 10 Oct 2000 21:08:04 +0000 Subject: Some dynloader files missed the template rename a while back. --- src/backend/port/dynloader/alpha.c | 4 -- src/backend/port/dynloader/alpha.h | 36 ------------ src/backend/port/dynloader/bsd.c | 107 ----------------------------------- src/backend/port/dynloader/bsd.h | 49 ---------------- src/backend/port/dynloader/openbsd.c | 107 +++++++++++++++++++++++++++++++++++ src/backend/port/dynloader/openbsd.h | 49 ++++++++++++++++ src/backend/port/dynloader/osf.c | 4 ++ src/backend/port/dynloader/osf.h | 36 ++++++++++++ 8 files changed, 196 insertions(+), 196 deletions(-) delete mode 100644 src/backend/port/dynloader/alpha.c delete mode 100644 src/backend/port/dynloader/alpha.h delete mode 100644 src/backend/port/dynloader/bsd.c delete mode 100644 src/backend/port/dynloader/bsd.h create mode 100644 src/backend/port/dynloader/openbsd.c create mode 100644 src/backend/port/dynloader/openbsd.h create mode 100644 src/backend/port/dynloader/osf.c create mode 100644 src/backend/port/dynloader/osf.h diff --git a/src/backend/port/dynloader/alpha.c b/src/backend/port/dynloader/alpha.c deleted file mode 100644 index 92007c6af1e..00000000000 --- a/src/backend/port/dynloader/alpha.c +++ /dev/null @@ -1,4 +0,0 @@ -/* Dummy file used for nothing at this point - * - * see alpha.h - */ diff --git a/src/backend/port/dynloader/alpha.h b/src/backend/port/dynloader/alpha.h deleted file mode 100644 index 9fee0463401..00000000000 --- a/src/backend/port/dynloader/alpha.h +++ /dev/null @@ -1,36 +0,0 @@ -/*------------------------------------------------------------------------- - * - * alpha.h - * prototypes for OSF/1-specific routines - * - * - * Portions Copyright (c) 1996-2000, PostgreSQL, Inc - * Portions Copyright (c) 1994, Regents of the University of California - * - * $Id: alpha.h,v 1.5 2000/05/28 17:56:02 tgl Exp $ - * - *------------------------------------------------------------------------- - */ - -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include -#include "utils/dynamic_loader.h" - -/* dynloader.c */ - -/* - * Dynamic Loader on Alpha OSF/1.x - * - * this dynamic loader uses the system dynamic loading interface for shared - * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared - * library as the file to be dynamically loaded. - * - */ -#define pg_dlopen(f) dlopen(f, RTLD_LAZY) -#define pg_dlsym(h, f) ((PGFunction) dlsym(h, f)) -#define pg_dlclose(h) dlclose(h) -#define pg_dlerror() dlerror() - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/bsd.c b/src/backend/port/dynloader/bsd.c deleted file mode 100644 index b77dea182f7..00000000000 --- a/src/backend/port/dynloader/bsd.c +++ /dev/null @@ -1,107 +0,0 @@ -/*- - * Portions Copyright (c) 1996-2000, PostgreSQL, Inc - * Portions Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91"; - -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include "link.h" -#include - -#include -#include - -#include "dynloader.h" - -static char error_message[BUFSIZ]; - -char * -BSD44_derived_dlerror(void) -{ - static char ret[BUFSIZ]; - - strcpy(ret, error_message); - error_message[0] = 0; - return (ret[0] == 0) ? (char *) NULL : ret; -} - -void * -BSD44_derived_dlopen(const char *file, int num) -{ -#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__)) - sprintf(error_message, "dlopen (%s) not supported", file); - return NULL; -#else - void *vp; - - if ((vp = dlopen((char *) file, num)) == (void *) NULL) - sprintf(error_message, "dlopen (%s) failed", file); - return vp; -#endif -} - -void * -BSD44_derived_dlsym(void *handle, const char *name) -{ -#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__)) - sprintf(error_message, "dlsym (%s) failed", name); - return NULL; -#elif defined(__ELF__) - return dlsym(handle, name); -#else - void *vp; - char buf[BUFSIZ]; - - if (*name != '_') - { - sprintf(buf, "_%s", name); - name = buf; - } - if ((vp = dlsym(handle, (char *) name)) == (void *) NULL) - sprintf(error_message, "dlsym (%s) failed", name); - return vp; -#endif -} - -void -BSD44_derived_dlclose(void *handle) -{ -#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__)) -#else - dlclose(handle); -#endif -} diff --git a/src/backend/port/dynloader/bsd.h b/src/backend/port/dynloader/bsd.h deleted file mode 100644 index 1367382f976..00000000000 --- a/src/backend/port/dynloader/bsd.h +++ /dev/null @@ -1,49 +0,0 @@ -/*------------------------------------------------------------------------- - * - * port_protos.h - * port-specific prototypes for NetBSD 1.0 - * - * - * Portions Copyright (c) 1996-2000, PostgreSQL, Inc - * Portions Copyright (c) 1994, Regents of the University of California - * - * $Id: bsd.h,v 1.6 2000/01/26 05:56:44 momjian Exp $ - * - *------------------------------------------------------------------------- - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include -#include -#include "link.h" - -#include "postgres.h" - -#include "fmgr.h" -#include "utils/dynamic_loader.h" - -/* dynloader.c */ -/* - * Dynamic Loader on NetBSD 1.0. - * - * this dynamic loader uses the system dynamic loading interface for shared - * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared - * library as the file to be dynamically loaded. - * - * agc - I know this is all a bit crufty, but it does work, is fairly - * portable, and works (the stipulation that the d.l. function must - * begin with an underscore is fairly tricky, and some versions of - * NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.) - */ -#define pg_dlopen(f) BSD44_derived_dlopen(f, 1) -#define pg_dlsym BSD44_derived_dlsym -#define pg_dlclose BSD44_derived_dlclose -#define pg_dlerror BSD44_derived_dlerror - -char *BSD44_derived_dlerror(void); -void *BSD44_derived_dlopen(const char *filename, int num); -void *BSD44_derived_dlsym(void *handle, const char *name); -void BSD44_derived_dlclose(void *handle); - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c new file mode 100644 index 00000000000..b77dea182f7 --- /dev/null +++ b/src/backend/port/dynloader/openbsd.c @@ -0,0 +1,107 @@ +/*- + * Portions Copyright (c) 1996-2000, PostgreSQL, Inc + * Portions Copyright (c) 1990 The Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91"; + +#endif /* LIBC_SCCS and not lint */ + +#include +#include +#include "link.h" +#include + +#include +#include + +#include "dynloader.h" + +static char error_message[BUFSIZ]; + +char * +BSD44_derived_dlerror(void) +{ + static char ret[BUFSIZ]; + + strcpy(ret, error_message); + error_message[0] = 0; + return (ret[0] == 0) ? (char *) NULL : ret; +} + +void * +BSD44_derived_dlopen(const char *file, int num) +{ +#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__)) + sprintf(error_message, "dlopen (%s) not supported", file); + return NULL; +#else + void *vp; + + if ((vp = dlopen((char *) file, num)) == (void *) NULL) + sprintf(error_message, "dlopen (%s) failed", file); + return vp; +#endif +} + +void * +BSD44_derived_dlsym(void *handle, const char *name) +{ +#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__)) + sprintf(error_message, "dlsym (%s) failed", name); + return NULL; +#elif defined(__ELF__) + return dlsym(handle, name); +#else + void *vp; + char buf[BUFSIZ]; + + if (*name != '_') + { + sprintf(buf, "_%s", name); + name = buf; + } + if ((vp = dlsym(handle, (char *) name)) == (void *) NULL) + sprintf(error_message, "dlsym (%s) failed", name); + return vp; +#endif +} + +void +BSD44_derived_dlclose(void *handle) +{ +#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__)) +#else + dlclose(handle); +#endif +} diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h new file mode 100644 index 00000000000..b24857c550a --- /dev/null +++ b/src/backend/port/dynloader/openbsd.h @@ -0,0 +1,49 @@ +/*------------------------------------------------------------------------- + * + * port_protos.h + * port-specific prototypes for NetBSD 1.0 + * + * + * Portions Copyright (c) 1996-2000, PostgreSQL, Inc + * Portions Copyright (c) 1994, Regents of the University of California + * + * $Id: openbsd.h,v 1.1 2000/10/10 21:08:04 petere Exp $ + * + *------------------------------------------------------------------------- + */ +#ifndef PORT_PROTOS_H +#define PORT_PROTOS_H + +#include +#include +#include "link.h" + +#include "postgres.h" + +#include "fmgr.h" +#include "utils/dynamic_loader.h" + +/* dynloader.c */ +/* + * Dynamic Loader on NetBSD 1.0. + * + * this dynamic loader uses the system dynamic loading interface for shared + * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared + * library as the file to be dynamically loaded. + * + * agc - I know this is all a bit crufty, but it does work, is fairly + * portable, and works (the stipulation that the d.l. function must + * begin with an underscore is fairly tricky, and some versions of + * NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.) + */ +#define pg_dlopen(f) BSD44_derived_dlopen(f, 1) +#define pg_dlsym BSD44_derived_dlsym +#define pg_dlclose BSD44_derived_dlclose +#define pg_dlerror BSD44_derived_dlerror + +char *BSD44_derived_dlerror(void); +void *BSD44_derived_dlopen(const char *filename, int num); +void *BSD44_derived_dlsym(void *handle, const char *name); +void BSD44_derived_dlclose(void *handle); + +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/osf.c b/src/backend/port/dynloader/osf.c new file mode 100644 index 00000000000..92007c6af1e --- /dev/null +++ b/src/backend/port/dynloader/osf.c @@ -0,0 +1,4 @@ +/* Dummy file used for nothing at this point + * + * see alpha.h + */ diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h new file mode 100644 index 00000000000..f00f8992fcf --- /dev/null +++ b/src/backend/port/dynloader/osf.h @@ -0,0 +1,36 @@ +/*------------------------------------------------------------------------- + * + * alpha.h + * prototypes for OSF/1-specific routines + * + * + * Portions Copyright (c) 1996-2000, PostgreSQL, Inc + * Portions Copyright (c) 1994, Regents of the University of California + * + * $Id: osf.h,v 1.1 2000/10/10 21:08:04 petere Exp $ + * + *------------------------------------------------------------------------- + */ + +#ifndef PORT_PROTOS_H +#define PORT_PROTOS_H + +#include +#include "utils/dynamic_loader.h" + +/* dynloader.c */ + +/* + * Dynamic Loader on Alpha OSF/1.x + * + * this dynamic loader uses the system dynamic loading interface for shared + * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared + * library as the file to be dynamically loaded. + * + */ +#define pg_dlopen(f) dlopen(f, RTLD_LAZY) +#define pg_dlsym(h, f) ((PGFunction) dlsym(h, f)) +#define pg_dlclose(h) dlclose(h) +#define pg_dlerror() dlerror() + +#endif /* PORT_PROTOS_H */ -- cgit v1.2.3