Revert crap accidentally committed

6 files changed, 19 insertions, 104 deletions

diff --git a/usr.bin/getconf/confstr.gperf b/usr.bin/getconf/confstr.gperf
index 11434ba29e96..c629987e5caf 100644
--- a/usr.bin/getconf/confstr.gperf
+++ b/usr.bin/getconf/confstr.gperf
@@ -52,9 +52,6 @@ _POSIX_V6_LPBIG_OFFBIG_CFLAGS, _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS
 _POSIX_V6_LPBIG_OFFBIG_LDFLAGS, _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
 _POSIX_V6_LPBIG_OFFBIG_LIBS, _CS_POSIX_V6_LPBIG_OFFBIG_LIBS
 _POSIX_V6_WIDTH_RESTRICTED_ENVS, _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS
-DARWIN_USER_DIR, _CS_DARWIN_USER_DIR
-DARWIN_USER_TEMP_DIR, _CS_DARWIN_USER_TEMP_DIR
-DARWIN_USER_CACHE_DIR, _CS_DARWIN_USER_CACHE_DIR
 %%
 int
 find_confstr(const char *name, int *key)
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index 5da036c2e6d5..a82196e33d2e 100644
--- a/usr.bin/getconf/getconf.c
+++ b/usr.bin/getconf/getconf.c
@@ -187,3 +187,4 @@ do_pathconf(const char *name, int key, const char *path)
 	else
 		printf("%ld\n", value);
 }
+
diff --git a/usr.bin/getconf/limits.gperf b/usr.bin/getconf/limits.gperf
index a944191c810b..68e0d65e78ff 100644
--- a/usr.bin/getconf/limits.gperf
+++ b/usr.bin/getconf/limits.gperf
@@ -9,9 +9,6 @@
 
 #include <string.h>
 #include <limits.h>
-#ifdef APPLE_GETCONF_UNDERSCORE
-#include <alloca.h>
-#endif /* APPLE_GETCONF_UNDERSCORE */
 
 #include "getconf.h"
 
@@ -23,11 +20,11 @@ static const struct map *in_word_set(const char *str);
 %}
 struct map { const char *name; intmax_t value; int valid; };
 %%
+_POSIX_CLOCKRES_MIN, _POSIX_CLOCKRES_MIN
 _POSIX_AIO_LISTIO_MAX, _POSIX_AIO_LISTIO_MAX
 _POSIX_AIO_MAX, _POSIX_AIO_MAX
 _POSIX_ARG_MAX, _POSIX_ARG_MAX
 _POSIX_CHILD_MAX, _POSIX_CHILD_MAX
-_POSIX_CLOCKRES_MIN, _POSIX_CLOCKRES_MIN
 _POSIX_DELAYTIMER_MAX, _POSIX_DELAYTIMER_MAX
 _POSIX_HOST_NAME_MAX, _POSIX_HOST_NAME_MAX
 _POSIX_LINK_MAX, _POSIX_LINK_MAX
@@ -67,7 +64,7 @@ _POSIX2_BC_SCALE_MAX, _POSIX2_BC_SCALE_MAX
 _POSIX2_BC_STRING_MAX, _POSIX2_BC_STRING_MAX
 _POSIX2_CHARCLASS_NAME_MAX, _POSIX2_CHARCLASS_NAME_MAX
 _POSIX2_COLL_WEIGHTS_MAX, _POSIX2_COLL_WEIGHTS_MAX
-_POSIX2_EXPR_NEST_MAX, _POSIX2_EXPR_NEST_MAX
+_POSIX2_EXPR_NEXT_MAX, _POSIX2_EXPR_NEST_MAX
 _POSIX2_LINE_MAX, _POSIX2_LINE_MAX
 _POSIX2_RE_DUP_MAX, _POSIX2_RE_DUP_MAX
 _XOPEN_IOV_MAX, _XOPEN_IOV_MAX
@@ -108,9 +105,6 @@ int
 find_limit(const char *name, intmax_t *value)
 {
 	const struct map *rv;
-#ifdef APPLE_GETCONF_UNDERSCORE
-	char *alt;
-#endif /* APPLE_GETCONF_UNDERSCORE */
 
 	rv = in_word_set(name);
 	if (rv != NULL) {
@@ -120,23 +114,5 @@ find_limit(const char *name, intmax_t *value)
 		}
 		return -1;
 	}
