From: Craig Small <csmall@enc.com.au>
Date: Sat, 3 Mar 2018 07:36:44 +0000 (+1100)
Subject: watch: use sysconf() for hostname length
X-Git-Tag: v3.3.13rc1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4a9a1e5d4eb0765ab2f0097f48b4daf1ef80467;p=procps-ng

watch: use sysconf() for hostname length

Hurd doesn't have HOST_NAME_MAX, neither does Solaris.
An early fix just checked for this value and used 64 instead.
This change uses sysconf which is the correct method, possibly until
this compiles on some mis-behaving OS which doesn't have this value.

References:
 commit e564ddcb01c3c11537432faa9c7a7a6badb05930
 procps-ng/procps#54
---

diff --git a/watch.c b/watch.c
index 048a4507..c438178f 100644
--- a/watch.c
+++ b/watch.c
@@ -60,9 +60,6 @@
 # define isprint(x) ( (x>=' '&&x<='~') || (x>=0xa0) )
 #endif
 
-#ifndef HOST_NAME_MAX
-#define HOST_NAME_MAX 64
-#endif
 
 /* Boolean command line options */
 static int flags;
@@ -380,7 +377,8 @@ static void output_header(char *restrict command, double interval)
 	char *ts = ctime(&t);
 	char *header;
 	char *right_header;
-	char hostname[HOST_NAME_MAX + 1];
+    int max_host_name_len = (int) sysconf(_SC_HOST_NAME_MAX);
+	char hostname[max_host_name_len + 1];
 	int command_columns = 0;	/* not including final \0 */
 
 	gethostname(hostname, sizeof(hostname));