diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-04-28 15:00:14 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2010-04-28 15:00:14 -0700 |
| commit | 8c0677fe5d91b7269364ca08fa08ed09e4c2d8c9 (patch) | |
| tree | bf7c3ab332c3f5443cae34a82656765cb30c2a23 /sysdeps | |
| parent | 6cffee3611f324326ae46bb02d2baeb62c0db6a4 (diff) | |
BZ #11538: Fix ttyname_r callers not to expect errno was set.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/unix/bsd/ptsname.c | 11 | ||||
| -rw-r--r-- | sysdeps/unix/getlogin.c | 9 |
2 files changed, 15 insertions, 5 deletions
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 b0ad97cfa5..1fb70733fb 100644 --- a/sysdeps/unix/getlogin.c +++ b/sysdeps/unix/getlogin.c @@ -38,6 +38,7 @@ getlogin (void) { char tty_pathname[2 + 2 * NAME_MAX]; char *real_tty_path = tty_pathname; + int err; char *result = NULL; struct utmp *ut, line, buffer; @@ -50,8 +51,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/". */ |