From: Benjamin Peterson <benjamin@python.org>
To: musl@lists.openwall.com
Subject: [PATCH v2] improve error handling of ttyname_r and isatty
Date: Thu, 13 Sep 2018 14:23:42 -0700 [thread overview]
Message-ID: <20180913212342.25800-2-benjamin@python.org> (raw)
In-Reply-To: <20180913212342.25800-1-benjamin@python.org>
POSIX allows ttyname(_r) and isatty to return EBADF if passed file descriptor is
invalid.
---
src/unistd/isatty.c | 6 +++++-
src/unistd/ttyname_r.c | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/unistd/isatty.c b/src/unistd/isatty.c
index c8badaf5..75a9c186 100644
--- a/src/unistd/isatty.c
+++ b/src/unistd/isatty.c
@@ -1,9 +1,13 @@
#include <unistd.h>
+#include <errno.h>
#include <sys/ioctl.h>
#include "syscall.h"
int isatty(int fd)
{
struct winsize wsz;
- return !__syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz);
+ unsigned long r = syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz);
+ if (r == 0) return 1;
+ if (errno != EBADF) errno = ENOTTY;
+ return 0;
}
diff --git a/src/unistd/ttyname_r.c b/src/unistd/ttyname_r.c
index 33aa4ae1..24106ad8 100644
--- a/src/unistd/ttyname_r.c
+++ b/src/unistd/ttyname_r.c
@@ -10,7 +10,7 @@ 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)) return errno;
__procfdname(procname, fd);
l = readlink(procname, name, size);
--
2.17.1
next prev parent reply other threads:[~2018-09-13 21:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-13 16:27 [PATCH] " Benjamin Peterson
2018-09-13 18:25 ` Rich Felker
2018-09-13 21:23 ` Benjamin Peterson
2018-09-13 21:23 ` Benjamin Peterson [this message]
2018-09-15 6:47 ` [PATCH v2] " Rich Felker
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=20180913212342.25800-2-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).