--- Libc/Libc-583/gen/confstr.c
+++ Libc/Libc-391/gen/confstr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -62,17 +62,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdio.h>	/* for P_tmpdir */
-
-#include <dirhelper_priv.h>
-
-extern char *_dirhelper(dirhelper_which_t which, char *path, size_t pathlen);
-
-#if __DARWIN_UNIX03
-#define CONFSTR_ERR_RET	0
-#else /* !__DARWIN_UNIX03 */
-#define CONFSTR_ERR_RET	-1
-#endif /* __DARWIN_UNIX03 */
 
 size_t
 confstr(name, buf, len)
@@ -89,15 +78,15 @@
 		mib[0] = CTL_USER;
 		mib[1] = USER_CS_PATH;
 		if (sysctl(mib, 2, NULL, &tlen, NULL, 0) == -1)
-			return (CONFSTR_ERR_RET);
+			return (-1);
 		if (len != 0 && buf != NULL) {
 			if ((p = malloc(tlen)) == NULL)
-				return (CONFSTR_ERR_RET);
+				return (-1);
 			if (sysctl(mib, 2, p, &tlen, NULL, 0) == -1) {
 				sverrno = errno;
 				free(p);
 				errno = sverrno;
-				return (CONFSTR_ERR_RET);
+				return (-1);
 			}
 			/*
 			 * POSIX 1003.2 requires partial return of
@@ -107,7 +96,7 @@
 			buf[len - 1] = '\0';
 			free(p);
 		}
-		return (tlen);
+		return (tlen + 1);
 
 	case _CS_POSIX_V6_ILP32_OFF32_CFLAGS:
 	case _CS_XBS5_ILP32_OFF32_CFLAGS:		/* legacy */
@@ -167,42 +156,6 @@
 			strlcpy(buf, p, len);
 		return (strlen(p) + 1);
 
-	case _CS_DARWIN_USER_DIR:
-		if ((p = alloca(PATH_MAX)) == NULL) {
-			errno = ENOMEM;
-			return (CONFSTR_ERR_RET);
-		}
-		if (_dirhelper(DIRHELPER_USER_LOCAL, p, PATH_MAX) == NULL)
-			return (CONFSTR_ERR_RET);
-		goto docopy;
-
-	case _CS_DARWIN_USER_TEMP_DIR:
-		if ((p = alloca(PATH_MAX)) == NULL) {
-			errno = ENOMEM;
-			return (CONFSTR_ERR_RET);
-		}
-		if (_dirhelper(DIRHELPER_USER_LOCAL_TEMP, p, PATH_MAX) == NULL) {
-			/*
-			 * If _dirhelper() fails, try TMPDIR and P_tmpdir,
-			 * finally failing otherwise.
-			 */
-			if ((p = getenv("TMPDIR")) && access(p, W_OK) == 0)
-				goto docopy;
-			if (access(p = P_tmpdir, W_OK) == 0)
-				goto docopy;
-			return (CONFSTR_ERR_RET);
-		}
-		goto docopy;
-
-	case _CS_DARWIN_USER_CACHE_DIR:
-		if ((p = alloca(PATH_MAX)) == NULL) {
-			errno = ENOMEM;
-			return (CONFSTR_ERR_RET);
-		}
-		if (_dirhelper(DIRHELPER_USER_LOCAL_CACHE, p, PATH_MAX) == NULL)
-			return (CONFSTR_ERR_RET);
-		goto docopy;
-
 	default:
 		errno = EINVAL;
 		return (0);