1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From: Agathe Porte <gagath@debian.org>
Date: Fri, 3 Oct 2025 14:58:57 +0200
Subject: socket: fix multiple accept4/accept6 definitions
The library seems to define socket_*_makenonblocking multiple times,
with different implementations. It seems that the calls with
setcloseonexec suffix should implement the corresponding functions
instead.
Signed-off-by: Agathe Porte <gagath@debian.org>
---
socket/socket_accept4_makenonblocking_setcloseonexec.c | 2 +-
socket/socket_accept4_setcloseonexec.c | 2 +-
socket/socket_accept6_makenonblocking_setcloseonexec.c | 2 +-
socket/socket_accept6_setcloseonexec.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/socket/socket_accept4_makenonblocking_setcloseonexec.c b/socket/socket_accept4_makenonblocking_setcloseonexec.c
index d434329..fe18153 100644
--- a/socket/socket_accept4_makenonblocking_setcloseonexec.c
+++ b/socket/socket_accept4_makenonblocking_setcloseonexec.c
@@ -7,6 +7,6 @@
#include "windoze.h"
#include "socket.h"
-int socket_accept4_makenonblocking(int s,char ip[4],uint16 *port) {
+int socket_accept4_makenonblocking_setcloseonexec(int s,char ip[4],uint16 *port) {
return socket_accept4_flags(s,ip,port,SOCKET_NONBLOCK | SOCKET_CLOEXEC);
}
diff --git a/socket/socket_accept4_setcloseonexec.c b/socket/socket_accept4_setcloseonexec.c
index ee52223..03bc4c6 100644
--- a/socket/socket_accept4_setcloseonexec.c
+++ b/socket/socket_accept4_setcloseonexec.c
@@ -7,6 +7,6 @@
#include "windoze.h"
#include "socket.h"
-int socket_accept4_makenonblocking(int s,char ip[4],uint16 *port) {
+int socket_accept4_setcloseonexec(int s,char ip[4],uint16 *port) {
return socket_accept4_flags(s,ip,port,SOCKET_CLOEXEC);
}
diff --git a/socket/socket_accept6_makenonblocking_setcloseonexec.c b/socket/socket_accept6_makenonblocking_setcloseonexec.c
index 1098320..207021f 100644
--- a/socket/socket_accept6_makenonblocking_setcloseonexec.c
+++ b/socket/socket_accept6_makenonblocking_setcloseonexec.c
@@ -7,6 +7,6 @@
#include "windoze.h"
#include "socket.h"
-int socket_accept6_makenonblocking(int s,char ip[16],uint16 *port,uint32* scope_id) {
+int socket_accept6_makenonblocking_setcloseonexec(int s,char ip[16],uint16 *port,uint32* scope_id) {
return socket_accept6_flags(s,ip,port,scope_id,SOCKET_NONBLOCK | SOCKET_CLOEXEC);
}
diff --git a/socket/socket_accept6_setcloseonexec.c b/socket/socket_accept6_setcloseonexec.c
index e6ac0e0..bdb9a89 100644
--- a/socket/socket_accept6_setcloseonexec.c
+++ b/socket/socket_accept6_setcloseonexec.c
@@ -7,6 +7,6 @@
#include "windoze.h"
#include "socket.h"
-int socket_accept6_makenonblocking(int s,char ip[16],uint16 *port,uint32* scope_id) {
+int socket_accept6_setcloseonexec(int s,char ip[16],uint16 *port,uint32* scope_id) {
return socket_accept6_flags(s,ip,port,scope_id,SOCKET_CLOEXEC);
}
|
