Libc-391.4.1.tar.gz

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

diff --git a/gen/getttyent.c b/gen/getttyent.c
index 21f5096b543a7f381df219bf9012f3f71d66f174..ca623a9721bd10e40c20e83d89f9c7b34ffbf671 100644 (file)
--- a/gen/getttyent.c
+++ b/gen/getttyent.c
@@ -3,8 +3,6 @@
  *
  * @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
@@ -55,6 +53,7 @@
  * SUCH DAMAGE.
  */
 
+#include "xlocale_private.h"
 
 #include <ttyent.h>
 #include <stdio.h>
@@ -79,6 +78,8 @@ getttynam(tty)
        return (t);
 }
 
+static char *skip(), *value();
+
 struct ttyent *
 getttyent()
 {
@@ -87,7 +88,7 @@ getttyent()
        register char *p;
 #define        MAXLINELENGTH   1024
        static char *line = NULL;
-       static char *skip(), *value();
+       locale_t loc = __current_locale();
 
        if ( line == NULL ) {
                line = malloc(MAXLINELENGTH);
@@ -106,7 +107,7 @@ getttyent()
                                ;
                        continue;
                }
-               while (isspace(*p))
+               while (isspace_l(*p, loc))
                        ++p;
                if (*p && *p != '#')
                        break;
@@ -129,7 +130,7 @@ getttyent()
        tty.ty_onerror = NULL;
        tty.ty_onoption = NULL;
 
-#define        scmp(e) !strncmp(p, e, sizeof(e) - 1) && isspace(p[sizeof(e) - 1])
+#define        scmp(e) !strncmp(p, e, sizeof(e) - 1) && isspace_l(p[sizeof(e) - 1], loc)
 #define        vcmp(e) !strncmp(p, e, sizeof(e) - 1) && p[sizeof(e) - 1] == '='
        for (; *p; p = skip(p)) {
                if (scmp(_TTYS_OFF))