(__getmntent_r): Don't return with locked stream.

[kopensolaris-gnu/glibc.git] / misc / getttyent.c

diff --git a/misc/getttyent.c b/misc/getttyent.c
index b572fb7..e886e58 100644 (file)
--- a/misc/getttyent.c
+++ b/misc/getttyent.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getttyent.c        5.10 (Berkeley) 3/23/91";
+static char sccsid[] = "@(#)getttyent.c        8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
 #include <ttyent.h>
@@ -57,6 +57,9 @@ getttynam(tty)
        return (t);
 }
 
+static char *skip __P((char *)) internal_function;
+static char *value __P((char *)) internal_function;
+
 struct ttyent *
 getttyent()
 {
@@ -65,16 +68,18 @@ getttyent()
        register char *p;
 #define        MAXLINELENGTH   100
        static char line[MAXLINELENGTH];
-       static char *skip(), *value();
 
        if (!tf && !setttyent())
                return (NULL);
+       flockfile (tf);
        for (;;) {
-               if (!fgets(p = line, sizeof(line), tf))
+               if (!fgets_unlocked(p = line, sizeof(line), tf)) {
+                       funlockfile (tf);
                        return (NULL);
+               }
                /* skip lines that are too big */
                if (!index(p, '\n')) {
-                       while ((c = getc(tf)) != '\n' && c != EOF)
+                       while ((c = getc_unlocked(tf)) != '\n' && c != EOF)
                                ;
                        continue;
                }
@@ -83,6 +88,7 @@ getttyent()
                if (*p && *p != '#')
                        break;
        }
+       funlockfile(tf);
 
        zapchar = 0;
        tty.ty_name = p;
@@ -108,10 +114,6 @@ getttyent()
                        tty.ty_status |= TTY_ON;
                else if (scmp(_TTYS_SECURE))
                        tty.ty_status |= TTY_SECURE;
-               else if (scmp(_TTYS_TRUSTED))
-                       tty.ty_status |= TTY_TRUSTED;
-               else if (scmp(_TTYS_CONSOLE))
-                       tty.ty_status |= TTY_CONSOLE;
                else if (vcmp(_TTYS_WINDOW))
                        tty.ty_window = value(p);
                else
@@ -136,6 +138,7 @@ getttyent()
  * the next field.
  */
 static char *
+internal_function
 skip(p)
        register char *p;
 {
@@ -170,6 +173,7 @@ skip(p)
 }
 
 static char *
+internal_function
 value(p)
        register char *p;
 {