1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
1998-10-29  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/ttyname_r.c (ttyname_r): Try reading
	/prof/self/fd/FD first.
	* sysdeps/unix/sysv/linux/ttyname.c (ttyname): Likewise.

	* stdio-common/_itoa.h (_fitoa_word): New inline function.  Write
	formatted number starting at given position and return pointer to
	following byte.
	(_fitoa): Likewise, for long long.
This commit is contained in:
Ulrich Drepper
1998-10-29 15:17:25 +00:00
parent 05e951cd1a
commit c5e340c71b
14 changed files with 109 additions and 51 deletions

View File

@ -26,6 +26,8 @@
#include <string.h>
#include <stdlib.h>
#include <stdio-common/_itoa.h>
static int getttyname_r __P ((int fd, char *buf, size_t buflen,
dev_t mydev, ino_t myino, int save,
int *dostat)) internal_function;
@ -102,6 +104,7 @@ __ttyname_r (fd, buf, buflen)
char *buf;
size_t buflen;
{
char procname[30];
struct stat st, st1;
int dostat = 0;
int save = errno;
@ -127,6 +130,18 @@ __ttyname_r (fd, buf, buflen)
return ENOTTY;
}
/* We try using the /proc filesystem. */
*_fitoa_word (fd, __stpcpy (procname, "/proc/self/fd/"), 10, 0) = '\0';
ret = __readlink (procname, buf, buflen - 1);
if (ret != -1)
return 0;
if (errno == ENAMETOOLONG)
{
__set_errno (ERANGE);
return ERANGE;
}
if (fstat (fd, &st) < 0)
return errno;