2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c533eecce..4d39a9d756 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 c89cd855bb..69c0c681a3 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 */