summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-10 09:47:31 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-10 09:47:31 +0000
commit63a3507c60ef6eda3b143e26dbf68f640e1deea7 (patch)
tree3111cc9fef2642e263a95261af6ec9e8f2e88874
parentcbdcd886863d456ccc3c055c5c118fbc9a61d917 (diff)
merge revision(s) 17916:
* file.c (rb_file_s_extname): fix for file name with spaces. [ruby-talk:307404] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--file.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d288a86043..12b09291d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 10 18:46:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_file_s_extname): fix for file name with spaces.
+ [ruby-talk:307404]
+
Thu Jul 10 18:42:37 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/erb.rb (PercentScanner#scan): fix %% line bug. [ruby-core:17491]
diff --git a/file.c b/file.c
index ba490c0894..ca80795817 100644
--- a/file.c
+++ b/file.c
@@ -3044,7 +3044,7 @@ rb_file_s_extname(klass, fname)
p = last;
break;
}
- e = dot;
+ if (*last == '.') e = dot;
continue;
#else
e = p; /* get the last dot of the last component */
diff --git a/version.h b/version.h
index 867558a960..1d8b961194 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-07-10"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20080710
-#define RUBY_PATCHLEVEL 54
+#define RUBY_PATCHLEVEL 55
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8