summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-18 03:35:34 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-18 03:35:34 +0000
commit24b0a7f965b72162b5cd164f36b4fe4c3532bb3d (patch)
tree3c3a2ed2ad5860ffbdd88e7b6830356cdf87624f
parent19037e372977c79896471e7ca0abf0967d800b05 (diff)
downloadruby-24b0a7f965b72162b5cd164f36b4fe4c3532bb3d.tar.gz
ruby-24b0a7f965b72162b5cd164f36b4fe4c3532bb3d.tar.xz
ruby-24b0a7f965b72162b5cd164f36b4fe4c3532bb3d.zip
* file.c (rb_file_s_extname): fix for spaces before extention.
[ruby-dev:38044] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--file.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c533eecc..4d39a9d75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 18 12:35:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_file_s_extname): fix for spaces before extention.
+ [ruby-dev:38044]
+
Wed Feb 18 12:00:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): suppress a warning. named magic
diff --git a/file.c b/file.c
index c89cd855b..69c0c681a 100644
--- a/file.c
+++ b/file.c
@@ -3185,7 +3185,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 */