Loading...
--- Libc/Libc-391/gen/getusershell.c
+++ Libc/Libc-262.3.2/gen/getusershell.c
@@ -2,6 +2,8 @@
* Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
+ *
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
*
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
@@ -53,7 +55,6 @@
* SUCH DAMAGE.
*/
-#include "xlocale_private.h"
#include <sys/param.h>
#include <sys/file.h>
@@ -71,7 +72,7 @@
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.
@@ -115,7 +116,6 @@
register char **sp, *cp;
register FILE *fp;
struct stat statb;
- locale_t loc = __current_locale();
if (shells != NULL)
free(shells);
@@ -148,7 +148,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';
}