This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Upgrade libuv to 2d1c672e

  • Loading branch information...
piscisaureus committed Sep 8, 2011
1 parent b6e0433 commit 0a127d6a694f2928f91d2ed51ef85a65768fdad3
Showing with 13 additions and 5 deletions.
  1. +7 −4 deps/uv/src/win/fs.c
  2. +5 −0 deps/uv/src/win/winapi.h
  3. +1 −1 deps/uv/test/test-fs.c
View
@@ -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;
}
}
View
@@ -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, \
View
@@ -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.

0 comments on commit 0a127d6

Please sign in to comment.