From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2210) id B035A386EC6C; Fri, 22 Jan 2021 15:44:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B035A386EC6C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: ptsname_r: always return an error number on failure X-Act-Checkin: newlib-cygwin X-Git-Author: Ken Brown X-Git-Refname: refs/heads/master X-Git-Oldrev: 4aefad2bb827afa273fcd768bd06dd618d41ae75 X-Git-Newrev: a60a4501b77dca8f30e01327b96171ee89c278f7 Message-Id: <20210122154436.B035A386EC6C@sourceware.org> Date: Fri, 22 Jan 2021 15:44:36 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2021 15:44:36 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a60a4501b77dca8f30e01327b96171ee89c278f7 commit a60a4501b77dca8f30e01327b96171ee89c278f7 Author: Ken Brown Date: Wed Jan 20 12:01:13 2021 -0500 Cygwin: ptsname_r: always return an error number on failure Return EBADF on a bad file descriptor. Previously 0 was returned, in violation of the requirement in https://man7.org/linux/man-pages/man3/ptsname_r.3.html that an error number should be returned on failure. We are intentionally deviating from Linux, on which ENOTTY is returned. Addresses: https://lists.gnu.org/archive/html/bug-gnulib/2021-01/msg00245.html Diff: --- winsup/cygwin/release/3.2.0 | 3 +++ winsup/cygwin/syscalls.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/release/3.2.0 b/winsup/cygwin/release/3.2.0 index 43725cec2..f748a9bc8 100644 --- a/winsup/cygwin/release/3.2.0 +++ b/winsup/cygwin/release/3.2.0 @@ -52,3 +52,6 @@ Bug Fixes - Fix the errno when a path contains .. and the prefix exists but is not a directory. Addresses: https://lists.gnu.org/archive/html/bug-gnulib/2021-01/msg00214.html + +- Fix the return value when ptsname_r(3) is called with a bad file descriptor + Addresses: https://lists.gnu.org/archive/html/bug-gnulib/2021-01/msg00245.html diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 7044ea903..c985142eb 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -3392,7 +3392,7 @@ ptsname_r (int fd, char *buf, size_t buflen) cygheap_fdget cfd (fd); if (cfd < 0) - return 0; + return EBADF; return cfd->ptsname_r (buf, buflen); }