mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* file.c (rb_find_file): reset to real class.
* io.c (io_reopen): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
530ad54d8b
commit
d4c32f93e2
4 changed files with 12 additions and 5 deletions
|
@ -1,3 +1,9 @@
|
|||
Wed Aug 6 05:10:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* file.c (rb_find_file): reset to real class.
|
||||
|
||||
* io.c (io_reopen): ditto.
|
||||
|
||||
Tue Aug 5 16:43:07 2008 Shugo Maeda <shugo@ruby-lang.org>
|
||||
|
||||
* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
|
||||
|
|
3
file.c
3
file.c
|
@ -4432,6 +4432,7 @@ rb_find_file_ext(filep, ext)
|
|||
for (j=0; ext[j]; j++) {
|
||||
rb_str_cat2(tmp, ext[j]);
|
||||
if (file_load_ok(RSTRING_PTR(tmp))) {
|
||||
rb_str_resize(tmp, 0);
|
||||
fname = rb_str_dup(*filep);
|
||||
rb_str_cat2(fname, ext[j]);
|
||||
OBJ_FREEZE(fname);
|
||||
|
@ -4500,7 +4501,7 @@ rb_find_file(path)
|
|||
}
|
||||
return 0;
|
||||
found:
|
||||
RBASIC(tmp)->klass = RBASIC(path)->klass;
|
||||
RBASIC(tmp)->klass = rb_obj_class(path);
|
||||
OBJ_FREEZE(tmp);
|
||||
}
|
||||
else {
|
||||
|
|
2
io.c
2
io.c
|
@ -3724,7 +3724,7 @@ io_reopen(io, nfile)
|
|||
rb_io_binmode(io);
|
||||
}
|
||||
|
||||
RBASIC(io)->klass = RBASIC(nfile)->klass;
|
||||
RBASIC(io)->klass = rb_obj_class(nfile);
|
||||
return io;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#define RUBY_VERSION "1.8.7"
|
||||
#define RUBY_RELEASE_DATE "2008-08-05"
|
||||
#define RUBY_RELEASE_DATE "2008-08-06"
|
||||
#define RUBY_VERSION_CODE 187
|
||||
#define RUBY_RELEASE_CODE 20080805
|
||||
#define RUBY_RELEASE_CODE 20080806
|
||||
#define RUBY_PATCHLEVEL 5000
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
|
@ -9,7 +9,7 @@
|
|||
#define RUBY_VERSION_TEENY 7
|
||||
#define RUBY_RELEASE_YEAR 2008
|
||||
#define RUBY_RELEASE_MONTH 8
|
||||
#define RUBY_RELEASE_DAY 5
|
||||
#define RUBY_RELEASE_DAY 6
|
||||
|
||||
#ifdef RUBY_EXTERN
|
||||
RUBY_EXTERN const char ruby_version[];
|
||||
|
|
Loading…
Add table
Reference in a new issue