archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

win32.c: reuse fullpath buffer

Browse source 
* win32/win32.c (open_dir_handle): reuse the fullpath buffer
  instead of allocating another buffer for copy.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-02-02 05:43:44 +00:00
parent 21daa56b2a
commit eee616315d
1 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
win32/win32.c
View file

@ -1869,12 +1869,9 @@ static HANDLE
open_dir_handle(const WCHAR *filename, WIN32_FIND_DATAW *fd) open_dir_handle(const WCHAR *filename, WIN32_FIND_DATAW *fd)
{ {
HANDLE fh; HANDLE fh;
static const WCHAR wildcard[] = L"\\*"; WCHAR fullname[_MAX_PATH + rb_strlen_lit("\\*")];
WCHAR fullname[MAX_PATH];
WCHAR *scanname;
WCHAR *p; WCHAR *p;
int len = 0; int len = 0;
VALUE v;
// //
// Create the search pattern // Create the search pattern
@ -1882,28 +1879,26 @@ open_dir_handle(const WCHAR *filename, WIN32_FIND_DATAW *fd)
fh = open_special(filename, 0, 0); fh = open_special(filename, 0, 0);
if (fh != INVALID_HANDLE_VALUE) { if (fh != INVALID_HANDLE_VALUE) {
len = get_final_path(fh, fullname, numberof(fullname), 0); len = get_final_path(fh, fullname, _MAX_PATH, 0);
CloseHandle(fh); CloseHandle(fh);
} }
if (len) { if (!len) {
filename = fullname;
}
else {
len = lstrlenW(filename); len = lstrlenW(filename);
if (len >= _MAX_PATH) {
errno = ENAMETOOLONG;
return INVALID_HANDLE_VALUE;
} }
scanname = ALLOCV_N(WCHAR, v, len + numberof(wildcard)); MEMCPY(fullname, filename, WCHAR, len);
lstrcpyW(scanname, filename); }
p = CharPrevW(scanname, scanname + len); p = &fullname[len-1];
if (*p == L'/' || *p == L'\\' || *p == L':') if (!(isdirsep(*p) || *p == L':')) *++p = L'\\';
lstrcatW(scanname, wildcard + 1); *++p = L'*';
else *++p = L'\0';
lstrcatW(scanname, wildcard);
// //
// do the FindFirstFile call // do the FindFirstFile call
// //
fh = FindFirstFileW(scanname, fd); fh = FindFirstFileW(fullname, fd);
ALLOCV_END(v);
if (fh == INVALID_HANDLE_VALUE) { if (fh == INVALID_HANDLE_VALUE) {
errno = map_errno(GetLastError()); errno = map_errno(GetLastError());
} }