merge revision(s) 17916:

shyouhei · shyouhei · commit 63a3507c60ef · 2008-07-10T09:47:31.000Z
* 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
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -3044,7 +3044,7 @@ rb_file_s_extname(klass, fname)`
`3044`	`3044`	`p = last;`
`3045`	`3045`	`break;`
`3046`	`3046`	`}`
`3047`		`- e = dot;`
	`3047`	`+ if (*last == '.') e = dot;`
`3048`	`3048`	`continue;`
`3049`	`3049`	`#else`
`3050`	`3050`	`e = p; /* get the last dot of the last component */`