From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 12 Apr 2004 22:49:06 +0000 (-0000)
Subject: Sigh.  The patch from David Anders (prpplague) broke standard
X-Git-Tag: android-x86-2.2~6430
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b37f883478f61cf5aed1b5d46b339b42219b6d18;p=android-x86%2Fexternal-busybox.git

Sigh.  The patch from David Anders (prpplague) broke standard
securetty files since the /dev was not stripped.
---

diff --git a/loginutils/login.c b/loginutils/login.c
index 99f66b53b..10b7133d7 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -127,7 +127,9 @@ extern int login_main(int argc, char **argv)
 #endif
 
 	tmp = ttyname ( 0 );
-	if ( tmp )
+	if ( tmp && ( strncmp ( tmp, "/dev/", 5 ) == 0 ))
+		safe_strncpy ( tty, tmp + 5, sizeof( tty ));
+	else if ( tmp && *tmp == '/' )
 		safe_strncpy ( tty, tmp, sizeof( tty ));
 	else
 		safe_strncpy ( tty, "UNKNOWN", sizeof( tty ));