From 544934d8e7655e7b038de90011409ccb2d5bdb19 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 22 Feb 2009 14:05:06 +0000 Subject: merges r22393 from trunk into ruby_1_9_1. * file.c (rb_file_s_extname): fix for spaces before extention. [ruby-dev:38044] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 706e74d56..639625cd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 18 12:35:31 2009 Nobuyoshi Nakada + + * file.c (rb_file_s_extname): fix for spaces before extention. + [ruby-dev:38044] + Wed Feb 18 10:29:12 2009 Nobuyoshi Nakada * thread.c (thread_start_func_2): do not delete main thread from diff --git a/file.c b/file.c index e4261293c..e46d25d12 100644 --- a/file.c +++ b/file.c @@ -3162,7 +3162,7 @@ rb_file_s_extname(VALUE klass, VALUE fname) p = last; break; } - if (*last == '.') e = dot; + if (*last == '.' || dot > last) e = dot; continue; #else e = p; /* get the last dot of the last component */ -- cgit