diff options
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 22 |
1 files changed, 17 insertions, 5 deletions
@@ -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" |