--- Libc/Libc-1725.40.4/gen/getusershell.c
+++ Libc/Libc-262/gen/getusershell.c
@@ -3,20 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -53,7 +52,6 @@
  * SUCH DAMAGE.
  */
 
-#include "xlocale_private.h"
 
 #include <sys/param.h>
 #include <sys/file.h>
@@ -69,15 +67,15 @@
  * /etc/shells.
  */
 
-static const char * const okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
+static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
 static char **curshell, **shells, *strings;
-static char **initshells(void);
+static char **initshells __P((void));
 
 /*
  * Get a list of shells from _PATH_SHELLS, if it exists.
  */
 char *
-getusershell(void)
+getusershell()
 {
 	char *ret;
 
@@ -90,8 +88,9 @@
 }
 
 void
-endusershell(void)
+endusershell()
 {
+	
 	if (shells != NULL)
 		free(shells);
 	shells = NULL;
@@ -102,18 +101,18 @@
 }
 
 void
-setusershell(void)
+setusershell()
 {
+
 	curshell = initshells();
 }
 
 static char **
-initshells(void)
+initshells()
 {
 	register char **sp, *cp;
 	register FILE *fp;
 	struct stat statb;
-	locale_t loc = __current_locale();
 
 	if (shells != NULL)
 		free(shells);
@@ -122,21 +121,21 @@
 		free(strings);
 	strings = NULL;
 	if ((fp = fopen(_PATH_SHELLS, "r")) == NULL)
-		return ((char **)okshells);
+		return (okshells);
 	if (fstat(fileno(fp), &statb) == -1) {
 		(void)fclose(fp);
-		return ((char **)okshells);
+		return (okshells);
 	}
 	if ((strings = malloc((u_int)statb.st_size)) == NULL) {
 		(void)fclose(fp);
-		return ((char **)okshells);
+		return (okshells);
 	}
 	shells = calloc((unsigned)statb.st_size / 3, sizeof (char *));
 	if (shells == NULL) {
 		(void)fclose(fp);
 		free(strings);
 		strings = NULL;
-		return ((char **)okshells);
+		return (okshells);
 	}
 	sp = shells;
 	cp = strings;
@@ -146,7 +145,7 @@
 		if (*cp == '#' || *cp == '\0')
 			continue;
 		*sp++ = cp;
-		while (!isspace_l(*cp, loc) && *cp != '#' && *cp != '\0')
+		while (!isspace(*cp) && *cp != '#' && *cp != '\0')
 			cp++;
 		*cp++ = '\0';
 	}