KasperskyOS-CE-adaptation.patch

© 2026 AO Kaspersky Lab
This script is licensed under the MIT License

---
 CMakeLists.txt               | 12 +++++++++++-
 include/ares.h               |  2 +-
 src/lib/ares__read_line.c    |  8 ++++++++
 src/lib/ares__readaddrinfo.c |  3 +++
 src/lib/ares_getaddrinfo.c   |  4 ++++
 src/lib/ares_getnameinfo.c   |  4 ++++
 src/lib/ares_strsplit.c      |  2 +-
 7 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2290af..029db1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 3.1.0)
+CMAKE_MINIMUM_REQUIRED (VERSION 3.29)
+
+# Enable CMP0077 to make option() honor normal variables
+IF (POLICY CMP0077)
+	CMAKE_POLICY(SET CMP0077 NEW)
+ENDIF (POLICY CMP0077)
 
 INCLUDE (CheckIncludeFiles)
 INCLUDE (CheckTypeSize)
@@ -219,6 +224,9 @@ IF (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 	LIST (APPEND SYSFLAGS -D_DARWIN_C_SOURCE)
 ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	LIST (APPEND SYSFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=199309L -D_XOPEN_SOURCE=600)
+ELSEIF (CMAKE_SYSTEM_NAME MATCHES "KOS-GNU.*")
+	CMAKE_POLICY (VERSION 3.29)
+	LIST (APPEND SYSFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700)
 ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 	LIST (APPEND SYSFLAGS -D__EXTENSIONS__ -D_REENTRANT -D_XOPEN_SOURCE=600)
 ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "AIX")
@@ -536,6 +544,7 @@ IF (HAVE_GETSERVBYPORT_R)
 		SET (GETSERVBYPORT_R_ARGS 5)
 	ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "AIX" OR
 		CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR
+		CMAKE_SYSTEM_NAME MATCHES  "KOS-GNU.*" OR
 		HAIKU)
 		SET (GETSERVBYPORT_R_ARGS 4)
 	ELSE ()
@@ -550,6 +559,7 @@ IF (HAVE_GETSERVBYNAME_R)
 		SET (GETSERVBYNAME_R_ARGS 5)
 	ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "AIX" OR
 		CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR
+		CMAKE_SYSTEM_NAME MATCHES  "KOS-GNU.*" OR
 		HAIKU)
 		SET (GETSERVBYNAME_R_ARGS 4)
 	ELSE ()
diff --git a/include/ares.h b/include/ares.h
index 8c7520e..e9ddd1c 100644
--- a/include/ares.h
+++ b/include/ares.h
@@ -39,7 +39,7 @@
 #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
     defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
     defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
-    defined(__QNXNTO__) || defined(__MVS__) || defined(__HAIKU__)
+    defined(__QNXNTO__) || defined(__MVS__) || defined(__HAIKU__)  || defined(__KOS__)
 #include <sys/select.h>
 #endif
 #if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
diff --git a/src/lib/ares__read_line.c b/src/lib/ares__read_line.c
index c62ad2a..d6625a3 100644
--- a/src/lib/ares__read_line.c
+++ b/src/lib/ares__read_line.c
@@ -49,6 +49,14 @@ int ares__read_line(FILE *fp, char **buf, size_t *bufsize)
       if (!fgets(*buf + offset, bytestoread, fp))
         return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
       len = offset + strlen(*buf + offset);
+
+      /* Probably means there was an embedded NULL as the first character in
+       * the line, throw away line */
+      if (len == 0) {
+        offset = 0;
+        continue;
+      }
+
       if ((*buf)[len - 1] == '\n')
         {
           (*buf)[len - 1] = 0;
diff --git a/src/lib/ares__readaddrinfo.c b/src/lib/ares__readaddrinfo.c
index 2315df9..ee636ae 100644
--- a/src/lib/ares__readaddrinfo.c
+++ b/src/lib/ares__readaddrinfo.c
@@ -29,6 +29,9 @@
 #include "ares_inet_net_pton.h"
 #include "ares_nowarn.h"
 #include "ares_private.h"
+#ifdef __KOS__
+#  include <strings.h>
+#endif
 
 #define MAX_ALIASES 40
 
diff --git a/src/lib/ares_getaddrinfo.c b/src/lib/ares_getaddrinfo.c
index cb49424..1cd24ea 100644
--- a/src/lib/ares_getaddrinfo.c
+++ b/src/lib/ares_getaddrinfo.c
@@ -253,8 +253,12 @@ static unsigned short lookup_service(const char *service, int flags)
       sep =
           getservbyname_r(service, proto, &se, (void *)tmpbuf, sizeof(tmpbuf));
 #elif GETSERVBYNAME_R_ARGS == 4
+#ifdef __KOS__
+    sep = getservbyname_r(service, proto, &se, (void *)tmpbuf);
+#else
       if (getservbyname_r(service, proto, &se, (void *)tmpbuf) != 0)
         sep = NULL;
+#endif
 #else
       /* Lets just hope the OS uses TLS! */
       sep = getservbyname(service, proto);
diff --git a/src/lib/ares_getnameinfo.c b/src/lib/ares_getnameinfo.c
index 966919a..6324e5e 100644
--- a/src/lib/ares_getnameinfo.c
+++ b/src/lib/ares_getnameinfo.c
@@ -304,8 +304,12 @@ static char *lookup_service(unsigned short port, int flags,
           sep = getservbyport_r(port, proto, &se, (void *)tmpbuf,
                                 sizeof(tmpbuf));
 #elif GETSERVBYPORT_R_ARGS == 4
+#ifdef __KOS__
+          sep = getservbyport_r(port, proto, &se, (void *)tmpbuf);
+#else
           if (getservbyport_r(port, proto, &se, (void *)tmpbuf) != 0)
             sep = NULL;
+#endif
 #else
           /* Lets just hope the OS uses TLS! */
           sep = getservbyport(port, proto);
diff --git a/src/lib/ares_strsplit.c b/src/lib/ares_strsplit.c
index d3e90c4..c024936 100644
--- a/src/lib/ares_strsplit.c
+++ b/src/lib/ares_strsplit.c
@@ -13,7 +13,7 @@
  * without express or implied warranty.
  */
 
-#if defined(__MVS__)
+#if defined(__MVS__) || defined(__KOS__)
 #include <strings.h>
 #endif