зеркало из https://github.com/github/ruby.git
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
This commit is contained in:
Родитель
5ef2665ac2
Коммит
911cf9e83c
|
@ -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>
|
||||
|
||||
* dir.c (replace_real_basename): show warnings at errors.
|
||||
|
|
9
dir.c
9
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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче