From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id C0AFD38582BE; Thu, 1 Feb 2024 11:39:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C0AFD38582BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1706787553; bh=oT1enm0IWOtmvizsTEKQYyP+rgczLUn4LTQQUFPcpss=; h=From:To:Subject:Date:From; b=x6DzqCVEqaSNbQ1B6LW3tOXD+22HEtUJKZg5fZvbcWi8duHTUHCh97e07sp1Uu/2x OypaysFOeWnKaC4rQYZIw0mTlX0UnTzVSJGuOvW0lgw6dGaqGGMhdbwud9GEqZwAnd BN5NlEhdFZGUCXWEXzJr5vlk3i3OtblVUgVRcsik= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: implement fdclosedir X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: 7e40e0169a75ebdf3f3861dab47abdfeb0ad9c58 X-Git-Newrev: d72be712aa1e88f20a2cc0606c6d7b0928923848 Message-Id: <20240201113913.C0AFD38582BE@sourceware.org> Date: Thu, 1 Feb 2024 11:39:13 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dd72be712aa1= e88f20a2cc0606c6d7b0928923848 commit d72be712aa1e88f20a2cc0606c6d7b0928923848 Author: Corinna Vinschen AuthorDate: Tue Jan 23 13:41:14 2024 +0100 Commit: Corinna Vinschen CommitDate: Wed Jan 31 20:11:57 2024 +0100 Cygwin: implement fdclosedir =20 fdclosedir is BSD-only but already present in dirent.h for a couple of years. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/cygwin.din | 1 + winsup/cygwin/dir.cc | 34 ++++++++++++++++++++++++++++--= ---- winsup/cygwin/include/cygwin/version.h | 3 ++- winsup/cygwin/release/3.6.0 | 2 ++ 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din index 4539496d19cb..049be4cd0377 100644 --- a/winsup/cygwin/cygwin.din +++ b/winsup/cygwin/cygwin.din @@ -520,6 +520,7 @@ fcvt SIGFE fcvtbuf SIGFE fcvtf SIGFE fdatasync SIGFE +fdclosedir SIGFE fdim NOSIGFE fdimf NOSIGFE fdiml NOSIGFE diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index 2e0f03b902c0..82797a41f4c1 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -267,9 +267,8 @@ rewinddir (DIR *dir) __endtry } =20 -/* closedir: POSIX 5.1.2.1 */ -extern "C" int -closedir (DIR *dir) +static int +closedir_worker (DIR *dir, int *fdret) { __try { @@ -280,21 +279,44 @@ closedir (DIR *dir) =20 int res =3D ((fhandler_base *) dir->__fh)->closedir (dir); =20 - close (dir->__d_fd); + if (fdret) + *fdret =3D dir->__d_fd; + else + close (dir->__d_fd); + free (dir->__d_dirname); free (dir->__d_dirent); free (dir); - syscall_printf ("%R =3D closedir(%p)", res, dir); return res; } set_errno (EBADF); } __except (EFAULT) {} __endtry - syscall_printf ("%R =3D closedir(%p)", -1, dir); return -1; } =20 +/* closedir: POSIX 5.1.2.1 */ +extern "C" int +closedir (DIR *dir) +{ + int res; + + res =3D closedir_worker (dir, NULL); + syscall_printf ("%R =3D closedir(%p)", res, dir); + return res; +} + +extern "C" int +fdclosedir (DIR *dir) +{ + int fd =3D -1; + + closedir_worker (dir, &fd); + syscall_printf ("%d =3D fdclosedir(%p)", fd, dir); + return fd; +} + /* mkdir: POSIX 5.4.1.1 */ extern "C" int mkdir (const char *dir, mode_t mode) diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include= /cygwin/version.h index ceff10115aad..e21e04addd8c 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -487,12 +487,13 @@ details. */ 350: Add close_range. 351: Add getlocalename_l. 352: Implement dirent.d_reclen. + 353: Implement fdclosedir. =20 Note that we forgot to bump the api for ualarm, strtoll, strtoull, sigaltstack, sethostname. */ =20 #define CYGWIN_VERSION_API_MAJOR 0 -#define CYGWIN_VERSION_API_MINOR 352 +#define CYGWIN_VERSION_API_MINOR 353 =20 /* There is also a compatibity version number associated with the shared m= emory regions. It is incremented when incompatible changes are made to the s= hared diff --git a/winsup/cygwin/release/3.6.0 b/winsup/cygwin/release/3.6.0 index 6b0ec5dbce3a..fe933d8c74cc 100644 --- a/winsup/cygwin/release/3.6.0 +++ b/winsup/cygwin/release/3.6.0 @@ -3,6 +3,8 @@ What's new: =20 - New API call: getlocalename_l. =20 +- New API call: fdclosedir. + =20 What changed: -------------