diff options
| author | luislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-16 22:43:22 +0000 |
|---|---|---|
| committer | luislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-16 22:43:22 +0000 |
| commit | 25058a58a290728e1bb0643145c19b283fba6db6 (patch) | |
| tree | ffdf92063046d3c4171a0603d114e8196ec91793 | |
| parent | 7bd638b7a4062d774da7c96d3e926733b6a103ad (diff) | |
skip long name conversion if last character is a wildcard one
* win32/file.c (replace_to_long_name): skip automatic path expansion
when wildcard character is used. [ruby-core:49451] [Bug #7374]
* test/ruby/test_file_exhaustive.rb: add a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/ruby/test_file_exhaustive.rb | 5 | ||||
| -rw-r--r-- | win32/file.c | 5 |
3 files changed, 17 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Sat Nov 17 07:35:15 2012 Luis Lavena <luislavena@gmail.com> + + * win32/file.c (replace_to_long_name): skip automatic path expansion + when wildcard character is used. [ruby-core:49451] [Bug #7374] + + * test/ruby/test_file_exhaustive.rb: add a test for above. + Sat Nov 17 00:50:23 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * marshal.c (w_object): add flonum to arg->data to keep reference index diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index 0c82395a56..3fd8b3374e 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -662,6 +662,11 @@ class TestFileExhaustive < Test::Unit::TestCase assert_equal("#{DRIVE}/dir", File.expand_path("#{DRIVE}/./dir")) end + def test_expand_path_does_not_expand_wildcard + assert_equal("#{DRIVE}/*", File.expand_path("./*", "#{DRIVE}/")) + assert_equal("#{Dir.pwd}/*", File.expand_path("./*", Dir.pwd)) + end if DRIVE + def test_expand_path_does_not_modify_the_string_argument str = "./a/b/../c" assert_equal("#{Dir.pwd}/a/c", File.expand_path(str, Dir.pwd)) diff --git a/win32/file.c b/win32/file.c index e3b50b450f..1f033c646b 100644 --- a/win32/file.c +++ b/win32/file.c @@ -276,6 +276,11 @@ replace_to_long_name(wchar_t **wfullpath, size_t size, int heap) return size; } + /* skip long name conversion if last character is a wildcard */ + if (pos[size - 1] == L'*') { + return size; + } + pos = *wfullpath + size - 1; while (!IS_DIR_SEPARATOR_P(*pos) && pos != *wfullpath) { if (!extension_len && *pos == L'.') { |