posix_fallocate() *returns* error codes but does not set errno
Also updates the fhandler_*::ftruncate implementations to adhere to the same semantics. The error handling semantics of those syscalls that use fhandler_*::ftruncate are moved to the implementations of those syscalls ( in particular ftruncate() and friends still set errno and return -1 on error but that logic is handled in the syscall implementation).
This commit is contained in:
committed by
Corinna Vinschen
parent
8c8cdd9ad7
commit
94854321bb
@@ -1112,14 +1112,14 @@ fhandler_disk_file::fadvise (off_t offset, off_t length, int advice)
|
||||
int
|
||||
fhandler_disk_file::ftruncate (off_t length, bool allow_truncate)
|
||||
{
|
||||
int res = -1;
|
||||
int res = 0;
|
||||
|
||||
if (length < 0 || !get_handle ())
|
||||
set_errno (EINVAL);
|
||||
res = EINVAL;
|
||||
else if (pc.isdir ())
|
||||
set_errno (EISDIR);
|
||||
res = EISDIR;
|
||||
else if (!(get_access () & GENERIC_WRITE))
|
||||
set_errno (EBADF);
|
||||
res = EBADF;
|
||||
else
|
||||
{
|
||||
NTSTATUS status;
|
||||
@@ -1130,10 +1130,7 @@ fhandler_disk_file::ftruncate (off_t length, bool allow_truncate)
|
||||
status = NtQueryInformationFile (get_handle (), &io, &fsi, sizeof fsi,
|
||||
FileStandardInformation);
|
||||
if (!NT_SUCCESS (status))
|
||||
{
|
||||
__seterrno_from_nt_status (status);
|
||||
return -1;
|
||||
}
|
||||
return geterrno_from_nt_status (status);
|
||||
|
||||
/* If called through posix_fallocate, silently succeed if length
|
||||
is less than the file's actual length. */
|
||||
@@ -1159,9 +1156,7 @@ fhandler_disk_file::ftruncate (off_t length, bool allow_truncate)
|
||||
&feofi, sizeof feofi,
|
||||
FileEndOfFileInformation);
|
||||
if (!NT_SUCCESS (status))
|
||||
__seterrno_from_nt_status (status);
|
||||
else
|
||||
res = 0;
|
||||
res = geterrno_from_nt_status (status);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
Reference in New Issue
Block a user