main/musl: add LONG_BIT and other extensions to getconf

1 files changed, 240 insertions, 227 deletions

diff --git a/main/musl/getconf.c b/main/musl/getconf.c
index 0c698bc5e..0c511c085 100644
--- a/main/musl/getconf.c
+++ b/main/musl/getconf.c
@@ -5,6 +5,9 @@
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
  *
+ * Mostly rewritten to be used in Alpine Linux (with musl c-library)
+ * by Timo Teräs.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -27,10 +30,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* Fixed to be used with musl in Alpine Linux by Timo Teräs. */
-
 #include <err.h>
 #include <errno.h>
+#include <values.h>
 #include <limits.h>
 #include <locale.h>
 #include <stdio.h>
@@ -38,145 +40,163 @@
 #include <unistd.h>
 #include <string.h>
 
-struct conf_variable
-{
-  const char *name;
-  enum { SYSCONF, CONFSTR, PATHCONF, CONSTANT } type;
-  long value;
+struct conf_variable {
+	const char *name;
+	enum { SYSCONF, CONFSTR, PATHCONF, CONSTANT, UCONSTANT, NUM_TYPES } type;
+	long value;
 };
 
-static const struct conf_variable conf_table[] =
-{
-  { "PATH",			CONFSTR,	_CS_PATH		},
-
-  /* Utility Limit Minimum Values */
-  { "POSIX2_BC_BASE_MAX",	CONSTANT,	_POSIX2_BC_BASE_MAX	},
-  { "POSIX2_BC_DIM_MAX",	CONSTANT,	_POSIX2_BC_DIM_MAX	},
-  { "POSIX2_BC_SCALE_MAX",	CONSTANT,	_POSIX2_BC_SCALE_MAX	},
-  { "POSIX2_BC_STRING_MAX",	CONSTANT,	_POSIX2_BC_STRING_MAX	},
-  { "POSIX2_COLL_WEIGHTS_MAX",	CONSTANT,	_POSIX2_COLL_WEIGHTS_MAX },
-  { "POSIX2_EXPR_NEST_MAX",	CONSTANT,	_POSIX2_EXPR_NEST_MAX	},
-  { "POSIX2_LINE_MAX",		CONSTANT,	_POSIX2_LINE_MAX	},
-  { "POSIX2_RE_DUP_MAX",	CONSTANT,	_POSIX2_RE_DUP_MAX	},
-  { "POSIX2_VERSION",		CONSTANT,	_POSIX2_VERSION		},
-
-  /* POSIX.1 Minimum Values */
-  { "_POSIX_AIO_LISTIO_MAX",	CONSTANT,	_POSIX_AIO_LISTIO_MAX	},
-  { "_POSIX_AIO_MAX",		CONSTANT,       _POSIX_AIO_MAX		},
-  { "_POSIX_ARG_MAX",		CONSTANT,	_POSIX_ARG_MAX		},
-  { "_POSIX_CHILD_MAX",		CONSTANT,	_POSIX_CHILD_MAX	},
-  { "_POSIX_LINK_MAX",		CONSTANT,	_POSIX_LINK_MAX		},
-  { "_POSIX_MAX_CANON",		CONSTANT,	_POSIX_MAX_CANON	},
-  { "_POSIX_MAX_INPUT",		CONSTANT,	_POSIX_MAX_INPUT	},
-  { "_POSIX_MQ_OPEN_MAX",	CONSTANT,	_POSIX_MQ_OPEN_MAX	},
-  { "_POSIX_MQ_PRIO_MAX",	CONSTANT,	_POSIX_MQ_PRIO_MAX	},
-  { "_POSIX_NAME_MAX",		CONSTANT,	_POSIX_NAME_MAX		},
-  { "_POSIX_NGROUPS_MAX",	CONSTANT,	_POSIX_NGROUPS_MAX	},
-  { "_POSIX_OPEN_MAX",		CONSTANT,	_POSIX_OPEN_MAX		},
-  { "_POSIX_PATH_MAX",		CONSTANT,	_POSIX_PATH_MAX		},
-  { "_POSIX_PIPE_BUF",		CONSTANT,	_POSIX_PIPE_BUF		},
-  { "_POSIX_SSIZE_MAX",		CONSTANT,	_POSIX_SSIZE_MAX	},
-  { "_POSIX_STREAM_MAX",	CONSTANT,	_POSIX_STREAM_MAX	},
-  { "_POSIX_TZNAME_MAX",	CONSTANT,	_POSIX_TZNAME_MAX	},
-
-  /* Symbolic Utility Limits */
-  { "BC_BASE_MAX",		SYSCONF,	_SC_BC_BASE_MAX		},
-  { "BC_DIM_MAX",		SYSCONF,	_SC_BC_DIM_MAX		},
-  { "BC_SCALE_MAX",		SYSCONF,	_SC_BC_SCALE_MAX	},
-  { "BC_STRING_MAX",		SYSCONF,	_SC_BC_STRING_MAX	},
-  { "COLL_WEIGHTS_MAX",		SYSCONF,	_SC_COLL_WEIGHTS_MAX	},
-  { "EXPR_NEST_MAX",		SYSCONF,	_SC_EXPR_NEST_MAX	},
-  { "LINE_MAX",			SYSCONF,	_SC_LINE_MAX		},
-  { "RE_DUP_MAX",		SYSCONF,	_SC_RE_DUP_MAX		},
-
-  /* Optional Facility Configuration Values */
-  { "_POSIX2_C_BIND",		SYSCONF,	_SC_2_C_BIND		},
-  { "POSIX2_C_DEV",		SYSCONF,	_SC_2_C_DEV		},
-  { "POSIX2_CHAR_TERM",		SYSCONF,	_SC_2_CHAR_TERM		},
-  { "POSIX2_FORT_DEV",		SYSCONF,	_SC_2_FORT_DEV		},
-  { "POSIX2_FORT_RUN",		SYSCONF,	_SC_2_FORT_RUN		},
-  { "POSIX2_LOCALEDEF",		SYSCONF,	_SC_2_LOCALEDEF		},
-  { "POSIX2_SW_DEV",		SYSCONF,	_SC_2_SW_DEV		},
-  { "POSIX2_UPE",		SYSCONF,	_SC_2_UPE		},
-
-  /* POSIX.1 Configurable System Variables */
-  { "AIO_LISTIO_MAX",		SYSCONF,	_SC_AIO_LISTIO_MAX	},
-  { "AIO_MAX",			SYSCONF,	_SC_AIO_MAX		},
-  { "ARG_MAX",			SYSCONF,	_SC_ARG_MAX 		},
-  { "CHILD_MAX",		SYSCONF,	_SC_CHILD_MAX		},
-  { "CLK_TCK",			SYSCONF,	_SC_CLK_TCK		},
-  { "MQ_OPEN_MAX",		SYSCONF,	_SC_MQ_OPEN_MAX		},
-  { "MQ_PRIO_MAX",		SYSCONF,	_SC_MQ_PRIO_MAX		},
-  { "NGROUPS_MAX",		SYSCONF,	_SC_NGROUPS_MAX		},
-  { "OPEN_MAX",			SYSCONF,	_SC_OPEN_MAX		},
-  { "STREAM_MAX",		SYSCONF,	_SC_STREAM_MAX		},
-  { "TZNAME_MAX",		SYSCONF,	_SC_TZNAME_MAX		},
-  { "_POSIX_JOB_CONTROL",	SYSCONF,	_SC_JOB_CONTROL 	},
-  { "_POSIX_SAVED_IDS",		SYSCONF,	_SC_SAVED_IDS		},
-  { "_POSIX_VERSION",		SYSCONF,	_SC_VERSION		},
-
-  { "LINK_MAX",			PATHCONF,	_PC_LINK_MAX		},
-  { "MAX_CANON",		PATHCONF,	_PC_MAX_CANON		},
-  { "MAX_INPUT",		PATHCONF,	_PC_MAX_INPUT		},
-  { "NAME_MAX",			PATHCONF,	_PC_NAME_MAX		},
-  { "PATH_MAX",			PATHCONF,	_PC_PATH_MAX		},
-  { "PIPE_BUF",			PATHCONF,	_PC_PIPE_BUF		},
-  { "_POSIX_CHOWN_RESTRICTED",	PATHCONF,	_PC_CHOWN_RESTRICTED	},
-  { "_POSIX_NO_TRUNC",		PATHCONF,	_PC_NO_TRUNC		},
-  { "_POSIX_VDISABLE",		PATHCONF,	_PC_VDISABLE		},
-
-  /* POSIX.1b Configurable System Variables */
-  { "PAGESIZE",			SYSCONF,	_SC_PAGESIZE		},
-  { "_POSIX_ASYNCHRONOUS_IO",	SYSCONF,	_SC_ASYNCHRONOUS_IO	},
-  { "_POSIX_FSYNC",		SYSCONF,	_SC_FSYNC		},
-  { "_POSIX_MAPPED_FILES",	SYSCONF,	_SC_MAPPED_FILES	},
-  { "_POSIX_MEMLOCK",		SYSCONF,	_SC_MEMLOCK		},
-  { "_POSIX_MEMLOCK_RANGE",	SYSCONF,	_SC_MEMLOCK_RANGE	},
-  { "_POSIX_MEMORY_PROTECTION",	SYSCONF,	_SC_MEMORY_PROTECTION	},
-  { "_POSIX_MESSAGE_PASSING",	SYSCONF,	_SC_MESSAGE_PASSING	},
-  { "_POSIX_MONOTONIC_CLOCK",	SYSCONF,	_SC_MONOTONIC_CLOCK	},
-  { "_POSIX_PRIORITY_SCHEDULING", SYSCONF,	_SC_PRIORITY_SCHEDULING },
-  { "_POSIX_SEMAPHORES",	SYSCONF,	_SC_SEMAPHORES		},
-  { "_POSIX_SHARED_MEMORY_OBJECTS", SYSCONF,	_SC_SHARED_MEMORY_OBJECTS },
-  { "_POSIX_SYNCHRONIZED_IO",	SYSCONF,	_SC_SYNCHRONIZED_IO	},
-  { "_POSIX_TIMERS",		SYSCONF,	_SC_TIMERS		},
-
-  { "_POSIX_SYNC_IO",		PATHCONF,	_PC_SYNC_IO		},
-
-  /* POSIX.1c Configurable System Variables */
-  { "LOGIN_NAME_MAX",		SYSCONF,	_SC_LOGIN_NAME_MAX	},
-  { "_POSIX_THREADS",		SYSCONF,	_SC_THREADS		},
-
-  /* POSIX.1j Configurable System Variables */
-  { "_POSIX_BARRIERS",		SYSCONF,	_SC_BARRIERS		},
-  { "_POSIX_READER_WRITER_LOCKS", SYSCONF,	_SC_READER_WRITER_LOCKS	},
-  { "_POSIX_SPIN_LOCKS",	SYSCONF,	_SC_SPIN_LOCKS		},
-
-  /* XPG4.2 Configurable System Variables */
-  { "IOV_MAX",			SYSCONF,	_SC_IOV_MAX		},
-  { "PAGE_SIZE",		SYSCONF,	_SC_PAGE_SIZE		},
-  { "_XOPEN_SHM",		SYSCONF,	_SC_XOPEN_SHM		},
-
-  /* X/Open CAE Spec. Issue 5 Version 2 Configurable System Variables */
-  { "FILESIZEBITS",		PATHCONF,	_PC_FILESIZEBITS	},
-
-  /* POSIX.1-2001 XSI Option Group Configurable System Variables */
-  { "ATEXIT_MAX",		SYSCONF,	_SC_ATEXIT_MAX		},
-
-  /* POSIX.1-2001 TSF Configurable System Variables */
-  { "GETGR_R_SIZE_MAX",		SYSCONF,	_SC_GETGR_R_SIZE_MAX	},
-  { "GETPW_R_SIZE_MAX",		SYSCONF,	_SC_GETPW_R_SIZE_MAX	},
-
-  /* Commonly provided extensions */
-  { "_PHYS_PAGES",		SYSCONF,	_SC_PHYS_PAGES		},
-  { "_AVPHYS_PAGES",		SYSCONF,	_SC_AVPHYS_PAGES	},
-  { "_NPROCESSORS_CONF",	SYSCONF,	_SC_NPROCESSORS_CONF	},
-  { "_NPROCESSORS_ONLN",	SYSCONF,	_SC_NPROCESSORS_ONLN	},
-
-  { NULL, CONSTANT, 0L }
+static const struct conf_variable conf_table[] = {
+{ "PATH",			CONFSTR,	_CS_PATH		},
+
+/* Utility Limit Minimum Values */
+{ "POSIX2_BC_BASE_MAX",		CONSTANT,	_POSIX2_BC_BASE_MAX	},
+{ "POSIX2_BC_DIM_MAX",		CONSTANT,	_POSIX2_BC_DIM_MAX	},
+{ "POSIX2_BC_SCALE_MAX",	CONSTANT,	_POSIX2_BC_SCALE_MAX	},
+{ "POSIX2_BC_STRING_MAX",	CONSTANT,	_POSIX2_BC_STRING_MAX	},
+{ "POSIX2_COLL_WEIGHTS_MAX",	CONSTANT,	_POSIX2_COLL_WEIGHTS_MAX },
+{ "POSIX2_EXPR_NEST_MAX",	CONSTANT,	_POSIX2_EXPR_NEST_MAX	},
+{ "POSIX2_LINE_MAX",		CONSTANT,	_POSIX2_LINE_MAX	},
+{ "POSIX2_RE_DUP_MAX",		CONSTANT,	_POSIX2_RE_DUP_MAX	},
+{ "POSIX2_VERSION",		CONSTANT,	_POSIX2_VERSION		},
+
+/* POSIX.1 Minimum Values */
+{ "_POSIX_AIO_LISTIO_MAX",	CONSTANT,	_POSIX_AIO_LISTIO_MAX	},
+{ "_POSIX_AIO_MAX",		CONSTANT,       _POSIX_AIO_MAX		},
+{ "_POSIX_ARG_MAX",		CONSTANT,	_POSIX_ARG_MAX		},
+{ "_POSIX_CHILD_MAX",		CONSTANT,	_POSIX_CHILD_MAX	},
+{ "_POSIX_LINK_MAX",		CONSTANT,	_POSIX_LINK_MAX		},
+{ "_POSIX_MAX_CANON",		CONSTANT,	_POSIX_MAX_CANON	},
+{ "_POSIX_MAX_INPUT",		CONSTANT,	_POSIX_MAX_INPUT	},
+{ "_POSIX_MQ_OPEN_MAX",		CONSTANT,	_POSIX_MQ_OPEN_MAX	},
+{ "_POSIX_MQ_PRIO_MAX",		CONSTANT,	_POSIX_MQ_PRIO_MAX	},
+{ "_POSIX_NAME_MAX",		CONSTANT,	_POSIX_NAME_MAX		},
+{ "_POSIX_NGROUPS_MAX",		CONSTANT,	_POSIX_NGROUPS_MAX	},
+{ "_POSIX_OPEN_MAX",		CONSTANT,	_POSIX_OPEN_MAX		},
+{ "_POSIX_PATH_MAX",		CONSTANT,	_POSIX_PATH_MAX		},
+{ "_POSIX_PIPE_BUF",		CONSTANT,	_POSIX_PIPE_BUF		},
+{ "_POSIX_SSIZE_MAX",		CONSTANT,	_POSIX_SSIZE_MAX	},
+{ "_POSIX_STREAM_MAX",		CONSTANT,	_POSIX_STREAM_MAX	},
+{ "_POSIX_TZNAME_MAX",		CONSTANT,	_POSIX_TZNAME_MAX	},
+
+/* Symbolic Utility Limits */
+{ "BC_BASE_MAX",		SYSCONF,	_SC_BC_BASE_MAX		},
+{ "BC_DIM_MAX",			SYSCONF,	_SC_BC_DIM_MAX		},
+{ "BC_SCALE_MAX",		SYSCONF,	_SC_BC_SCALE_MAX	},
+{ "BC_STRING_MAX",		SYSCONF,	_SC_BC_STRING_MAX	},
+{ "COLL_WEIGHTS_MAX",		SYSCONF,	_SC_COLL_WEIGHTS_MAX	},
+{ "EXPR_NEST_MAX",		SYSCONF,	_SC_EXPR_NEST_MAX	},
+{ "LINE_MAX",			SYSCONF,	_SC_LINE_MAX		},
+{ "RE_DUP_MAX",			SYSCONF,	_SC_RE_DUP_MAX		},
+
+/* Optional Facility Configuration Values */
+{ "_POSIX2_C_BIND",		SYSCONF,	_SC_2_C_BIND		},
+{ "POSIX2_C_DEV",		SYSCONF,	_SC_2_C_DEV		},
+{ "POSIX2_CHAR_TERM",		SYSCONF,	_SC_2_CHAR_TERM		},
+{ "POSIX2_FORT_DEV",		SYSCONF,	_SC_2_FORT_DEV		},
+{ "POSIX2_FORT_RUN",		SYSCONF,	_SC_2_FORT_RUN		},
+{ "POSIX2_LOCALEDEF",		SYSCONF,	_SC_2_LOCALEDEF		},
+{ "POSIX2_SW_DEV",		SYSCONF,	_SC_2_SW_DEV		},
+{ "POSIX2_UPE",			SYSCONF,	_SC_2_UPE		},
+
+/* POSIX.1 Configurable System Variables */
+{ "AIO_LISTIO_MAX",		SYSCONF,	_SC_AIO_LISTIO_MAX	},
+{ "AIO_MAX",			SYSCONF,	_SC_AIO_MAX		},
+{ "ARG_MAX",			SYSCONF,	_SC_ARG_MAX 		},
+{ "CHILD_MAX",			SYSCONF,	_SC_CHILD_MAX		},
+{ "CLK_TCK",			SYSCONF,	_SC_CLK_TCK		},
+{ "MQ_OPEN_MAX",		SYSCONF,	_SC_MQ_OPEN_MAX		},
+{ "MQ_PRIO_MAX",		SYSCONF,	_SC_MQ_PRIO_MAX		},
+{ "NGROUPS_MAX",		SYSCONF,	_SC_NGROUPS_MAX		},
+{ "OPEN_MAX",			SYSCONF,	_SC_OPEN_MAX		},
+{ "STREAM_MAX",			SYSCONF,	_SC_STREAM_MAX		},
+{ "TZNAME_MAX",			SYSCONF,	_SC_TZNAME_MAX		},
+{ "_POSIX_JOB_CONTROL",		SYSCONF,	_SC_JOB_CONTROL 	},
+{ "_POSIX_SAVED_IDS",		SYSCONF,	_SC_SAVED_IDS		},
+{ "_POSIX_VERSION",		SYSCONF,	_SC_VERSION		},
+
+{ "LINK_MAX",			PATHCONF,	_PC_LINK_MAX		},
+{ "MAX_CANON",			PATHCONF,	_PC_MAX_CANON		},
+{ "MAX_INPUT",			PATHCONF,	_PC_MAX_INPUT		},
+{ "NAME_MAX",			PATHCONF,	_PC_NAME_MAX		},
+{ "PATH_MAX",			PATHCONF,	_PC_PATH_MAX		},
+{ "PIPE_BUF",			PATHCONF,	_PC_PIPE_BUF		},
+{ "_POSIX_CHOWN_RESTRICTED",	PATHCONF,	_PC_CHOWN_RESTRICTED	},
+{ "_POSIX_NO_TRUNC",		PATHCONF,	_PC_NO_TRUNC		},
+{ "_POSIX_VDISABLE",		PATHCONF,	_PC_VDISABLE		},
+
+/* POSIX.1b Configurable System Variables */
+{ "PAGESIZE",			SYSCONF,	_SC_PAGESIZE		},
+{ "_POSIX_ASYNCHRONOUS_IO",	SYSCONF,	_SC_ASYNCHRONOUS_IO	},
+{ "_POSIX_FSYNC",		SYSCONF,	_SC_FSYNC		},
+{ "_POSIX_MAPPED_FILES",	SYSCONF,	_SC_MAPPED_FILES	},
+{ "_POSIX_MEMLOCK",		SYSCONF,	_SC_MEMLOCK		},
+{ "_POSIX_MEMLOCK_RANGE",	SYSCONF,	_SC_MEMLOCK_RANGE	},
+{ "_POSIX_MEMORY_PROTECTION",	SYSCONF,	_SC_MEMORY_PROTECTION	},
+{ "_POSIX_MESSAGE_PASSING",	SYSCONF,	_SC_MESSAGE_PASSING	},
+{ "_POSIX_MONOTONIC_CLOCK",	SYSCONF,	_SC_MONOTONIC_CLOCK	},
+{ "_POSIX_PRIORITY_SCHEDULING", SYSCONF,	_SC_PRIORITY_SCHEDULING },
+{ "_POSIX_SEMAPHORES",		SYSCONF,	_SC_SEMAPHORES		},
+{ "_POSIX_SHARED_MEMORY_OBJECTS", SYSCONF,	_SC_SHARED_MEMORY_OBJECTS },
+{ "_POSIX_SYNCHRONIZED_IO",	SYSCONF,	_SC_SYNCHRONIZED_IO	},
+{ "_POSIX_TIMERS",		SYSCONF,	_SC_TIMERS		},
+
+{ "_POSIX_SYNC_IO",		PATHCONF,	_PC_SYNC_IO		},
+
+/* POSIX.1c Configurable System Variables */
+{ "LOGIN_NAME_MAX",		SYSCONF,	_SC_LOGIN_NAME_MAX	},
+{ "_POSIX_THREADS",		SYSCONF,	_SC_THREADS		},
+
+/* POSIX.1j Configurable System Variables */
+{ "_POSIX_BARRIERS",		SYSCONF,	_SC_BARRIERS		},
+{ "_POSIX_READER_WRITER_LOCKS", SYSCONF,	_SC_READER_WRITER_LOCKS	},
+{ "_POSIX_SPIN_LOCKS",		SYSCONF,	_SC_SPIN_LOCKS		},
+
+/* XPG4.2 Configurable System Variables */
+{ "IOV_MAX",			SYSCONF,	_SC_IOV_MAX		},
+{ "PAGE_SIZE",			SYSCONF,	_SC_PAGE_SIZE		},
+{ "_XOPEN_SHM",			SYSCONF,	_SC_XOPEN_SHM		},
+
+/* X/Open CAE Spec. Issue 5 Version 2 Configurable System Variables */
+{ "FILESIZEBITS",		PATHCONF,	_PC_FILESIZEBITS	},
+
+/* POSIX.1-2001 XSI Option Group Configurable System Variables */
+{ "ATEXIT_MAX",			SYSCONF,	_SC_ATEXIT_MAX		},
+
+/* POSIX.1-2001 TSF Configurable System Variables */
+{ "GETGR_R_SIZE_MAX",		SYSCONF,	_SC_GETGR_R_SIZE_MAX	},
+{ "GETPW_R_SIZE_MAX",		SYSCONF,	_SC_GETPW_R_SIZE_MAX	},
+
+/* Commonly provided extensions */
+{ "_PHYS_PAGES",		SYSCONF,	_SC_PHYS_PAGES		},
+{ "_AVPHYS_PAGES",		SYSCONF,	_SC_AVPHYS_PAGES	},
+{ "_NPROCESSORS_CONF",		SYSCONF,	_SC_NPROCESSORS_CONF	},
+{ "_NPROCESSORS_ONLN",		SYSCONF,	_SC_NPROCESSORS_ONLN	},
+
+/* Data type related extensions */
+{ "CHAR_BIT",			CONSTANT,	CHAR_BIT		},
+{ "CHAR_MAX",			CONSTANT,	CHAR_MAX		},
+{ "CHAR_MIN",			CONSTANT,	CHAR_MIN		},
+{ "INT_MAX",			CONSTANT,	INT_MAX			},
+{ "INT_MIN",			CONSTANT,	INT_MIN			},
+{ "LONG_BIT",			CONSTANT,	LONG_BIT		},
+{ "LONG_MAX",			CONSTANT,	LONG_MAX		},
+{ "LONG_MIN",			CONSTANT,	LONG_MIN		},
+{ "SCHAR_MAX",			CONSTANT,	SCHAR_MAX		},
+{ "SCHAR_MIN",			CONSTANT,	SCHAR_MIN		},
+{ "SHRT_MAX",			CONSTANT,	SHRT_MAX		},
+{ "SHRT_MIN",			CONSTANT,	SHRT_MIN		},
+{ "SSIZE_MAX",			CONSTANT,	SSIZE_MAX		},
+{ "UCHAR_MAX",			UCONSTANT,	(long) UCHAR_MAX	},
+{ "UINT_MAX",			UCONSTANT,	(long) UINT_MAX		},
+{ "ULONG_MAX",			UCONSTANT,	(long) ULONG_MAX	},
+{ "USHRT_MAX",			UCONSTANT,	(long) USHRT_MAX	},
+{ "WORD_BIT",			CONSTANT,	WORD_BIT		},
+
+{ NULL, CONSTANT, 0L }
 };
 
-static int a_flag = 0;		/* list all variables */
+static int all = 0;
 
 static void usage(const char *p)
 {
@@ -185,104 +205,102 @@ static void usage(const char *p)
 	exit(EXIT_FAILURE);
 }
 
-static void print_longvar(const char *name, long value)
+static void print_long(const char *name, long val)
+{
+	static const char * const fmtstr[] = { "%2$ld\n", "%s = %ld\n" };
+	printf(fmtstr[all], name, val);
+}
+
+static void print_ulong(const char *name, unsigned long val)
 {
-	if (a_flag)
-		(void)printf("%s = %ld\n", name, value);
-	else
-		(void)printf("%ld\n", value);
+	static const char * const fmtstr[] = { "%2$lu\n", "%s = %lu\n" };
+	printf(fmtstr[all], name, val);
 }
 
-static void print_strvar(const char *name, const char *sval)
+static void print_string(const char *name, const char *val)
 {
-	if (a_flag)
-		(void)printf("%s = %s\n", name, sval);
-	else
-		(void)printf("%s\n", sval);
+	static const char * const fmtstr[] = { "%2$s\n", "%s = %s\n" };
+	printf(fmtstr[all], name, val);
 }
 
-static void
-printvar(const struct conf_variable *cp, const char *pathname)
+static int print_constant(const struct conf_variable *cp, const char *pathname)
+{
+	print_long(cp->name, cp->value);
+	return 0;
+}
+
+static int print_uconstant(const struct conf_variable *cp, const char *pathname)
+{
+	print_ulong(cp->name, (unsigned long) cp->value);
+	return 0;
+}
+
+static int print_sysconf(const struct conf_variable *cp, const char *pathname)
 {
-	size_t slen;
-	char *sval;
 	long val;
 
-	switch (cp->type) {
-	case CONSTANT:
-		print_longvar(cp->name, cp->value);
-		break;
-
-	case CONFSTR:
-		errno = 0;
-		slen = confstr((int)cp->value, NULL, 0);
-		if (slen == 0) {
-			if (errno != 0)
-out:			 	err(EXIT_FAILURE, "confstr(%ld)", cp->value);
-			else
-				print_strvar(cp->name, "undefined");
-		}
+	errno = 0;
+	if ((val = sysconf((int)cp->value)) == -1) {
+		if (errno != 0) err(EXIT_FAILURE, "sysconf(%ld)", cp->value);
+		return -1;
+	}
+	print_long(cp->name, val);
+	return 0;
+}
+
+static int print_confstr(const struct conf_variable *cp, const char *pathname)
+{
+	size_t len;
+	char *val;
+
+	errno = 0;
+	if ((len = confstr((int)cp->value, NULL, 0)) == 0) goto error;
+	if ((val = malloc(len)) == NULL) err(EXIT_FAILURE, "Can't allocate %zu bytes", len);
+	errno = 0;
+	if (confstr((int)cp->value, val, len) == 0) goto error;
+	print_string(cp->name, val);
+	free(val);
+	return 0;
+error:
+	if (errno != EINVAL) err(EXIT_FAILURE, "confstr(%ld)", cp->value);
+	return -1;
+}
+
+static int print_pathconf(const struct conf_variable *cp, const char *pathname)
+{
+	long val;
 
-		if ((sval = malloc(slen)) == NULL)
-			err(EXIT_FAILURE, "Can't allocate %zu bytes", slen);
-
-		errno = 0;
-		if (confstr((int)cp->value, sval, slen) == 0) {
-			if (errno != 0)
-				goto out;
-			else
-				print_strvar(cp->name, "undefined");
-		} else
-			print_strvar(cp->name, sval);
-
-		free(sval);
-		break;
-
-	case SYSCONF:
-		errno = 0;
-		if ((val = sysconf((int)cp->value)) == -1) {
-			if (errno != 0)
-				err(EXIT_FAILURE, "sysconf(%ld)", cp->value);
-			print_strvar(cp->name, "undefined");
-		} else
-			print_longvar(cp->name, val);
-		break;
-
-	case PATHCONF:
-		errno = 0;
-		if ((val = pathconf(pathname, (int)cp->value)) == -1) {
-			if (errno != 0) {
-				if (a_flag && errno == EINVAL) {
-					/* Just skip invalid variables */
-					return;
-				}
-				err(EXIT_FAILURE, "pathconf(%s, %ld)",
-				    pathname, cp->value);
-				/* NOTREACHED */
-			}
-
-			print_strvar(cp->name, "undefined");
-		} else
-			print_longvar(cp->name, val);
-		break;
+	errno = 0;
+	if ((val = pathconf(pathname, (int)cp->value)) == -1) {
+		if (all && errno == EINVAL) return 0;
+		if (errno != 0) err(EXIT_FAILURE, "pathconf(%s, %ld)", pathname, cp->value);
+		return -1;
 	}
+	print_long(cp->name, val);
+	return 0;
 }
 
-int
-main(int argc, char **argv)
+typedef int (*handler_t)(const struct conf_variable *cp, const char *pathname);
+static const handler_t type_handlers[NUM_TYPES] = {
+	[SYSCONF]	= print_sysconf,
+	[CONFSTR]	= print_confstr,
+	[PATHCONF]	= print_pathconf,
+	[CONSTANT]	= print_constant,
+	[UCONSTANT]	= print_uconstant,
+};
+
+int main(int argc, char **argv)
 {
-	int ch;
 	const char *progname = argv[0];
 	const struct conf_variable *cp;
 	const char *varname, *pathname;
-	int found;
+	int ch, found = 0;
 
 	(void)setlocale(LC_ALL, "");
-
 	while ((ch = getopt(argc, argv, "a")) != -1) {
 		switch (ch) {
 		case 'a':
-			a_flag = 1;
+			all = 1;
 			break;
 		case '?':
 		default:
@@ -292,7 +310,7 @@ main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	if (!a_flag) {
+	if (!all) {
 		if (argc == 0)
 			usage(progname);
 		varname = argv[0];
@@ -305,21 +323,16 @@ main(int argc, char **argv)
 		usage(progname);
 	pathname = argv[0];	/* may be NULL */
 
-	found = 0;
 	for (cp = conf_table; cp->name != NULL; cp++) {
-		if (a_flag || strcmp(varname, cp->name) == 0) {
-			if ((cp->type == PATHCONF) == (pathname != NULL)) {
-				printvar(cp, pathname);
-				found = 1;
-			} else if (!a_flag)
-				errx(EXIT_FAILURE,
-				    "%s: invalid variable type", cp->name);
-		}
+		if (!all && strcmp(varname, cp->name) != 0) continue;
+		if ((cp->type == PATHCONF) == (pathname != NULL)) {
+			if (type_handlers[cp->type](cp, pathname) < 0)
+				print_string(cp->name, "undefined");
+			found = 1;
+		} else if (!all)
+			errx(EXIT_FAILURE, "%s: invalid variable type", cp->name);
 	}
-
-	if (!a_flag && !found)
-		errx(EXIT_FAILURE, "%s: unknown variable", varname);
-
+	if (!all && !found) errx(EXIT_FAILURE, "%s: unknown variable", varname);
 	(void)fflush(stdout);
 	return ferror(stdout) ? EXIT_FAILURE : EXIT_SUCCESS;
 }