From b5466f86698e91d19e03cf97d8ea65cf3a5b9f2c Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Sat, 20 Dec 1997 03:13:59 +0000 Subject: Move over the BSDi port files --- src/backend/port/bsdi/Makefile | 34 ------------ src/backend/port/bsdi/dynloader.c | 106 ------------------------------------ src/backend/port/bsdi/port-protos.h | 42 -------------- src/backend/port/dynloader/bsdi.c | 106 ++++++++++++++++++++++++++++++++++++ src/backend/port/dynloader/bsdi.h | 34 ++++++++++++ 5 files changed, 140 insertions(+), 182 deletions(-) delete mode 100644 src/backend/port/bsdi/Makefile delete mode 100644 src/backend/port/bsdi/dynloader.c delete mode 100644 src/backend/port/bsdi/port-protos.h create mode 100644 src/backend/port/dynloader/bsdi.c create mode 100644 src/backend/port/dynloader/bsdi.h (limited to 'src') diff --git a/src/backend/port/bsdi/Makefile b/src/backend/port/bsdi/Makefile deleted file mode 100644 index 4b751ae68c1..00000000000 --- a/src/backend/port/bsdi/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile-- -# Makefile for port/bsdi -# -# IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.6 1997/12/20 00:25:19 scrappy Exp $ -# -#------------------------------------------------------------------------- - -SRCDIR = ../../.. -include ../../../Makefile.global - -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) - -OBJS = dynloader.o - -all: SUBSYS.o - -SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) - -depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend - -clean: - rm -f SUBSYS.o $(OBJS) - -ifeq (depend,$(wildcard depend)) -include depend -endif - diff --git a/src/backend/port/bsdi/dynloader.c b/src/backend/port/bsdi/dynloader.c deleted file mode 100644 index 9754236a20b..00000000000 --- a/src/backend/port/bsdi/dynloader.c +++ /dev/null @@ -1,106 +0,0 @@ -/*------------------------------------------------------------------------- - * - * dynloader.c-- - * Dynamic Loader for Postgres for Linux, generated from those for - * Ultrix. - * - * You need to install the dld library on your Linux system! - * - * Copyright (c) 1994, Regents of the University of California - * - * - * IDENTIFICATION - * /usr/local/devel/pglite/cvs/src/backend/port/linux/dynloader.c,v 1.1.1.1 1994/11/07 05:19:37 andrew Exp - * - *------------------------------------------------------------------------- - */ -#ifdef PRE_BSDI_2_1 -#include -#include -#include "postgres.h" -#include "port-protos.h" -#include "utils/elog.h" -#include "fmgr.h" - -extern char pg_pathname[]; - -void * -pg_dlopen(char *filename) -{ - static int dl_initialized = 0; - - /* - * initializes the dynamic loader with the executable's pathname. - * (only needs to do this the first time pg_dlopen is called.) - */ - if (!dl_initialized) - { - if (dld_init(dld_find_executable(pg_pathname))) - { - return NULL; - } - - /* - * if there are undefined symbols, we want dl to search from the - * following libraries also. - */ - dl_initialized = 1; - } - - /* - * link the file, then check for undefined symbols! - */ - if (dld_link(filename)) - { - return NULL; - } - - /* - * If undefined symbols: try to link with the C and math libraries! - * This could be smarter, if the dynamic linker was able to handle - * shared libs! - */ - if (dld_undefined_sym_count > 0) - { - if (dld_link("/usr/lib/libc.a")) - { - elog(NOTICE, "dld: Cannot link C library!"); - return NULL; - } - if (dld_undefined_sym_count > 0) - { - if (dld_link("/usr/lib/libm.a")) - { - elog(NOTICE, "dld: Cannot link math library!"); - return NULL; - } - if (dld_undefined_sym_count > 0) - { - int count = dld_undefined_sym_count; - char **list = dld_list_undefined_sym(); - - /* list the undefined symbols, if any */ - elog(NOTICE, "dld: Undefined:"); - do - { - elog(NOTICE, " %s", *list); - list++; - count--; - } while (count > 0); - - dld_unlink_by_file(filename, 1); - return NULL; - } - } - } - - return (void *) strdup(filename); -} - -char * -pg_dlerror() -{ - return dld_strerror(dld_errno); -} - -#endif diff --git a/src/backend/port/bsdi/port-protos.h b/src/backend/port/bsdi/port-protos.h deleted file mode 100644 index 579706d0bb8..00000000000 --- a/src/backend/port/bsdi/port-protos.h +++ /dev/null @@ -1,42 +0,0 @@ -/*------------------------------------------------------------------------- - * - * port-protos.h-- - * port-specific prototypes for SunOS 4 - * - * - * Copyright (c) 1994, Regents of the University of California - * - * port-protos.h,v 1.2 1995/05/25 22:51:03 andrew Exp - * - *------------------------------------------------------------------------- - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -/* - * Externals in libc that need prototypes (or at least declarations) - */ - -extern char *ecvt(double, int, int *, int *); -extern char *fcvt(double, int, int *, int *); - - -#include "fmgr.h" /* for func_ptr */ -#include "utils/dynamic_loader.h" - -/* dynloader.c */ - -#ifndef PRE_BSDI_2_1 -#include -#define pg_dlopen(f) dlopen(f, 1) -#define pg_dlsym dlsym -#define pg_dlclose dlclose -#define pg_dlerror dlerror -#else -#define pg_dlsym(handle, funcname) ((func_ptr) dld_get_func((funcname))) -#define pg_dlclose(handle) ({ dld_unlink_by_file(handle, 1); free(handle); }) -#endif - -/* port.c */ - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c new file mode 100644 index 00000000000..9754236a20b --- /dev/null +++ b/src/backend/port/dynloader/bsdi.c @@ -0,0 +1,106 @@ +/*------------------------------------------------------------------------- + * + * dynloader.c-- + * Dynamic Loader for Postgres for Linux, generated from those for + * Ultrix. + * + * You need to install the dld library on your Linux system! + * + * Copyright (c) 1994, Regents of the University of California + * + * + * IDENTIFICATION + * /usr/local/devel/pglite/cvs/src/backend/port/linux/dynloader.c,v 1.1.1.1 1994/11/07 05:19:37 andrew Exp + * + *------------------------------------------------------------------------- + */ +#ifdef PRE_BSDI_2_1 +#include +#include +#include "postgres.h" +#include "port-protos.h" +#include "utils/elog.h" +#include "fmgr.h" + +extern char pg_pathname[]; + +void * +pg_dlopen(char *filename) +{ + static int dl_initialized = 0; + + /* + * initializes the dynamic loader with the executable's pathname. + * (only needs to do this the first time pg_dlopen is called.) + */ + if (!dl_initialized) + { + if (dld_init(dld_find_executable(pg_pathname))) + { + return NULL; + } + + /* + * if there are undefined symbols, we want dl to search from the + * following libraries also. + */ + dl_initialized = 1; + } + + /* + * link the file, then check for undefined symbols! + */ + if (dld_link(filename)) + { + return NULL; + } + + /* + * If undefined symbols: try to link with the C and math libraries! + * This could be smarter, if the dynamic linker was able to handle + * shared libs! + */ + if (dld_undefined_sym_count > 0) + { + if (dld_link("/usr/lib/libc.a")) + { + elog(NOTICE, "dld: Cannot link C library!"); + return NULL; + } + if (dld_undefined_sym_count > 0) + { + if (dld_link("/usr/lib/libm.a")) + { + elog(NOTICE, "dld: Cannot link math library!"); + return NULL; + } + if (dld_undefined_sym_count > 0) + { + int count = dld_undefined_sym_count; + char **list = dld_list_undefined_sym(); + + /* list the undefined symbols, if any */ + elog(NOTICE, "dld: Undefined:"); + do + { + elog(NOTICE, " %s", *list); + list++; + count--; + } while (count > 0); + + dld_unlink_by_file(filename, 1); + return NULL; + } + } + } + + return (void *) strdup(filename); +} + +char * +pg_dlerror() +{ + return dld_strerror(dld_errno); +} + +#endif diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h new file mode 100644 index 00000000000..02d9c0aae88 --- /dev/null +++ b/src/backend/port/dynloader/bsdi.h @@ -0,0 +1,34 @@ +/*------------------------------------------------------------------------- + * + * port-protos.h-- + * port-specific prototypes for SunOS 4 + * + * + * Copyright (c) 1994, Regents of the University of California + * + * port-protos.h,v 1.2 1995/05/25 22:51:03 andrew Exp + * + *------------------------------------------------------------------------- + */ +#ifndef PORT_PROTOS_H +#define PORT_PROTOS_H + +#include "fmgr.h" /* for func_ptr */ +#include "utils/dynamic_loader.h" + +/* dynloader.c */ + +#ifndef PRE_BSDI_2_1 +#include +#define pg_dlopen(f) dlopen(f, 1) +#define pg_dlsym dlsym +#define pg_dlclose dlclose +#define pg_dlerror dlerror +#else +#define pg_dlsym(handle, funcname) ((func_ptr) dld_get_func((funcname))) +#define pg_dlclose(handle) ({ dld_unlink_by_file(handle, 1); free(handle); }) +#endif + +/* port.c */ + +#endif /* PORT_PROTOS_H */ -- cgit v1.2.3