From: Benjamin Peterson <benjamin@python.org>
To: musl@lists.openwall.com
Subject: [PATCH] return EBADF from ttyname_r
Date: Wed, 12 Sep 2018 17:34:24 -0700 [thread overview]
Message-ID: <20180913003424.12234-1-benjamin@python.org> (raw)
POSIX allows ttyname(_r) to return EBADF if passed file descriptor is invalid.
---
src/unistd/ttyname_r.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/unistd/ttyname_r.c b/src/unistd/ttyname_r.c
index 33aa4ae1..e208b3c3 100644
--- a/src/unistd/ttyname_r.c
+++ b/src/unistd/ttyname_r.c
@@ -10,7 +10,10 @@ int ttyname_r(int fd, char *name, size_t size)
char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2];
ssize_t l;
- if (!isatty(fd)) return ENOTTY;
+ if (!isatty(fd)) {
+ if (errno == EBADF) return EBADF;
+ return ENOTTY;
+ }
__procfdname(procname, fd);
l = readlink(procname, name, size);
--
2.17.1
next reply other threads:[~2018-09-13 0:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-13 0:34 Benjamin Peterson [this message]
2018-09-13 2:07 ` Rich Felker
2018-09-13 3:23 ` A. Wilcox
2018-09-13 3:26 ` Rich Felker
2018-09-13 8:53 ` Szabolcs Nagy
2018-09-13 15:29 ` Rich Felker
2018-09-13 16:25 ` Benjamin Peterson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180913003424.12234-1-benjamin@python.org \
--to=benjamin@python.org \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).