[vlc-devel] [PATCH] xcb_window: Use sysconf to discover HOST_NAME_MAX.
Alexis Ballier
aballier at gentoo.org
Fri Jul 10 14:35:28 CEST 2009
POSIX does not mandate HOST_NAME_MAX to be defined and FreeBSD does not define it to encourage people to use sysconf() for discovering its value.
If sysconf fails, fallback to _POSIX_HOST_NAME_MAX.
---
modules/video_output/xcb/window.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 0ec23dd..6f69052 100644
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -27,8 +27,8 @@
#include <stdarg.h>
#include <assert.h>
#include <poll.h>
-#include <unistd.h> /* gethostname() */
-#include <limits.h> /* HOST_NAME_MAX */
+#include <unistd.h> /* gethostname() and sysconf() */
+#include <limits.h> /* _POSIX_HOST_NAME_MAX */
#include <xcb/xcb.h>
typedef xcb_atom_t Atom;
@@ -96,13 +96,18 @@ void set_ascii_prop (xcb_connection_t *conn, xcb_window_t window,
static inline
void set_hostname_prop (xcb_connection_t *conn, xcb_window_t window)
{
- char hostname[HOST_NAME_MAX];
+ char* hostname;
+ long host_name_max = sysconf(_SC_HOST_NAME_MAX);
+ if(host_name_max <= 0) host_name_max = _POSIX_HOST_NAME_MAX;
+ hostname = (char*)malloc(host_name_max*sizeof(char));
+ if(!hostname) return;
- if (gethostname (hostname, sizeof (hostname)) == 0)
+ if (gethostname (hostname, host_name_max) == 0)
{
- hostname[sizeof (hostname) - 1] = '\0';
+ hostname[host_name_max - 1] = '\0';
set_ascii_prop (conn, window, XA_WM_CLIENT_MACHINE, hostname);
}
+ free(hostname);
}
static inline
--
1.6.3.3
More information about the vlc-devel
mailing list