merges r24984 and r24987 from trunk into ruby_1_9_1.

--
* lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
  [ruby-dev:39345]
--
* test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 17 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f34765f81..afda849b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Sep 18 07:06:41 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]
+
+Fri Sep 18 06:36:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
+	  [ruby-dev:39345]
+
 Thu Oct 29 01:22:01 2009  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
 
 	* ext/socket/extconf.rb : Compilation failure on AIX.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 67f9b97aa9..5a2d67f12b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -191,11 +191,11 @@ class Array
 end
 
 def rm_f(*files)
-  FileUtils.rm_f(Dir[*files])
+  FileUtils.rm_f(Dir[*files.flatten(1)])
 end
 
 def rm_rf(*files)
-  FileUtils.rm_rf(Dir[*files])
+  FileUtils.rm_rf(Dir[*files.flatten(1)])
 end
 
 # Returns time stamp of the +target+ file if it exists and is newer
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 3117193385..1ac69a4bb0 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -435,6 +435,11 @@ end
     assert_file_not_exist 'tmp/rmtmp2'
     assert_file_not_exist 'tmp/rmtmp3'
     assert_file_exist 'tmp/rmtmp4'
+
+    # [ruby-dev:39345]
+    touch 'tmp/[rmtmp]'
+    rm_f 'tmp/[rmtmp]'
+    assert_file_not_exist 'tmp/[rmtmp]'
   end
 
   def test_rm_r
diff --git a/version.h b/version.h
index 9de05ab048..c5beb6446d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 334
+#define RUBY_PATCHLEVEL 336
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1