BSD 4_3_Reno release

[unix-history] / usr / src / lib / libc / gen / ttyname.c

diff --git a/usr/src/lib/libc/gen/ttyname.c b/usr/src/lib/libc/gen/ttyname.c
index 9fd0c91..bc7becc 100644 (file)
--- a/usr/src/lib/libc/gen/ttyname.c
+++ b/usr/src/lib/libc/gen/ttyname.c
@@ -1,51 +1,60 @@
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ttyname.c  5.2 (Berkeley) 3/9/86";
-#endif LIBC_SCCS and not lint
-

 /*
 /*

- * ttyname(f): return "/dev/ttyXX" which the the name of the
- * tty belonging to file f.
- *  NULL if it is not a tty
+ * Copyright (c) 1988 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. 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.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
  */
 

-#define        NULL    0
-#include <sys/param.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)ttyname.c  5.6 (Berkeley) 6/1/90";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>

 #include <sys/dir.h>
 #include <sys/stat.h>
 #include <sys/dir.h>
 #include <sys/stat.h>

-
-static char    dev[]   = "/dev/";
-char   *strcpy();
-char   *strcat();
+#include <sgtty.h>
+#include <paths.h>

 
 char *
 
 char *

-ttyname(f)
+ttyname(fd)
+       int fd;

 {
 {

-       struct stat fsb;
-       struct stat tsb;
-       register struct direct *db;
-       register DIR *df;
-       static char rbuf[32];
+       register struct direct *dirp;
+       register DIR *dp;
+       struct stat sb1, sb2;
+       struct sgttyb ttyb;
+       static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
+       char *rval, *strcpy();

 
 

-       if (isatty(f)==0)
-               return(NULL);
-       if (fstat(f, &fsb) < 0)
+       if (ioctl(fd, TIOCGETP, &ttyb) < 0)

                return(NULL);
                return(NULL);

-       if ((fsb.st_mode&S_IFMT) != S_IFCHR)
+       if (fstat(fd, &sb1) < 0 || (sb1.st_mode&S_IFMT) != S_IFCHR)

                return(NULL);
                return(NULL);

-       if ((df = opendir(dev)) == NULL)
+       if ((dp = opendir(_PATH_DEV)) == NULL)

                return(NULL);
                return(NULL);

-       while ((db = readdir(df)) != NULL) {
-               if (db->d_ino != fsb.st_ino)
+       for (rval = NULL; dirp = readdir(dp);) {
+               if (dirp->d_ino != sb1.st_ino)

                        continue;
                        continue;

-               strcpy(rbuf, dev);
-               strcat(rbuf, db->d_name);
-               if (stat(rbuf, &tsb) < 0)
+               (void)strcpy(buf + sizeof(_PATH_DEV) - 1, dirp->d_name);
+               if (stat(buf, &sb2) < 0 || sb1.st_dev != sb2.st_dev ||
+                   sb1.st_ino != sb2.st_ino)

                        continue;
                        continue;

-               if (tsb.st_dev == fsb.st_dev && tsb.st_ino == fsb.st_ino) {
-                       closedir(df);
-                       return(rbuf);
-               }
+               closedir(dp);
+               rval = buf;
+               break;

        }
        }

-       closedir(df);
-       return(NULL);
+       closedir(dp);
+       return(rval);

 }
 }