Libc-391.4.1.tar.gz

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

diff --git a/gen/getttyent.c b/gen/getttyent.c
index 89bf092c226c8fe73cd11fe6fe7d276fc850315c..ca623a9721bd10e40c20e83d89f9c7b34ffbf671 100644 (file)
--- a/gen/getttyent.c
+++ b/gen/getttyent.c
@@ -3,19 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -52,6 +53,7 @@
  * SUCH DAMAGE.
  */
 
+#include "xlocale_private.h"
 
 #include <ttyent.h>
 #include <stdio.h>
@@ -76,6 +78,8 @@ getttynam(tty)
        return (t);
 }
 
+static char *skip(), *value();
+
 struct ttyent *
 getttyent()
 {
@@ -84,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);
@@ -103,7 +107,7 @@ getttyent()
                                ;
                        continue;
                }
-               while (isspace(*p))
+               while (isspace_l(*p, loc))
                        ++p;
                if (*p && *p != '#')
                        break;
@@ -126,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))