XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfree86: parser: use xhostname()

Browse Source 
Simplify DoSubstitution() by using xhostname(). Neither need to
care about OS specifics here, nor take care of zero-terminating the
hostname string - xhostname() is already doing this.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-31 19:14:01 +02:00
committed by Enrico Weigelt
parent 4d532adf7d
commit 1bfd27e8f6
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hw/xfree86/parser/scan.c
View File

@@ -66,11 +66,10 @@
#include <X11/Xdefs.h>
#include <X11/Xfuncproto.h>
#include <limits.h>
#include "xf86Parser_priv.h"
#if !defined(MAXHOSTNAMELEN)
#define MAXHOSTNAMELEN 32
#endif /* !MAXHOSTNAMELEN */
#include "os/xhostname.h"
#include "xf86Parser_priv.h"
/* For PATH_MAX */
#include "misc.h"
@@ -625,15 +624,9 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
break;
case 'H':
if (!hostname) {
if ((hostname = calloc(1, MAXHOSTNAMELEN + 1))) {
if (gethostname(hostname, MAXHOSTNAMELEN) == 0) {
hostname[MAXHOSTNAMELEN] = '\0';
}
else {
free(hostname);
hostname = NULL;
}
}
struct xhostname hn;
if (xhostname(&hn))
hostname = strdup(hn.name);
}
if (hostname)
APPEND_STR(hostname);