From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 7D84E384CBBB; Tue, 28 Nov 2023 10:02:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7D84E384CBBB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1701165770; bh=0FcV/xK86whLvBOK03hzCAQguC6zS9hbNvb+oR/lku0=; h=From:To:Subject:Date:From; b=MkyboyZNEl+j0qezZjiiRi+Ph8JSRiKQBrhA2/G1p1mSYenAGwMn+mPLhELQWdyVg TIjAXvH+uuPHsi991X8rQ0703aVX+F97JGgVOFOW+D6O7Jd5ZHUoCCBKQQsDkboQe8 Jr6IMxojh7ZY2dzySJH2Vg6X83gCUqg7kuTBflNU= 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: posix_fallocate: return ENODEV X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: d5dcb484c705a214b30826c82b9fd8bf83772093 X-Git-Newrev: fedd7fae77303ee3caf7c87510a03a9157deb06f Message-Id: <20231128100250.7D84E384CBBB@sourceware.org> Date: Tue, 28 Nov 2023 10:02:50 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dfedd7fae773= 03ee3caf7c87510a03a9157deb06f commit fedd7fae77303ee3caf7c87510a03a9157deb06f Author: Corinna Vinschen AuthorDate: Sat Nov 25 20:56:52 2023 +0100 Commit: Corinna Vinschen CommitDate: Tue Nov 28 10:51:47 2023 +0100 Cygwin: posix_fallocate: return ENODEV =20 The fhandler method ftruncate returns either EISDIR if it has been called on directories, or EINVAL if called on files other than regular files. This matches what ftruncate(2) is supposed to return, but it doesn't match posix_fallocate(3), which is supposed to return ENODEV in both cases. =20 To accomplish that, return ENODEV from fhandler_base::ftruncate() and convert it to EINVAL in ftruncate(2). In posix_fallocate(3), convert EISDIR to ENODEV. =20 Fixes: 7636b58590621 ("* autoload.cc (NtSetInformationFile): Define.") Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/fhandler/base.cc | 2 +- winsup/cygwin/release/3.4.10 | 3 +++ winsup/cygwin/syscalls.cc | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/fhandler/base.cc b/winsup/cygwin/fhandler/base.cc index a57ffcb86429..3f0dc5f69847 100644 --- a/winsup/cygwin/fhandler/base.cc +++ b/winsup/cygwin/fhandler/base.cc @@ -1797,7 +1797,7 @@ fhandler_base::fadvise (off_t offset, off_t length, i= nt advice) int fhandler_base::ftruncate (off_t length, bool allow_truncate) { - return EINVAL; + return ENODEV; } =20 int diff --git a/winsup/cygwin/release/3.4.10 b/winsup/cygwin/release/3.4.10 index 758a6e071c59..02f6885837b4 100644 --- a/winsup/cygwin/release/3.4.10 +++ b/winsup/cygwin/release/3.4.10 @@ -18,3 +18,6 @@ Bug Fixes =20 - Align behaviour of rand(3) to ISO C. Adresses: https://cygwin.com/pipermail/cygwin/2023-November/254735.html + +- Fix posix_fallocate(3) return value in case of being called on + other than regular files. diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index e4b3dd2f3c62..c3c17d604af3 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -3000,6 +3000,8 @@ posix_fallocate (int fd, off_t offset, off_t len) res =3D cfd->ftruncate (offset + len, false); else res =3D EBADF; + if (res =3D=3D EISDIR) + res =3D ENODEV; } syscall_printf ("%R =3D posix_fallocate(%d, %D, %D)", res, fd, offset, l= en); return res; @@ -3015,6 +3017,8 @@ ftruncate (int fd, off_t length) res =3D cfd->ftruncate (length, true); if (res) { + if (res =3D=3D ENODEV) + res =3D EINVAL; set_errno (res); res =3D -1; }