Libc-391.5.21.tar.gz

[apple/libc.git] / gen / getusershell.c

diff --git a/gen/getusershell.c b/gen/getusershell.c
index 9c25b5de4932b38a239e0f0211573def87bc6bf0..7dc16c57ebfa9be4576df483cc9e28638a6b1295 100644 (file)
--- a/gen/getusershell.c
+++ b/gen/getusershell.c
@@ -3,8 +3,6 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @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
  * Version 2.0 (the 'License'). You may not use this file except in
  * 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


@@ -55,6 +53,7 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include "xlocale_private.h"

 
 #include <sys/param.h>
 #include <sys/file.h>
 
 #include <sys/param.h>
 #include <sys/file.h>


@@ -116,6 +115,7 @@ initshells()
        register char **sp, *cp;
        register FILE *fp;
        struct stat statb;
        register char **sp, *cp;
        register FILE *fp;
        struct stat statb;

+       locale_t loc = __current_locale();

 
        if (shells != NULL)
                free(shells);
 
        if (shells != NULL)
                free(shells);


@@ -148,7 +148,7 @@ initshells()
                if (*cp == '#' || *cp == '\0')
                        continue;
                *sp++ = cp;
                if (*cp == '#' || *cp == '\0')
                        continue;
                *sp++ = cp;

-               while (!isspace(*cp) && *cp != '#' && *cp != '\0')
+               while (!isspace_l(*cp, loc) && *cp != '#' && *cp != '\0')

                        cp++;
                *cp++ = '\0';
        }
                        cp++;
                *cp++ = '\0';
        }