diff options
Diffstat (limited to 'src/backend/port/linux')
| -rw-r--r-- | src/backend/port/linux/dynloader.c | 128 | ||||
| -rw-r--r-- | src/backend/port/linux/port-protos.h | 32 | ||||
| -rw-r--r-- | src/backend/port/linux/port.c | 4 |
3 files changed, 87 insertions, 77 deletions
diff --git a/src/backend/port/linux/dynloader.c b/src/backend/port/linux/dynloader.c index a3b551b6f95..adb13b40194 100644 --- a/src/backend/port/linux/dynloader.c +++ b/src/backend/port/linux/dynloader.c @@ -1,16 +1,16 @@ /*------------------------------------------------------------------------- * * dynloader.c-- - * Dynamic Loader for Postgres for Linux, generated from those for - * Ultrix. + * Dynamic Loader for Postgres for Linux, generated from those for + * Ultrix. * - * You need to install the dld library on your Linux system! + * You need to install the dld library on your Linux system! * * Copyright (c) 1994, Regents of the University of California * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/dynloader.c,v 1.2 1997/02/06 08:39:40 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/dynloader.c,v 1.3 1997/09/07 04:46:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,82 +23,92 @@ #include "utils/elog.h" #include "fmgr.h" -extern char pg_pathname[]; +extern char pg_pathname[]; -void * +void * pg_dlopen(char *filename) { #ifndef HAVE_DLD_H - elog(WARN, "dynamic load not supported"); - return(NULL); + elog(WARN, "dynamic load not supported"); + return (NULL); #else - static int dl_initialized= 0; + 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. + * initializes the dynamic loader with the executable's pathname. + * (only needs to do this the first time pg_dlopen is called.) */ - dl_initialized= 1; - } - - /* - * link the file, then check for undefined symbols! - */ - if (dld_link(filename)) { - return NULL; - } + if (!dl_initialized) + { + if (dld_init(dld_find_executable(pg_pathname))) + { + 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 there are undefined symbols, we want dl to search from the + * following libraries also. + */ + dl_initialized = 1; } - if(dld_undefined_sym_count > 0) { - if (dld_link("/usr/lib/libm.a")) { - elog(NOTICE, "dld: Cannot link math library!"); + + /* + * link the file, then check for undefined symbols! + */ + if (dld_link(filename)) + { 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); + /* + * 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(); - dld_unlink_by_file(filename, 1); - return NULL; - } + /* 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); + return (void *) strdup(filename); #endif } -char * +char * pg_dlerror() { #ifndef HAVE_DLD_H - return("dynaloader unspported"); + return ("dynaloader unspported"); #else - return dld_strerror(dld_errno); + return dld_strerror(dld_errno); #endif } diff --git a/src/backend/port/linux/port-protos.h b/src/backend/port/linux/port-protos.h index 76f02b48fe9..f5af9beecee 100644 --- a/src/backend/port/linux/port-protos.h +++ b/src/backend/port/linux/port-protos.h @@ -1,19 +1,19 @@ /*------------------------------------------------------------------------- * * port-protos.h-- - * port-specific prototypes for SunOS 4 + * port-specific prototypes for SunOS 4 * * * Copyright (c) 1994, Regents of the University of California * - * $Id: port-protos.h,v 1.2 1997/02/06 08:39:53 scrappy Exp $ + * $Id: port-protos.h,v 1.3 1997/09/07 04:46:15 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PORT_PROTOS_H #define PORT_PROTOS_H -#include "fmgr.h" /* for func_ptr */ +#include "fmgr.h" /* for func_ptr */ #include "utils/dynamic_loader.h" #ifdef LINUX_ELF #include "dlfcn.h" @@ -22,21 +22,21 @@ /* dynloader.c */ #ifndef LINUX_ELF -# ifndef HAVE_DLD_H -#define pg_dlsym(handle, funcname) (NULL) -# define pg_dlclose(handle) ({}) -# 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 +#ifndef HAVE_DLD_H +#define pg_dlsym(handle, funcname) (NULL) +#define pg_dlclose(handle) ({}) #else -/* #define pg_dlopen(f) dlopen(f, 1) */ -#define pg_dlopen(f) dlopen(f, 2) -#define pg_dlsym dlsym -#define pg_dlclose dlclose -#define pg_dlerror dlerror +#define pg_dlsym(handle, funcname) ((func_ptr) dld_get_func((funcname))) +#define pg_dlclose(handle) ({ dld_unlink_by_file(handle, 1); free(handle); }) +#endif +#else +/* #define pg_dlopen(f) dlopen(f, 1) */ +#define pg_dlopen(f) dlopen(f, 2) +#define pg_dlsym dlsym +#define pg_dlclose dlclose +#define pg_dlerror dlerror #endif /* port.c */ -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/linux/port.c b/src/backend/port/linux/port.c index e4c5edfb9e5..942340f40fd 100644 --- a/src/backend/port/linux/port.c +++ b/src/backend/port/linux/port.c @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------- * * port.c-- - * Linux-specific routines + * Linux-specific routines * * Copyright (c) 1994, Regents of the University of California * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/port.c,v 1.1.1.1 1996/07/09 06:21:44 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/port.c,v 1.2 1997/09/07 04:46:18 momjian Exp $ * *------------------------------------------------------------------------- */ |