From 1dbc9d03ac9a6b4fba8e18b7cecad250f56ec190 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 12 Feb 2025 16:10:51 +0100
Subject: [PATCH] os: xtrans: drop NEED_UTSNAME

All our supported platforms have this utsname.h.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 os/Xtrans.c    | 22 +++-------------------
 os/Xtransint.h | 21 ++-------------------
 os/Xtranslcl.c |  6 ------
 3 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/os/Xtrans.c b/os/Xtrans.c
index 4c1286fc8..888a559df 100644
--- a/os/Xtrans.c
+++ b/os/Xtrans.c
@@ -53,6 +53,7 @@ from The Open Group.
 #ifdef HAVE_SYSTEMD_DAEMON
 #include <systemd/sd-daemon.h>
 #endif
+#include <sys/utsname.h>
 
 /*
  * The transport table contains a definition for every transport (protocol)
@@ -1316,35 +1317,18 @@ static int TRANS(WriteV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt)
 #endif /* WIN32 */
 
 
-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__SVR4)
-#ifndef NEED_UTSNAME
-#define NEED_UTSNAME
-#endif
-#include <sys/utsname.h>
-#endif
-
 /*
  * TRANS(GetHostname) - similar to gethostname but allows special processing.
  */
 
 int TRANS(GetHostname) (char *buf, int maxlen)
-
 {
-    int len;
-
-#ifdef NEED_UTSNAME
     struct utsname name;
-
     uname (&name);
-    len = strlen (name.nodename);
+
+    int len = strlen (name.nodename);
     if (len >= maxlen) len = maxlen - 1;
     memcpy (buf, name.nodename, len);
     buf[len] = '\0';
-#else
-    buf[0] = '\0';
-    (void) gethostname (buf, maxlen);
-    buf [maxlen - 1] = '\0';
-    len = strlen(buf);
-#endif /* NEED_UTSNAME */
     return len;
 }
diff --git a/os/Xtransint.h b/os/Xtransint.h
index b5f31ffd0..baf1f728b 100644
--- a/os/Xtransint.h
+++ b/os/Xtransint.h
@@ -74,10 +74,6 @@ from The Open Group.
 
 #include "os/Xtrans.h"
 
-#ifndef _X_UNUSED  /* Defined in Xfuncproto.h in xproto >= 7.0.22 */
-# define _X_UNUSED  /* */
-#endif
-
 #ifdef XTRANSDEBUG
 # include <stdio.h>
 #endif /* XTRANSDEBUG */
@@ -85,23 +81,10 @@ from The Open Group.
 #include <errno.h>
 
 #ifndef WIN32
-#  include <sys/socket.h>
+# include <sys/socket.h>
 # include <netinet/in.h>
 # include <arpa/inet.h>
-
-/*
- * Moved the setting of NEED_UTSNAME to this header file from Xtrans.c,
- * to avoid a race condition. JKJ (6/5/97)
- */
-
-# if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__SVR4)
-#  ifndef NEED_UTSNAME
-#   define NEED_UTSNAME
-#  endif
-#  include <sys/utsname.h>
-# endif
-
-#  define ESET(val) errno = val
+# define ESET(val) errno = val
 # define EGET() errno
 
 #else /* WIN32 */
diff --git a/os/Xtranslcl.c b/os/Xtranslcl.c
index a37f5066c..b981ba441 100644
--- a/os/Xtranslcl.c
+++ b/os/Xtranslcl.c
@@ -798,9 +798,7 @@ TRANS(LocalGetNextTransport)(void)
 #endif
 }
 
-#ifdef NEED_UTSNAME
 #include <sys/utsname.h>
-#endif
 
 /*
  * Make sure 'host' is really local.
@@ -815,15 +813,11 @@ HostReallyLocal (const char *host)
      * by either uname() or gethostname().  We try both if possible.
      */
 
-#ifdef NEED_UTSNAME
     struct utsname name;
-#endif
     char buf[256];
 
-#ifdef NEED_UTSNAME
     if (uname (&name) >= 0 && strcmp (host, name.nodename) == 0)
 	return (1);
-#endif
 
     buf[0] = '\0';
     (void) gethostname (buf, 256);