From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/13269 Path: news.gmane.org!.POSTED!not-for-mail From: Rich Felker Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH v2] improve error handling of ttyname_r and isatty Date: Sat, 15 Sep 2018 02:47:10 -0400 Message-ID: <20180915064710.GR1878@brightrain.aerifal.cx> References: <20180913182515.GK1878@brightrain.aerifal.cx> <20180913212342.25800-1-benjamin@python.org> <20180913212342.25800-2-benjamin@python.org> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1536993922 28085 195.159.176.226 (15 Sep 2018 06:45:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 15 Sep 2018 06:45:22 +0000 (UTC) User-Agent: Mutt/1.5.21 (2010-09-15) To: musl@lists.openwall.com Original-X-From: musl-return-13285-gllmg-musl=m.gmane.org@lists.openwall.com Sat Sep 15 08:45:18 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 1g14KQ-00077v-Sf for gllmg-musl@m.gmane.org; Sat, 15 Sep 2018 08:45:14 +0200 Original-Received: (qmail 13995 invoked by uid 550); 15 Sep 2018 06:47:23 -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 13971 invoked from network); 15 Sep 2018 06:47:23 -0000 Content-Disposition: inline In-Reply-To: <20180913212342.25800-2-benjamin@python.org> Original-Sender: Rich Felker Xref: news.gmane.org gmane.linux.lib.musl.general:13269 Archived-At: On Thu, Sep 13, 2018 at 02:23:42PM -0700, Benjamin Peterson wrote: > 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 Thanks, applying. Rich