diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-04-28 15:00:14 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@ucw.cz> | 2010-05-12 03:21:19 +0200 |
| commit | 15290d70863d800087aa629f035ad4bcb7f1f69b (patch) | |
| tree | 8c0b4564d73b10ee763d34f1684293baab7ea3a2 | |
| parent | ca27df35b7e821a800c9302bc06b7923e1ff59fd (diff) | |
| download | glibc-15290d70863d800087aa629f035ad4bcb7f1f69b.tar.gz glibc-15290d70863d800087aa629f035ad4bcb7f1f69b.tar.xz glibc-15290d70863d800087aa629f035ad4bcb7f1f69b.zip | |
BZ #11538: Fix ttyname_r callers not to expect errno was set.
(cherry picked from commit 8c0677fe5d91b7269364ca08fa08ed09e4c2d8c9)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/ptsname.c | 11 | ||||
| -rw-r--r-- | sysdeps/unix/getlogin.c | 9 |
3 files changed, 20 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 1500f3e683..3d9f1b5f94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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] * sysdeps/mach/hurd/ttyname_r.c (__ttyname_r): Upon failure, return errno, not -1. diff --git a/sysdeps/unix/bsd/ptsname.c b/sysdeps/unix/bsd/ptsname.c index fd446a4b66..6063201b0f 100644 --- a/sysdeps/unix/bsd/ptsname.c +++ b/sysdeps/unix/bsd/ptsname.c @@ -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. 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) { int save_errno = errno; + int err; struct stat st; if (buf == NULL) @@ -62,8 +63,12 @@ __ptsname_r (int fd, char *buf, size_t buflen) return ERANGE; } - if (__ttyname_r (fd, buf, buflen) != 0) - return errno; + err = __ttyname_r (fd, buf, buflen); + if (err != 0) + { + __set_errno (err); + return errno; + } buf[sizeof (_PATH_DEV) - 1] = 't'; diff --git a/sysdeps/unix/getlogin.c b/sysdeps/unix/getlogin.c index 4752685f86..7345af0886 100644 --- a/sysdeps/unix/getlogin.c +++ b/sysdeps/unix/getlogin.c @@ -33,6 +33,7 @@ getlogin (void) { char tty_pathname[2 + 2 * NAME_MAX]; char *real_tty_path = tty_pathname; + int err; char *result = NULL; static char name[UT_NAMESIZE + 1]; struct utmp *ut, line, buffer; @@ -46,8 +47,12 @@ getlogin (void) thing to do. Note that ttyname(open("/dev/tty")) on those systems returns /dev/tty, so that is not a possible solution for getlogin(). */ - if (__ttyname_r (0, real_tty_path, sizeof (tty_pathname)) != 0) - return NULL; + err = __ttyname_r (0, real_tty_path, sizeof (tty_pathname)); + if (err != 0) + { + __set_errno (err); + return NULL; + } real_tty_path += 5; /* Remove "/dev/". */ |