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

win32.c: w32_wopendir

Browse Source 
* win32/win32.c (w32_wopendir): remove filename parameter, and
  check the drive letter in wpath instead.  rename from
  opendir_internal.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-02-01 15:06:17 +00:00
parent a82fb030b7
commit 0f19e79b87
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
win32/win32.c
View File

@ -1912,7 +1912,7 @@ open_dir_handle(const WCHAR *filename, WIN32_FIND_DATAW *fd)
/* License: Artistic or GPL */ /* License: Artistic or GPL */
static DIR * static DIR *
opendir_internal(WCHAR *wpath, const char *filename) w32_wopendir(const WCHAR *wpath)
{ {
struct stati64 sbuf; struct stati64 sbuf;
WIN32_FIND_DATAW fd; WIN32_FIND_DATAW fd;
@ -1932,8 +1932,8 @@ opendir_internal(WCHAR *wpath, const char *filename)
return NULL; return NULL;
} }
if (!(sbuf.st_mode & S_IFDIR) && if (!(sbuf.st_mode & S_IFDIR) &&
(!ISALPHA(filename[0]) || filename[1] != ':' || filename[2] != '\0' || (!ISALPHA(wpath[0]) || wpath[1] != L':' || wpath[2] != L'\0' ||
((1 << ((filename[0] & 0x5f) - 'A')) & GetLogicalDrives()) == 0)) { ((1 << ((wpath[0] & 0x5f) - 'A')) & GetLogicalDrives()) == 0)) {
errno = ENOTDIR; errno = ENOTDIR;
return NULL; return NULL;
} }
@ -2055,7 +2055,7 @@ rb_w32_opendir(const char *filename)
WCHAR *wpath = filecp_to_wstr(filename, NULL); WCHAR *wpath = filecp_to_wstr(filename, NULL);
if (!wpath) if (!wpath)
return NULL; return NULL;
ret = opendir_internal(wpath, filename); ret = w32_wopendir(wpath);
free(wpath); free(wpath);
return ret; return ret;
} }
@ -2068,7 +2068,7 @@ rb_w32_uopendir(const char *filename)
WCHAR *wpath = utf8_to_wstr(filename, NULL); WCHAR *wpath = utf8_to_wstr(filename, NULL);
if (!wpath) if (!wpath)
return NULL; return NULL;
ret = opendir_internal(wpath, filename); ret = w32_wopendir(wpath);
free(wpath); free(wpath);
return ret; return ret;
} }