From b6787c75ab5a38efed63f2d5c1b475aa7d3874c1 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Wed, 1 Dec 2021 23:11:16 +0100
Subject: [PATCH] BUILD: Pb of not defined fd in the init unix socket function
on W build fixed (unix socket doesn't exist on W...)
---
inc/lektor/internal/os.h | 10 +++++-----
src/net/listen.c | 16 +++++++++-------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/inc/lektor/internal/os.h b/inc/lektor/internal/os.h
index 158f023e..d0f565ce 100644
--- a/inc/lektor/internal/os.h
+++ b/inc/lektor/internal/os.h
@@ -88,9 +88,9 @@ enum {
#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
/* LKT_OS_TOASTER | APPLE */
typedef int SOCKET;
-#define closesocket(fd) close(fd)
-#define INVALID_SOCKET (-1)
-#define to_file_mode_t(perm) (perm)
+#define closesocket(fd) close(fd)
+#define INVALID_SOCKET ((SOCKET)(-1))
+#define to_file_mode_t(perm) (perm)
#define to_socket_size_t(size) (size)
#else
@@ -102,8 +102,8 @@ typedef int SOCKET;
#define mkdir(str, perm) _mkdir(str)
#define socket(dom, type, proto__) WSASocket(dom, type, 0, 0, 0, 0)
#define get_nprocs_conf() 2
-#define to_file_mode_t(perm) ((int)(perm))
-#define to_socket_size_t(size) ((ULONG)(size))
+#define to_file_mode_t(perm) ((int)(perm))
+#define to_socket_size_t(size) ((ULONG)(size))
#endif
diff --git a/src/net/listen.c b/src/net/listen.c
index 64420e76..38a7fe49 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -528,7 +528,7 @@ failure:
return -1;
}
-static int
+PRIVATE_FUNCTION SOCKET
init_listening_socket_unix(const char UNUSED *file, const char UNUSED *type /* == "unix" */)
{
#if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
@@ -569,15 +569,17 @@ init_listening_socket_unix(const char UNUSED *file, const char UNUSED *type /* =
}
return fd;
-#else
- goto failure;
-#endif
+
failure:
close(fd);
- return -1;
+ return INVALID_SOCKET;
+
+#else
+ return INVALID_SOCKET;
+#endif
}
-static SOCKET
+PRIVATE_FUNCTION SOCKET
init_listening_socket_net(const char *host, const char *port)
{
errno = 0;
@@ -641,7 +643,7 @@ init_listening_socket_net(const char *host, const char *port)
return fd;
}
-static int
+PRIVATE_FUNCTION int
accept_all(SOCKET listen_fd, struct pollfd *fds, size_t fds_max, size_t *fds_len)
{
SOCKET fd;
--
GitLab