From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id AD0913945049; Tue, 25 May 2021 21:01:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AD0913945049 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: fhandler_mqueue: disable more methods, add fcntl X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 2b4c7f90d4456f527e2a0d63eb73ebde086a6c13 X-Git-Newrev: 59ba43dd9ed05b697b52398a3c8fdc5d97ef1f76 Message-Id: <20210525210113.AD0913945049@sourceware.org> Date: Tue, 25 May 2021 21:01:13 +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: Tue, 25 May 2021 21:01:13 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=59ba43dd9ed05b697b52398a3c8fdc5d97ef1f76 commit 59ba43dd9ed05b697b52398a3c8fdc5d97ef1f76 Author: Corinna Vinschen Date: Tue May 25 23:00:32 2021 +0200 Cygwin: fhandler_mqueue: disable more methods, add fcntl Unsupported functionality returns EPERM, fcntl supports only F_GETFD and F_GETFL. Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/fhandler.h | 14 +++++++++++++- winsup/cygwin/fhandler_mqueue.cc | 21 ++++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 4c475184e..a24c95b1b 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -3151,11 +3151,23 @@ public: void fixup_after_fork (HANDLE); - int mkdir (mode_t); +#define NO_IMPL { set_errno (EPERM); return -1; } + + ssize_t __reg3 fgetxattr (const char *, void *, size_t) NO_IMPL; + int __reg3 fsetxattr (const char *, const void *, size_t, int) NO_IMPL; + int __reg3 fadvise (off_t, off_t, int) NO_IMPL; + int __reg3 ftruncate (off_t, bool) NO_IMPL; + int link (const char *) NO_IMPL; + int mkdir (mode_t) NO_IMPL; + ssize_t __reg3 pread (void *, size_t, off_t, void *aio = NULL) NO_IMPL; + ssize_t __reg3 pwrite (void *, size_t, off_t, void *aio = NULL) NO_IMPL; + int lock (int, struct flock *) NO_IMPL; + int mand_lock (int, struct flock *) NO_IMPL; void __reg3 read (void *, size_t&); off_t lseek (off_t, int); int __reg2 fstat (struct stat *); int dup (fhandler_base *, int); + int fcntl (int cmd, intptr_t); int ioctl (unsigned int, void *); int close (); diff --git a/winsup/cygwin/fhandler_mqueue.cc b/winsup/cygwin/fhandler_mqueue.cc index 6215d7b62..745c80643 100644 --- a/winsup/cygwin/fhandler_mqueue.cc +++ b/winsup/cygwin/fhandler_mqueue.cc @@ -376,10 +376,25 @@ fhandler_mqueue::get_proc_fd_name (char *buf) } int -fhandler_mqueue::mkdir (mode_t mode) +fhandler_mqueue::fcntl (int cmd, intptr_t arg) { - set_errno (EPERM); - return -1; + int res; + + switch (cmd) + { + case F_GETFD: + res = close_on_exec () ? FD_CLOEXEC : 0; + break; + case F_GETFL: + res = get_flags (); + debug_printf ("GETFL: %y", res); + break; + default: + set_errno (EINVAL); + res = -1; + break; + } + return res; } /* Do what fhandler_virtual does for read/lseek */