Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit29351a0

Browse files
committed
Remove obsolete openbsd dynloader code
dlopen() has been documented since OpenBSD 2.0 (1996).
1 parent2db1905 commit29351a0

File tree

2 files changed

+6
-125
lines changed

2 files changed

+6
-125
lines changed

‎src/backend/port/dynloader/openbsd.c

Lines changed: 2 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,7 @@
11
/*
2-
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
3-
* Portions Copyright (c) 1990 The Regents of the University of California.
4-
* All rights reserved.
5-
*
62
* src/backend/port/dynloader/openbsd.c
73
*
8-
* Redistribution and use in source and binary forms, with or without
9-
* modification, are permitted provided that the following conditions
10-
* are met:
11-
* 1. Redistributions of source code must retain the above copyright
12-
* notice, this list of conditions and the following disclaimer.
13-
* 2. Redistributions in binary form must reproduce the above copyright
14-
* notice, this list of conditions and the following disclaimer in the
15-
* documentation and/or other materials provided with the distribution.
16-
* 3. Neither the name of the University nor the names of its contributors
17-
* may be used to endorse or promote products derived from this software
18-
* without specific prior written permission.
4+
* Dummy file used for nothing at this point
195
*
20-
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
21-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23-
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
24-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30-
* SUCH DAMAGE.
6+
* see openbsd.h
317
*/
32-
33-
#if defined(LIBC_SCCS)&& !defined(lint)
34-
staticcharsccsid[]="@(#)dl.c5.4 (Berkeley) 2/23/91";
35-
#endif/* LIBC_SCCS and not lint */
36-
37-
#include"postgres.h"
38-
39-
#include<nlist.h>
40-
#include<link.h>
41-
#include<dlfcn.h>
42-
43-
#include"dynloader.h"
44-
45-
staticcharerror_message[BUFSIZ];
46-
47-
char*
48-
BSD44_derived_dlerror(void)
49-
{
50-
staticcharret[BUFSIZ];
51-
52-
strcpy(ret,error_message);
53-
error_message[0]=0;
54-
return (ret[0]==0) ?NULL :ret;
55-
}
56-
57-
void*
58-
BSD44_derived_dlopen(constchar*file,intnum)
59-
{
60-
#if !defined(HAVE_DLOPEN)
61-
snprintf(error_message,sizeof(error_message),
62-
"dlopen (%s) not supported",file);
63-
returnNULL;
64-
#else
65-
void*vp;
66-
67-
if ((vp=dlopen((char*)file,num))==NULL)
68-
snprintf(error_message,sizeof(error_message),
69-
"dlopen (%s) failed: %s",file,dlerror());
70-
returnvp;
71-
#endif
72-
}
73-
74-
void*
75-
BSD44_derived_dlsym(void*handle,constchar*name)
76-
{
77-
#if !defined(HAVE_DLOPEN)
78-
snprintf(error_message,sizeof(error_message),
79-
"dlsym (%s) failed",name);
80-
returnNULL;
81-
#else
82-
void*vp;
83-
84-
#ifndef__ELF__
85-
charbuf[BUFSIZ];
86-
87-
if (*name!='_')
88-
{
89-
snprintf(buf,sizeof(buf),"_%s",name);
90-
name=buf;
91-
}
92-
#endif/* !__ELF__ */
93-
if ((vp=dlsym(handle, (char*)name))==NULL)
94-
snprintf(error_message,sizeof(error_message),
95-
"dlsym (%s) failed",name);
96-
returnvp;
97-
#endif
98-
}
99-
100-
void
101-
BSD44_derived_dlclose(void*handle)
102-
{
103-
#if defined(HAVE_DLOPEN)
104-
dlclose(handle);
105-
#endif
106-
}

‎src/backend/port/dynloader/openbsd.h

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,10 @@
1313
#ifndefPORT_PROTOS_H
1414
#definePORT_PROTOS_H
1515

16-
#include<nlist.h>
17-
#include<link.h>
1816
#include<dlfcn.h>
1917

2018
#include"utils/dynamic_loader.h"/* pgrminclude ignore */
2119

22-
/*
23-
* Dynamic Loader on NetBSD 1.0.
24-
*
25-
* this dynamic loader uses the system dynamic loading interface for shared
26-
* libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
27-
* library as the file to be dynamically loaded.
28-
*
29-
* agc - I know this is all a bit crufty, but it does work, is fairly
30-
* portable, and works (the stipulation that the d.l. function must
31-
* begin with an underscore is fairly tricky, and some versions of
32-
* NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
33-
*/
34-
3520
/*
3621
* In some older systems, the RTLD_NOW flag isn't defined and the mode
3722
* argument to dlopen must always be 1. The RTLD_GLOBAL flag is wanted
@@ -45,14 +30,9 @@
4530
#defineRTLD_GLOBAL 0
4631
#endif
4732

48-
#definepg_dlopen(f) BSD44_derived_dlopen((f), RTLD_NOW | RTLD_GLOBAL)
49-
#definepg_dlsym BSD44_derived_dlsym
50-
#definepg_dlclose BSD44_derived_dlclose
51-
#definepg_dlerror BSD44_derived_dlerror
52-
53-
char*BSD44_derived_dlerror(void);
54-
void*BSD44_derived_dlopen(constchar*filename,intnum);
55-
void*BSD44_derived_dlsym(void*handle,constchar*name);
56-
voidBSD44_derived_dlclose(void*handle);
33+
#definepg_dlopen(f)dlopen((f), RTLD_NOW | RTLD_GLOBAL)
34+
#definepg_dlsymdlsym
35+
#definepg_dlclosedlclose
36+
#definepg_dlerrordlerror
5737

5838
#endif/* PORT_PROTOS_H */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp