summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-10 09:45:21 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-10 09:45:21 +0000
commite5a1622cd60233a17cd6334fc52d54590e1f2f54 (patch)
treec1f064821813eb227fc1090b4f47b5e3f5c62aea
parent46776da2aa3432ba72873aede6b727450aed4de1 (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_6@18004 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 6c77c000e8..0c23b9a3cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 10 18:44:01 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:39:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/net/ftp.rb (Net::FTP#sendport): use divmod. [ruby-core:17557]
diff --git a/file.c b/file.c
index 4279ed6040..8e8dae3a97 100644
--- a/file.c
+++ b/file.c
@@ -3043,7 +3043,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 041c5c41d0..a37dd6f12a 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-07-10"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080710
-#define RUBY_PATCHLEVEL 272
+#define RUBY_PATCHLEVEL 273
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8