kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

dir.c: set errno

Browse source 
* 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
This commit is contained in:
nobu 2015-07-02 22:13:17 +00:00
parent 5ef2665ac2
commit 911cf9e83c
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jul 3 07:13:11 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (replace_real_basename): Win32 API does not set errno, get
the last error by GetLastError() and map to errno. [Bug #10015]
Thu Jul 2 21:32:06 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jul 2 21:32:06 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (replace_real_basename): show warnings at errors. * dir.c (replace_real_basename): show warnings at errors.

9
dir.c
View file

@ -1525,6 +1525,7 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f
WCHAR *wplain; WCHAR *wplain;
HANDLE h = INVALID_HANDLE_VALUE; HANDLE h = INVALID_HANDLE_VALUE;
long wlen; long wlen;
int e = 0;
if (enc && if (enc &&
enc != rb_usascii_encoding() && enc != rb_usascii_encoding() &&
enc != rb_ascii8bit_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); wplain = rb_w32_mbstr_to_wstr(CP_UTF8, plainname, -1, &wlen);
if (tmp) rb_str_resize(tmp, 0); if (tmp) rb_str_resize(tmp, 0);
if (!wplain) return path; if (!wplain) return path;
if (GetFileAttributesExW(wplain, GetFileExInfoStandard, &fa)) if (GetFileAttributesExW(wplain, GetFileExInfoStandard, &fa)) {
h = FindFirstFileW(wplain, &fd); h = FindFirstFileW(wplain, &fd);
e = rb_w32_map_errno(GetLastError());
}
free(wplain); free(wplain);
if (h == INVALID_HANDLE_VALUE) { if (h == INVALID_HANDLE_VALUE) {
*type = path_noent; *type = path_noent;
if (!to_be_ignored(errno)) if (e && !to_be_ignored(e)) {
errno = e;
sys_warning(path, enc); sys_warning(path, enc);
}
return path; return path;
} }
FindClose(h); FindClose(h);