-#ifdef APPLE_GETCONF_UNDERSCORE
-	if(*name == '_')
-		alt = (char *)name + 1;
-	else {
-		if((alt = (char *)alloca(strlen(name) + 2)) == NULL)
-			return 0;
-		*alt = '_';
-		strcpy(alt + 1, name);
-	}
-	rv = in_word_set(alt);
-	if (rv != NULL) {
-		if (rv->valid) {
-			*value = rv->value;
-			return 1;
-		}
-		return -1;
-	}
-#endif /* APPLE_GETCONF_UNDERSCORE */
 	return 0;
 }
diff --git a/usr.bin/getconf/pathconf.gperf b/usr.bin/getconf/pathconf.gperf
index 3b9e0f478364..f283546f063a 100644
--- a/usr.bin/getconf/pathconf.gperf
+++ b/usr.bin/getconf/pathconf.gperf
@@ -9,9 +9,6 @@
 
 #include <string.h>
 #include <unistd.h>
-#ifdef APPLE_GETCONF_UNDERSCORE
-#include <alloca.h>
-#endif /* APPLE_GETCONF_UNDERSCORE */
 
 #include "getconf.h"
 
@@ -23,10 +20,17 @@ static const struct map *in_word_set(const char *str);
 %}
 struct map { const char *name; int key; int valid; };
 %%
+ACL_EXTENDED, _PC_ACL_EXTENDED
+ACL_NFS4, _PC_ACL_NFS4
+ACL_PATH_MAX, _PC_ACL_PATH_MAX
+CAP_PRESENT, _PC_CAP_PRESENT
 FILESIZEBITS, _PC_FILESIZEBITS
+INF_PRESENT, _PC_INF_PRESENT
 LINK_MAX, _PC_LINK_MAX
+MAC_PRESENT, _PC_MAC_PRESENT
 MAX_CANON, _PC_MAX_CANON
 MAX_INPUT, _PC_MAX_INPUT
+MIN_HOLE_SIZE, _PC_MIN_HOLE_SIZE
 NAME_MAX, _PC_NAME_MAX
 PATH_MAX, _PC_PATH_MAX
 PIPE_BUF, _PC_PIPE_BUF
@@ -35,28 +39,24 @@ POSIX_REC_INCR_XFER_SIZE, _PC_REC_INCR_XFER_SIZE
 POSIX_REC_MAX_XFER_SIZE, _PC_REC_MAX_XFER_SIZE
 POSIX_REC_MIN_XFER_SIZE, _PC_REC_MIN_XFER_SIZE
 POSIX_REC_XFER_ALIGN, _PC_REC_XFER_ALIGN
-POSIX2_SYMLINKS, _PC_2_SYMLINKS
 SYMLINK_MAX, _PC_SYMLINK_MAX
 TRUSTEDBSD_ACL_EXTENDED, _PC_ACL_EXTENDED
+TRUSTEDBSD_ACL_NFS4, _PC_ACL_NFS4
 TRUSTEDBSD_ACL_PATH_MAX, _PC_ACL_PATH_MAX
 TRUSTEDBSD_CAP_PRESENT, _PC_CAP_PRESENT
 TRUSTEDBSD_INF_PRESENT, _PC_INF_PRESENT
 TRUSTEDBSD_MAC_PRESENT, _PC_MAC_PRESENT
-_POSIX_ASYNC_IO, _PC_ASYNC_IO
 _POSIX_CHOWN_RESTRICTED, _PC_CHOWN_RESTRICTED
 _POSIX_NO_TRUNC, _PC_NO_TRUNC
-_POSIX_PATH_MAX, _PC_PATH_MAX
+_POSIX_VDISABLE, _PC_VDISABLE
+_POSIX_ASYNC_IO, _PC_ASYNC_IO
 _POSIX_PRIO_IO, _PC_PRIO_IO
 _POSIX_SYNC_IO, _PC_SYNC_IO
-_POSIX_VDISABLE, _PC_VDISABLE
 %%
 int
 find_pathconf(const char *name, int *key)
 {
 	const struct map *rv;
-#ifdef APPLE_GETCONF_UNDERSCORE
-	char *alt;
-#endif /* APPLE_GETCONF_UNDERSCORE */
 
 	rv = in_word_set(name);
 	if (rv != NULL) {
@@ -66,23 +66,5 @@ find_pathconf(const char *name, int *key)
 		}
 		return -1;
 	}
-#ifdef APPLE_GETCONF_UNDERSCORE
-	if(*name == '_')
-		alt = (char *)name + 1;
-	else {
-		if((alt = (char *)alloca(strlen(name) + 2)) == NULL)
-			return 0;
-		*alt = '_';
-		strcpy(alt + 1, name);
-	}
-	rv = in_word_set(alt);
-	if (rv != NULL) {
-		if (rv->valid) {
-			*key = rv->key;
-			return 1;
-		}
-		return -1;
-	}
-#endif /* APPLE_GETCONF_UNDERSCORE */
 	return 0;
 }
