lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

BZ #11538: Fix ttyname_r callers not to expect errno was set.

Browse Source
This commit is contained in:
Bruno Haible
2010-04-28 15:00:14 -07:00
committed by Roland McGrath
parent 6cffee3611
commit 8c0677fe5d
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2010-04-25 Bruno Haible <bruno@clisp.org> 2010-04-25 Bruno Haible <bruno@clisp.org>
[BZ #11538]
* sysdeps/unix/bsd/ptsname.c (__ptsname_r): Use __ttyname_r's return
value instead of errno.
* sysdeps/unix/getlogin.c (getlogin): Likewise.
[BZ #11537] [BZ #11537]
* sysdeps/mach/hurd/ttyname_r.c (__ttyname_r): Upon failure, return * sysdeps/mach/hurd/ttyname_r.c (__ttyname_r): Upon failure, return
errno, not -1. errno, not -1.

11
sysdeps/unix/bsd/ptsname.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1998,2002 Free Software Foundation, Inc. /* Copyright (C) 1998,2002,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -44,6 +44,7 @@ int
__ptsname_r (int fd, char *buf, size_t buflen) __ptsname_r (int fd, char *buf, size_t buflen)
{ {
int save_errno = errno; int save_errno = errno;
int err;
struct stat st; struct stat st;
if (buf == NULL) if (buf == NULL)
@ -62,8 +63,12 @@ __ptsname_r (int fd, char *buf, size_t buflen)
return ERANGE; return ERANGE;
} }
if (__ttyname_r (fd, buf, buflen) != 0) err = __ttyname_r (fd, buf, buflen);
return errno; if (err != 0)
{
__set_errno (err);
return errno;
}
buf[sizeof (_PATH_DEV) - 1] = 't'; buf[sizeof (_PATH_DEV) - 1] = 't';

9
sysdeps/unix/getlogin.c
View File

@ -38,6 +38,7 @@ getlogin (void)
{ {
char tty_pathname[2 + 2 * NAME_MAX]; char tty_pathname[2 + 2 * NAME_MAX];
char *real_tty_path = tty_pathname; char *real_tty_path = tty_pathname;
int err;
char *result = NULL; char *result = NULL;
struct utmp *ut, line, buffer; struct utmp *ut, line, buffer;
@ -50,8 +51,12 @@ getlogin (void)
thing to do. Note that ttyname(open("/dev/tty")) on those thing to do. Note that ttyname(open("/dev/tty")) on those
systems returns /dev/tty, so that is not a possible solution for systems returns /dev/tty, so that is not a possible solution for
getlogin(). */ getlogin(). */
if (__ttyname_r (0, real_tty_path, sizeof (tty_pathname)) != 0) err = __ttyname_r (0, real_tty_path, sizeof (tty_pathname));
return NULL; if (err != 0)
{
__set_errno (err);
return NULL;
}
real_tty_path += 5; /* Remove "/dev/". */ real_tty_path += 5; /* Remove "/dev/". */