mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-23 19:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix SQLite regressions caused by 3b086af91

Browse source
This commit is contained in:
Justine Tunney 2023-10-13 10:48:04 -07:00
parent bdc453b22d
commit 3851025b77
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
7 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libc/calls/fcntl-nt.c
View file

@ -96,7 +96,7 @@ static textwindows bool OverlapsFileLock(struct FileLock *fl, int64_t off,
EndA = off + (len - 1);
BegB = fl->off;
EndB = fl->off + (fl->len - 1);
return MAX(BegA, BegB) < MIN(EndA, EndB);
return MAX(BegA, BegB) <= MIN(EndA, EndB);
}
static textwindows bool EncompassesFileLock(struct FileLock *fl, int64_t off,

4
libc/calls/fstatat-nt.c
View file

@ -43,7 +43,9 @@ textwindows int sys_fstatat_nt(int dirfd, const char *path, struct stat *st,
dwDesiredAccess = kNtFileGenericRead;
TryAgain:
if ((fh = CreateFile(
path16, dwDesiredAccess, 0, 0, kNtOpenExisting,
path16, dwDesiredAccess,
kNtFileShareRead | kNtFileShareWrite | kNtFileShareDelete, 0,
kNtOpenExisting,
kNtFileAttributeNormal | kNtFileFlagBackupSemantics |
((flags & AT_SYMLINK_NOFOLLOW) ? kNtFileFlagOpenReparsePoint
: 0),

8
libc/calls/pipe-nt.c
View file

@ -25,6 +25,7 @@
#include "libc/nt/enum/accessmask.h"
#include "libc/nt/enum/creationdisposition.h"
#include "libc/nt/enum/fileflagandattributes.h"
#include "libc/nt/enum/filesharemode.h"
#include "libc/nt/ipc.h"
#include "libc/nt/runtime.h"
#include "libc/sysv/consts/limits.h"
@ -57,8 +58,11 @@ static textwindows int sys_pipe_nt_impl(int pipefd[2], unsigned flags) {
mode, 1, PIPE_BUF, PIPE_BUF, 0, &kNtIsInheritable);
__fds_lock();
if (hin != -1) {
if ((hout = CreateFile(pipename, kNtGenericWrite, 0, &kNtIsInheritable,
kNtOpenExisting, kNtFileFlagOverlapped, 0)) != -1) {
if ((hout = CreateFile(
pipename, kNtGenericWrite,
kNtFileShareRead | kNtFileShareWrite | kNtFileShareDelete,
&kNtIsInheritable, kNtOpenExisting, kNtFileFlagOverlapped, 0)) !=
-1) {
g_fds.p[reader].kind = kFdFile;
g_fds.p[reader].flags = O_RDONLY | flags;
g_fds.p[reader].mode = 0010444;

6
libc/calls/truncate-nt.c
View file

@ -32,8 +32,10 @@ textwindows int sys_truncate_nt(const char *path, uint64_t length) {
uint16_t path16[PATH_MAX];
if (__mkntpath(path, path16) == -1) return -1;
BLOCK_SIGNALS;
if ((fh = CreateFile(path16, kNtGenericWrite, kNtFileShareRead, NULL,
kNtOpenExisting, kNtFileAttributeNormal, 0)) != -1) {
if ((fh = CreateFile(
path16, kNtGenericWrite,
kNtFileShareRead | kNtFileShareWrite | kNtFileShareDelete, NULL,
kNtOpenExisting, kNtFileAttributeNormal, 0)) != -1) {
rc = sys_ftruncate_nt(fh, length);
CloseHandle(fh);
} else {