diff --git a/usr.bin/getconf/progenv.gperf b/usr.bin/getconf/progenv.gperf
index 564c7d944775..481055393b79 100644
--- a/usr.bin/getconf/progenv.gperf
+++ b/usr.bin/getconf/progenv.gperf
@@ -30,14 +30,11 @@ static const struct map *in_word_set(const char *str);
  * be updated.  (We cheat here and define the supported environments
  * statically.)
  */
-#if defined(__alpha__) || defined(__sparc64__)
+#if defined(__sparc64__) || defined(__amd64__)
 #define	have_LP64_OFF64		NULL
-#elif defined(__APPLE__)
-#define	have_LP64_OFF64		NULL
-#define	have_LPBIG_OFFBIG	NULL
 #endif
 
-#if defined(__i386__) || defined(__powerpc__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__powerpc__)
 #define	have_ILP32_OFFBIG	NULL
 #endif
 
@@ -47,11 +44,11 @@ struct map { const char *name; const char *alt_path; int valid; };
 POSIX_V6_ILP32_OFF32, notdef
 POSIX_V6_ILP32_OFFBIG, have_ILP32_OFFBIG
 POSIX_V6_LP64_OFF64, have_LP64_OFF64
-POSIX_V6_LPBIG_OFFBIG, have_LPBIG_OFFBIG
+POSIX_V6_LPBIG_OFFBIG, notdef
 _POSIX_V6_ILP32_OFF32, notdef
 _POSIX_V6_ILP32_OFFBIG, have_ILP32_OFFBIG
 _POSIX_V6_LP64_OFF64, have_LP64_OFF64
-_POSIX_V6_LPBIG_OFFBIG, have_LPBIG_OFFBIG
+_POSIX_V6_LPBIG_OFFBIG, notdef
 %%
 int
 find_progenv(const char *name, const char **alt_path)
diff --git a/usr.bin/getconf/sysconf.gperf b/usr.bin/getconf/sysconf.gperf
index f6f750af64d2..6a0a34989877 100644
--- a/usr.bin/getconf/sysconf.gperf
+++ b/usr.bin/getconf/sysconf.gperf
@@ -9,9 +9,6 @@
 
 #include <string.h>
 #include <unistd.h>
-#ifdef APPLE_GETCONF_UNDERSCORE
-#include <alloca.h>
-#endif /* APPLE_GETCONF_UNDERSCORE */
 
 #include "getconf.h"
 
@@ -73,16 +70,9 @@ _POSIX2_C_VERSION, _SC_2_C_VERSION
 _POSIX2_FORT_DEV, _SC_2_FORT_DEV
 _POSIX2_FORT_RUN, _SC_2_FORT_RUN
 _POSIX2_LOCALEDEF, _SC_2_LOCALEDEF
-_POSIX2_PBS, _SC_PBS
-_POSIX2_PBS_ACCOUNTING, _SC_PBS_ACCOUNTING
-_POSIX2_PBS_CHECKPOINT, _SC_PBS_CHECKPOINT
-_POSIX2_PBS_LOCATE, _SC_PBS_LOCATE
-_POSIX2_PBS_MESSAGE, _SC_PBS_MESSAGE
-_POSIX2_PBS_TRACK, _SC_PBS_TRACK
 _POSIX2_SW_DEV, _SC_2_SW_DEV
 _POSIX2_UPE, _SC_2_UPE
 _POSIX2_VERSION, _SC_2_VERSION
-_POSIX_ADVISORY_INFO, _SC_ADVISORY_INFO
 _POSIX_ASYNCHRONOUS_IO, _SC_ASYNCHRONOUS_IO 
 _POSIX_BARRIERS, _SC_BARRIERS
 _POSIX_CLOCK_SELECTION, _SC_CLOCK_SELECTION
@@ -99,7 +89,6 @@ _POSIX_MESSAGE_PASSING, _SC_MESSAGE_PASSING
 _POSIX_MONOTONIC_CLOCK, _SC_MONOTONIC_CLOCK
 _POSIX_PRIORITIZED_IO, _SC_PRIORITIZED_IO 
 _POSIX_PRIORITY_SCHEDULING, _SC_PRIORITY_SCHEDULING 
-_POSIX_RAW_SOCKETS, _SC_RAW_SOCKETS
 _POSIX_READER_WRITER_LOCKS, _SC_READER_WRITER_LOCKS
 _POSIX_REALTIME_SIGNALS, _SC_REALTIME_SIGNALS 
 _POSIX_REGEXP, _SC_REGEXP
