summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNAKAMURA Usaku <usa@ruby-lang.org>2019-12-22 02:36:55 +0900
committerNAKAMURA Usaku <usa@ruby-lang.org>2019-12-22 02:42:09 +0900
commit61aff0cd189e67fa6f2565639ad0128fa33b88fc (patch)
treec1aaf72ca72f4f0e0f98655aef940299b1091ddc
parent29ea228efc5af08a0e91fafe155617f20e22976b (diff)
Should return "." for File.extname("file.") also on Windows
But not changes another cases, such as "file.rb." [Bug #15267]
-rw-r--r--file.c22
-rw-r--r--spec/ruby/core/file/extname_spec.rb4
-rw-r--r--test/ruby/test_file_exhaustive.rb6
-rw-r--r--test/ruby/test_path.rb6
4 files changed, 23 insertions, 15 deletions
diff --git a/file.c b/file.c
index c46377b9332..170455ab0ae 100644
--- a/file.c
+++ b/file.c
@@ -4711,13 +4711,26 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
while (*p) {
if (*p == '.' || istrailinggarbage(*p)) {
#if USE_NTFS
- const char *last = p++, *dot = last;
+ const char *first = 0, *last, *dot;
+ if (*p == '.') first = p;
+ last = p++;
+ dot = last;
while (istrailinggarbage(*p)) {
- if (*p == '.') dot = p;
+ if (*p == '.') {
+ dot = p;
+ if (!first) {
+ first = p;
+ }
+ }
p++;
}
if (!*p || isADS(*p)) {
- p = last;
+ if (first == dot && e == 0) {
+ e = first;
+ }
+ else {
+ p = last;
+ }
break;
}
if (*last == '.' || dot > last) e = dot;
@@ -4766,8 +4779,7 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
* File.extname("test.rb") #=> ".rb"
* File.extname("a/b/d/test.rb") #=> ".rb"
* File.extname(".a/b/d/test.rb") #=> ".rb"
- * File.extname("foo.") #=> "" on Windows
- * File.extname("foo.") #=> "." on non-Windows
+ * File.extname("foo.") #=> "."
* File.extname("test") #=> ""
* File.extname(".profile") #=> ""
* File.extname(".profile.sh") #=> ".sh"
diff --git a/spec/ruby/core/file/extname_spec.rb b/spec/ruby/core/file/extname_spec.rb
index e9b53bc24d0..79290960fbd 100644
--- a/spec/ruby/core/file/extname_spec.rb
+++ b/spec/ruby/core/file/extname_spec.rb
@@ -23,14 +23,14 @@ describe "File.extname" do
end
describe "for a filename ending with a dot" do
- guard -> { platform_is :windows or ruby_version_is ""..."2.7" } do
+ ruby_version_is ""..."2.7" do
it "returns ''" do
File.extname(".foo.").should == ""
File.extname("foo.").should == ""
end
end
- guard -> { platform_is_not :windows and ruby_version_is "2.7" } do
+ ruby_version_is "2.7" do
it "returns '.'" do
File.extname(".foo.").should == "."
File.extname("foo.").should == "."
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 975bcb6bc2d..de4c21e5ca3 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -1268,19 +1268,19 @@ class TestFileExhaustive < Test::Unit::TestCase
infixes2 = infixes + [".ext "]
appendixes = [""]
if NTFS
- appendixes << " " << "." << "::$DATA" << "::$DATA.bar"
+ appendixes << " " << [".", ".", ""] << "::$DATA" << "::$DATA.bar"
else
appendixes << [".", "."]
end
prefixes.each do |prefix|
- appendixes.each do |appendix, ext = ""|
+ appendixes.each do |appendix, ext = "", ext2 = ext|
infixes.each do |infix|
path = "#{prefix}foo#{infix}#{appendix}"
assert_equal(ext, File.extname(path), "File.extname(#{path.inspect})")
end
infixes2.each do |infix|
path = "#{prefix}foo#{infix}.ext#{appendix}"
- assert_equal(ext.empty? ? ".ext" : appendix, File.extname(path), "File.extname(#{path.inspect})")
+ assert_equal(ext2.empty? ? ".ext" : appendix, File.extname(path), "File.extname(#{path.inspect})")
end
end
end
diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb
index b35e942a2a0..64111ee8057 100644
--- a/test/ruby/test_path.rb
+++ b/test/ruby/test_path.rb
@@ -239,11 +239,7 @@ class TestPath < Test::Unit::TestCase
ext = '.'
end
assert_equal(ext, File.extname('a.rb.'))
- if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
- # trailing spaces and dots are ignored on NTFS.
- ext = ''
- end
- assert_equal(ext, File.extname('a.'))
+ assert_equal('.', File.extname('a.'))
assert_equal('', File.extname('.x'))
assert_equal('', File.extname('..x'))
end