From 911cf9e83cad9c524f004df9525c0367645b4b2f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 2 Jul 2015 22:13:17 +0000
Subject: dir.c: set errno

* dir.c (replace_real_basename): Win32 API does not set errno, get
  the last error by GetLastError() and map to errno.  [Bug #10015]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 dir.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'dir.c')

diff --git a/dir.c b/dir.c
index ce8cb6324a..9b62cb3e07 100644
--- a/dir.c
+++ b/dir.c
@@ -1525,6 +1525,7 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f
     WCHAR *wplain;
     HANDLE h = INVALID_HANDLE_VALUE;
     long wlen;
+    int e = 0;
     if (enc &&
 	enc != rb_usascii_encoding() &&
 	enc != rb_ascii8bit_encoding() &&
@@ -1536,13 +1537,17 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f
     wplain = rb_w32_mbstr_to_wstr(CP_UTF8, plainname, -1, &wlen);
     if (tmp) rb_str_resize(tmp, 0);
     if (!wplain) return path;
-    if (GetFileAttributesExW(wplain, GetFileExInfoStandard, &fa))
+    if (GetFileAttributesExW(wplain, GetFileExInfoStandard, &fa)) {
 	h = FindFirstFileW(wplain, &fd);
+	e = rb_w32_map_errno(GetLastError());
+    }
     free(wplain);
     if (h == INVALID_HANDLE_VALUE) {
 	*type = path_noent;
-	if (!to_be_ignored(errno))
+	if (e && !to_be_ignored(e)) {
+	    errno = e;
 	    sys_warning(path, enc);
+	}
 	return path;
     }
     FindClose(h);
-- 
cgit v1.2.3