@@ -110,7 +99,6 @@ _POSIX_SHELL, _SC_SHELL
 _POSIX_SPAWN, _SC_SPAWN
 _POSIX_SPIN_LOCKS, _SC_SPIN_LOCKS
 _POSIX_SPORADIC_SERVER, _SC_SPORADIC_SERVER
-_POSIX_SS_REPL_MAX, _SC_SS_REPL_MAX
 _POSIX_SYNCHRONIZED_IO, _SC_SYNCHRONIZED_IO 
 _POSIX_THREADS, _SC_THREADS 
 _POSIX_THREAD_ATTR_STACKADDR, _SC_THREAD_ATTR_STACKADDR 
@@ -123,28 +111,23 @@ _POSIX_THREAD_PROCESS_SHARED, _SC_THREAD_PROCESS_SHARED
 _POSIX_THREAD_SAFE_FUNCTIONS, _SC_THREAD_SAFE_FUNCTIONS
 _POSIX_THREAD_SPORADIC_SERVER, _SC_THREAD_SPORADIC_SERVER
 _POSIX_TIMEOUTS, _SC_TIMEOUTS
-_POSIX_TIMERS, _SC_TIMERS
 _POSIX_TRACE, _SC_TRACE
 _POSIX_TRACE_EVENT_FILTER, _SC_TRACE_EVENT_FILTER
-_POSIX_TRACE_EVENT_NAME_MAX, _SC_TRACE_EVENT_NAME_MAX
 _POSIX_TRACE_INHERIT, _SC_TRACE_INHERIT
 _POSIX_TRACE_LOG, _SC_TRACE_LOG
-_POSIX_TRACE_NAME_MAX, _SC_TRACE_NAME_MAX
-_POSIX_TRACE_SYS_MAX, _SC_TRACE_SYS_MAX
-_POSIX_TRACE_USER_EVENT_MAX, _SC_TRACE_USER_EVENT_MAX
+_POSIX_TIMERS, _SC_TIMERS
 _POSIX_TYPED_MEMORY_OBJECTS, _SC_TYPED_MEMORY_OBJECTS
+_POSIX_VERSION, _SC_VERSION
 _POSIX_V6_ILP32_OFF32, _SC_V6_ILP32_OFF32
 _POSIX_V6_ILP32_OFFBIG, _SC_V6_ILP32_OFFBIG
 _POSIX_V6_LP64_OFF64, _SC_V6_LP64_OFF64
 _POSIX_V6_LPBIG_OFFBIG, _SC_V6_LPBIG_OFFBIG
-_POSIX_VERSION, _SC_VERSION
 _XOPEN_CRYPT, _SC_XOPEN_CRYPT
 _XOPEN_ENH_I18N, _SC_XOPEN_ENH_I18N
 _XOPEN_LEGACY, _SC_XOPEN_LEGACY
 _XOPEN_REALTIME, _SC_XOPEN_REALTIME
 _XOPEN_REALTIME_THREADS, _SC_XOPEN_REALTIME_THREADS
 _XOPEN_SHM, _SC_XOPEN_SHM
-_XOPEN_STREAMS, _SC_XOPEN_STREAMS
 _XOPEN_UNIX, _SC_XOPEN_UNIX
 _XOPEN_VERSION, _SC_XOPEN_VERSION
 _XOPEN_XCU_VERSION, _SC_XCU_VERSION
@@ -153,9 +136,6 @@ int
 find_sysconf(const char *name, int *key)
 {
 	const struct map *rv;
-#ifdef APPLE_GETCONF_UNDERSCORE
-	char *alt;
-#endif /* APPLE_GETCONF_UNDERSCORE */
 
 	rv = in_word_set(name);
 	if (rv != NULL) {
@@ -165,23 +145,5 @@ find_sysconf(const char *name, int *key)
 		}
 		return -1;
 	}
-#ifdef APPLE_GETCONF_UNDERSCORE
-	if(*name == '_')
-		alt = (char *)name + 1;
-	else {
-		if((alt = (char *)alloca(strlen(name) + 2)) == NULL)
-			return 0;
-		*alt = '_';
-		strcpy(alt + 1, name);
-	}
-	rv = in_word_set(alt);
-	if (rv != NULL) {
-		if (rv->valid) {
-			*key = rv->key;
-			return 1;
-		}
-		return -1;
-	}
-#endif /* APPLE_GETCONF_UNDERSCORE */
 	return 0;
 }