From 54f236542d7a1cb28e7902a987ca583b5eefe874 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 9 Dec 2007 03:18:21 +0000
Subject: [PATCH] * file.c (rb_get_path): use the original object if to_path
 method is   not defined.  [ruby-dev:32473]

* io.c (rb_f_open): call to_open on non-string objects, instead of
  to_str.  [ruby-dev:32473]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 8 ++++++++
 file.c    | 3 +++
 io.c      | 3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 14add27220..84cb439ab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Dec  9 12:18:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_get_path): use the original object if to_path method is
+	  not defined.  [ruby-dev:32473]
+
+	* io.c (rb_f_open): call to_open on non-string objects, instead of
+	  to_str.  [ruby-dev:32473]
+
 Sun Dec  9 12:12:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (tr_find): returns true if no characters to be removed is
diff --git a/file.c b/file.c
index 09be42415a..ac7ee25a57 100644
--- a/file.c
+++ b/file.c
@@ -111,6 +111,9 @@ rb_get_path(VALUE obj)
     if (rb_respond_to(obj, to_path)) {
 	tmp = rb_funcall(obj, to_path, 0, 0);
     }
+    else {
+	tmp = obj;
+    }
   exit:
     StringValueCStr(tmp);
     if (obj != tmp) {
diff --git a/io.c b/io.c
index 12d4e01c59..8a0a7de2a2 100644
--- a/io.c
+++ b/io.c
@@ -3799,7 +3799,8 @@ rb_f_open(int argc, VALUE *argv)
 	    redirect = Qtrue;
 	}
 	else {
-	    VALUE tmp = rb_check_string_type(argv[0]);
+	    VALUE tmp = argv[0];
+	    FilePathValue(tmp);
 	    if (NIL_P(tmp)) {
 		redirect = Qtrue;
 	    }