1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32.c: find by final path

Browse Source 
* win32/win32.c (open_dir_handle): find by final path name.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-08-26 08:11:33 +00:00
parent dd67521bd1
commit 8e6259e0d9
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
win32/win32.c
View File

@ -1822,6 +1822,21 @@ w32_cmdvector(const WCHAR *cmd, char ***vec, UINT cp, rb_encoding *enc)
// UNIX compatible directory access functions for NT // UNIX compatible directory access functions for NT
// //
static DWORD
get_final_path(HANDLE f, WCHAR *buf, DWORD len, DWORD flag)
{
typedef DWORD (WINAPI *get_final_path_func)(HANDLE, WCHAR*, DWORD, DWORD);
static get_final_path_func func = (get_final_path_func)-1;
if (func == (get_final_path_func)-1) {
func = (get_final_path_func)
get_proc_address("kernel32", "GetFinalPathNameByHandleW", NULL);
}
if (!func) return 0;
return func(f, buf, len, flag);
}
// //
// The idea here is to read all the directory names into a string table // The idea here is to read all the directory names into a string table
// (separated by nulls) and when one of the other dir functions is called // (separated by nulls) and when one of the other dir functions is called
@ -1842,6 +1857,7 @@ open_dir_handle(const WCHAR *filename, WIN32_FIND_DATAW *fd)
{ {
HANDLE fh; HANDLE fh;
static const WCHAR wildcard[] = L"\\*"; static const WCHAR wildcard[] = L"\\*";
WCHAR fullname[MAX_PATH];
WCHAR *scanname; WCHAR *scanname;
WCHAR *p; WCHAR *p;
int len; int len;
@ -1850,7 +1866,17 @@ open_dir_handle(const WCHAR *filename, WIN32_FIND_DATAW *fd)
// //
// Create the search pattern // Create the search pattern
// //
len = lstrlenW(filename);
fh = CreateFileW(filename, 0, 0, NULL, OPEN_EXISTING,
FILE_FLAG_BACKUP_SEMANTICS, NULL);
if (fh != INVALID_HANDLE_VALUE) {
len = get_final_path(fh, fullname, numberof(fullname), 0);
CloseHandle(fh);
filename = fullname;
}
else {
len = lstrlenW(filename);
}
scanname = ALLOCV_N(WCHAR, v, len + numberof(wildcard)); scanname = ALLOCV_N(WCHAR, v, len + numberof(wildcard));
lstrcpyW(scanname, filename); lstrcpyW(scanname, filename);
p = CharPrevW(scanname, scanname + len); p = CharPrevW(scanname, scanname + len);
@ -5325,22 +5351,13 @@ winnt_stat(const WCHAR *path, struct stati64 *st)
{ {
HANDLE f; HANDLE f;
typedef DWORD (WINAPI *get_final_path_func)(HANDLE, WCHAR*, DWORD, DWORD);
static get_final_path_func get_final_path = (get_final_path_func)-1;
if (get_final_path == (get_final_path_func)-1) {
get_final_path = (get_final_path_func)
get_proc_address("kernel32", "GetFinalPathNameByHandleW", NULL);
}
memset(st, 0, sizeof(*st)); memset(st, 0, sizeof(*st));
f = CreateFileW(path, 0, 0, NULL, OPEN_EXISTING, f = CreateFileW(path, 0, 0, NULL, OPEN_EXISTING,
FILE_FLAG_BACKUP_SEMANTICS, NULL); FILE_FLAG_BACKUP_SEMANTICS, NULL);
if (f != INVALID_HANDLE_VALUE) { if (f != INVALID_HANDLE_VALUE) {
WCHAR finalname[MAX_PATH]; WCHAR finalname[MAX_PATH];
const DWORD attr = stati64_handle(f, st); const DWORD attr = stati64_handle(f, st);
const DWORD len = get_final_path ? const DWORD len = get_final_path(f, finalname, numberof(finalname), 0);
get_final_path(f, finalname, numberof(finalname), 0) : 0;
CloseHandle(f); CloseHandle(f);
if (attr & FILE_ATTRIBUTE_DIRECTORY) { if (attr & FILE_ATTRIBUTE_DIRECTORY) {
if (check_valid_dir(path)) return -1; if (check_valid_dir(path)) return -1;