From 63a3507c60ef6eda3b143e26dbf68f640e1deea7 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 10 Jul 2008 09:47:31 +0000 Subject: 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 --- ChangeLog | 5 +++++ file.c | 2 +- version.h | 2 +- 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 + + * file.c (rb_file_s_extname): fix for file name with spaces. + [ruby-talk:307404] + Thu Jul 10 18:42:37 2008 Masatoshi SEKI * 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 -- cgit v1.2.3