From 0f7e29a54d5a130e4588f496b4e53d6302195e37 Mon Sep 17 00:00:00 2001
From: Oliver Lehmann <lehmann@ans-netz.de>
Date: Thu, 27 Aug 2009 09:16:35 +0000
Subject: [PATCH] more work

---
 WEGA/src/lib/libc/gen/TODO      |  1 -
 WEGA/src/lib/libc/gen/ttyname.c | 49 +++++++++++++--------------------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/WEGA/src/lib/libc/gen/TODO b/WEGA/src/lib/libc/gen/TODO
index 21eeec0..7e62818 100644
--- a/WEGA/src/lib/libc/gen/TODO
+++ b/WEGA/src/lib/libc/gen/TODO
@@ -3,4 +3,3 @@ execvp.o /z/src/libc/orig_obj/execvp.o differ: char 6, line 1
 getgrent.o /z/src/libc/orig_obj/getgrent.o differ: char 132, line 1
 malloc.o /z/src/libc/orig_obj/malloc.o differ: char 5, line 1
 nlist.o /z/src/libc/orig_obj/nlist.o differ: char 5, line 1
-ttyname.o /z/src/libc/orig_obj/ttyname.o differ: char 5, line 1
diff --git a/WEGA/src/lib/libc/gen/ttyname.c b/WEGA/src/lib/libc/gen/ttyname.c
index f5390bc..13a6dd5 100644
--- a/WEGA/src/lib/libc/gen/ttyname.c
+++ b/WEGA/src/lib/libc/gen/ttyname.c
@@ -3,12 +3,7 @@
 /*
  * ttyname(f): return "/dev/ttyXX" which the the name of the
  * tty belonging to file f.
- *
- * This program works in two passes: the first pass tries to
- * find the device by matchine device and inode numbers; if
- * that doesn't work, it tries a second time, this time doing a
- * stat on every file in /dev and trying to match device numbers
- * only. If that fails too, NULL is returned.
+ *  NULL if it is not a tty
  */
 
 #define	NULL	0
@@ -27,36 +22,30 @@ ttyname(f)
 	struct stat tsb;
 	struct direct db;
 	static char rbuf[32];
-	register df, pass1;
+	register df;
 
-	if(isatty(f) == 0)
+	if (isatty(f)==0)
 		return(NULL);
-	if(fstat(f, &fsb) < 0)
+	if (fstat(f, &fsb) < 0)
 		return(NULL);
-	if((fsb.st_mode & S_IFMT) != S_IFCHR)
+	if ((fsb.st_mode&S_IFMT) != S_IFCHR)
 		return(NULL);
-	if((df = open(dev, 0)) < 0)
+	if ((df = open(dev, 0)) < 0)
 		return(NULL);
-	pass1 = 1;
-	do {
-		while(read(df, (char *)&db, sizeof(db)) == sizeof(db)) {
-			if(db.d_ino == 0)
-				continue;
-			if(pass1 && db.d_ino != fsb.st_ino)
-				continue;
-			strcpy(rbuf, dev);
-			strcat(rbuf, db.d_name);
-			if(stat(rbuf, &tsb) < 0)
-				continue;
-			if(tsb.st_rdev == fsb.st_rdev
-			 && (tsb.st_mode&S_IFMT) == S_IFCHR
-			 && (!pass1 || tsb.st_ino == fsb.st_ino)) {
-				close(df);
-				return(rbuf);
-			}
+	while (read(df, (char *)&db, sizeof(db)) == sizeof(db)) {
+		if (db.d_ino == 0)
+			continue;
+		if (db.d_ino != fsb.st_ino)
+			continue;
+		strcpy(rbuf, dev);
+		strcat(rbuf, db.d_name);
+		if (stat(rbuf, &tsb) < 0)
+			continue;
+		if (tsb.st_dev==fsb.st_dev && tsb.st_ino==fsb.st_ino) {
+			close(df);
+			return(rbuf);
 		}
-		lseek(df, 0L, 0);
-	} while(pass1--);
+	}
 	close(df);
 	return(NULL);
 }