From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/13261 Path: news.gmane.org!.POSTED!not-for-mail From: Benjamin Peterson Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH v2] improve error handling of ttyname_r and isatty Date: Thu, 13 Sep 2018 14:23:42 -0700 Message-ID: <20180913212342.25800-2-benjamin@python.org> References: <20180913182515.GK1878@brightrain.aerifal.cx> <20180913212342.25800-1-benjamin@python.org> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1536873721 9055 195.159.176.226 (13 Sep 2018 21:22:01 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 13 Sep 2018 21:22:01 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-13277-gllmg-musl=m.gmane.org@lists.openwall.com Thu Sep 13 23:21:56 2018 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1g0Z3k-0002Di-H1 for gllmg-musl@m.gmane.org; Thu, 13 Sep 2018 23:21:56 +0200 Original-Received: (qmail 19643 invoked by uid 550); 13 Sep 2018 21:24:04 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 19605 invoked from network); 13 Sep 2018 21:24:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=python.org; s=200901; t=1536873832; bh=88FJJUHqM5b2YQhbFpKfgZ8Oo91iT+ViNVAG6ZWU42w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=y9qkXi1fIWFS5Cdd/xBMr/QjoIzKL0E8c1DfqmtpbYqmUNqcvu2KBcLyn6uIKrRfI rdtQ/jN5SM2ZmR8Vep19653D00mRL6hBkmxDp6eH9fg7e7xrxRJ+5q6rq3EdbSGfgL BkSVvYfnVSHL8tt4cElD7RVQO7UpBqfXeUPmsc2k= X-ME-Proxy: X-ME-Sender: X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180913212342.25800-1-benjamin@python.org> Xref: news.gmane.org gmane.linux.lib.musl.general:13261 Archived-At: 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 +#include #include #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