luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'openat' of github.com:yagehu/libuv into openat

Browse Source 
Signed-off-by: Yage Hu <me@huyage.dev>
This commit is contained in:
Yage Hu 2024-06-18 15:46:58 -07:00
commit bddf83220e
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/win/fs.c
View File

@ -642,7 +642,7 @@ struct path {
// Must be freed by `uv__path_free`.
int uv__path_init(struct path * p) {
WCHAR * buf = uv__malloc(1);
WCHAR * buf = uv__malloc(sizeof(WCHAR));
if (buf == NULL) return UV_ENOMEM;
p->buf = buf;
@ -703,9 +703,11 @@ int uv__path_push(struct path * p, WCHAR * component) {
}
int uv__path_pop(struct path * p) {
int i;
if (p->len == 0) return 1;
for (int i = p->len - 1; i >= 0; i--) {
for (i = p->len - 1; i >= 0; i--) {
if (p->buf[i] == L'\\' || i == 0) {
p->buf[i] = L'\0';
p->len = i;
@ -726,15 +728,15 @@ void fs__openat(uv_fs_t* req) {
UNICODE_STRING str;
IO_STATUS_BLOCK isb;
OBJECT_ATTRIBUTES obj;
int fd, current_umask;
int fd, current_umask, temp_umask = 0;
int flags = req->fs.info.file_flags;
struct uv__fd_info_s fd_info;
WCHAR * path = req->file.pathw;
struct path rebuilt_path;
const size_t path_len = wcslen(path);
int i;
// NtCreateFile doesn't recognize forward slashes, only back slashes.
for (int i = 0; path[i] != 0; i++)
for (i = 0; path[i] != L'\0'; i++)
if (path[i] == L'/')
path[i] = L'\\';
@ -778,7 +780,7 @@ void fs__openat(uv_fs_t* req) {
) {
uv__free(dir_path_buf);
SET_REQ_UV_ERROR(req, UV_EBADF, ERROR_INVALID_HANDLE);
return -1;
return;
}
// We'll call `NtCreateFile` with an absolute path, set root dir handle
@ -825,8 +827,8 @@ void fs__openat(uv_fs_t* req) {
/* Obtain the active umask. umask() never fails and returns the previous
* umask. */
current_umask = _umask(0);
_umask(current_umask);
_umask_s(temp_umask, &current_umask);
_umask_s(current_umask, &temp_umask);
/* convert flags and mode to CreateFile parameters */
switch (flags & (UV_FS_O_RDONLY | UV_FS_O_WRONLY | UV_FS_O_RDWR)) {

9
test/test-fs.c
View File

@ -3028,6 +3028,7 @@ TEST_IMPL(fs_openat) {
unlink("test/fixtures/test_dir/test_file");
unlink("test/fixtures/test_dir/link");
unlink("test/fixtures/test_dir/nested_dir/file");
unlink("test/fixtures/file");
rmdir("test/fixtures/test_dir/nested_dir");
rmdir("test/fixtures/test_dir");
@ -3155,7 +3156,7 @@ TEST_IMPL(fs_openat) {
r = uv_fs_openat(NULL,
&req,
dir,
"../empty_file",
"../file",
UV_FS_O_RDWR | UV_FS_O_CREAT,
S_IWUSR | S_IRUSR,
NULL);
@ -3172,7 +3173,7 @@ TEST_IMPL(fs_openat) {
r = uv_fs_openat(NULL,
&req,
dir,
"../test_dir/nested_dir/././../../empty_file",
"../test_dir/nested_dir/././../../file",
UV_FS_O_RDWR | UV_FS_O_CREAT,
S_IWUSR | S_IRUSR,
NULL);
@ -3269,6 +3270,10 @@ TEST_IMPL(fs_openat) {
unlink("test/fixtures/test_dir/test_file");
unlink("test/fixtures/test_dir/link");
unlink("test/fixtures/test_dir/nested_dir/file");
<<<<<<< HEAD
=======
unlink("test/fixtures/file");
>>>>>>> 8e91f4974c9681fd1aaf7b42fcb493a3b587ac2f
rmdir("test/fixtures/test_dir/nested_dir");
rmdir("test/fixtures/test_dir");