From 1e775c18e51ea43ed145f927661468e6db24db38 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 28 Apr 2016 06:54:03 +0000 Subject: win32/file.c: remove unnecessary code * win32/file.c (replace_to_long_name): remove unnecessary backward scan for the last directory separator. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/file.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'win32') diff --git a/win32/file.c b/win32/file.c index becbd5f38c..25c9027d29 100644 --- a/win32/file.c +++ b/win32/file.c @@ -257,24 +257,19 @@ replace_to_long_name(wchar_t **wfullpath, size_t size, int heap) find_handle = FindFirstFileW(*wfullpath, &find_data); if (find_handle != INVALID_HANDLE_VALUE) { - size_t trail_pos = wcslen(*wfullpath); + size_t trail_pos = pos - *wfullpath + IS_DIR_SEPARATOR_P(*pos); size_t file_len = wcslen(find_data.cFileName); FindClose(find_handle); - while (trail_pos > 0) { - if (IS_DIR_SEPARATOR_P((*wfullpath)[trail_pos])) - break; - trail_pos--; - } - size = trail_pos + 1 + file_len; + size = trail_pos + file_len; if ((size + 1) > sizeof(*wfullpath) / sizeof((*wfullpath)[0])) { wchar_t *buf = (wchar_t *)xmalloc((size + 1) * sizeof(wchar_t)); - wcsncpy(buf, *wfullpath, trail_pos + 1); + wcsncpy(buf, *wfullpath, trail_pos); if (heap) xfree(*wfullpath); *wfullpath = buf; } - wcsncpy(*wfullpath + trail_pos + 1, find_data.cFileName, file_len + 1); + wcsncpy(*wfullpath + trail_pos, find_data.cFileName, file_len + 1); } return size; } -- cgit v1.2.3