Libc-1439.100.3.tar.gz

[apple/libc.git] / gen / FreeBSD / ttyslot.c

diff --git a/gen/FreeBSD/ttyslot.c b/gen/FreeBSD/ttyslot.c
index 0d7359c46118271d7ff7767300f45c3081722911..d437a48cd1164124da5fd4527c402bc98868e801 100644 (file)
--- a/gen/FreeBSD/ttyslot.c
+++ b/gen/FreeBSD/ttyslot.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.

  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.


@@ -35,8 +31,9 @@
 static char sccsid[] = "@(#)ttyslot.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)ttyslot.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/gen/ttyslot.c,v 1.4 2002/02/01 01:08:48 obrien Exp $");
+__FBSDID("$FreeBSD$");

 
 

+#include <paths.h>

 #include <ttyent.h>
 #include <stdio.h>
 #include <string.h>
 #include <ttyent.h>
 #include <stdio.h>
 #include <string.h>


@@ -45,26 +42,6 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/ttyslot.c,v 1.4 2002/02/01 01:08:48 obrien
 int
 ttyslot()
 {
 int
 ttyslot()
 {

-       struct ttyent *ttyp;
-       int slot;
-       char *p;
-       int cnt;
-       char *name;

 
 

-       setttyent();
-       for (cnt = 0; cnt < 3; ++cnt)
-               if ( (name = ttyname(cnt)) ) {
-                       if ( (p = rindex(name, '/')) )
-                               ++p;
-                       else
-                               p = name;
-                       for (slot = 1; (ttyp = getttyent()); ++slot)
-                               if (!strcmp(ttyp->ty_name, p)) {
-                                       endttyent();
-                                       return(slot);
-                               }
-                       break;
-               }
-       endttyent();
-       return(0);
+       return (0);

 }
 }