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

More MinGW fixes

Browse Source
This commit is contained in:
Bert Belder 2011-09-08 23:49:46 +02:00
parent 5b567b29a8
commit 2d1c672e2d
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/win/fs.c
View File

@ -118,8 +118,6 @@ static void uv_fs_req_init_sync(uv_loop_t* loop, uv_fs_t* req,
req->errorno = 0;
}
/* this is where the CRT stores the current umask */
extern int _umaskval;
void fs__open(uv_fs_t* req, const char* path, int flags, int mode) {
DWORD access;
@ -128,7 +126,12 @@ void fs__open(uv_fs_t* req, const char* path, int flags, int mode) {
DWORD disposition;
DWORD attributes;
HANDLE file;
int result;
int result, current_umask;
/* Obtain the active umask. umask() never fails and returns the previous */
/* umask. */
current_umask = umask(0);
umask(current_umask);
/* convert flags and mode to CreateFile parameters */
switch (flags & (_O_RDONLY | _O_WRONLY | _O_RDWR)) {
@ -188,7 +191,7 @@ void fs__open(uv_fs_t* req, const char* path, int flags, int mode) {
attributes = FILE_ATTRIBUTE_NORMAL;
if (flags & _O_CREAT) {
if (!((mode & ~_umaskval) & _S_IWRITE)) {
if (!((mode & ~current_umask) & _S_IWRITE)) {
attributes |= FILE_ATTRIBUTE_READONLY;
}
}

5
src/win/winapi.h
View File

@ -4241,6 +4241,11 @@ typedef enum _FILE_INFORMATION_CLASS {
# define FILE_WRITE_ACCESS 0x0002
#endif
#ifndef CTL_CODE
# define CTL_CODE(device_type, function, method, access) \
(((device_type) << 16) | ((access) << 14) | ((function) << 2) | (method))
#endif
#ifndef FSCTL_SET_REPARSE_POINT
# define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, \
41, \

2
test/test-fs.c
View File

@ -1096,7 +1096,7 @@ TEST_IMPL(fs_symlink) {
ASSERT(r == 0);
#ifdef _WIN32
if (req.result == -1) {
if (req.errorno == ENOTSUP) {
if (req.errorno == ENOSYS) {
/*
* Windows doesn't support symlinks on older versions.
* We just pass the test and bail out early if we get ENOTSUP.