emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

watch: use sysconf() for hostname length

Browse Source 
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 e564ddcb01
 procps-ng/procps#54
This commit is contained in:
Craig Small 2018-03-03 18:36:44 +11:00
parent 1a26eec12b
commit d4a9a1e5d4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
watch.c
View File

@ -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));