From e6f839c47cefb31391c286e22b7bd9c0d45e31ae Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 23 Mar 2009 08:44:31 +0000 Subject: merge revision(s) 22654:22661: * file.c (file_load_ok): checks if regular file, except for the platform disallows to open directories, e.g. dosish. [ruby-dev:38097], [Bug #1221] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ file.c | 34 +++++++++++++--------------------- version.h | 8 ++++---- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed95ddf507..9be578d021 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Mar 23 17:41:49 2009 Nobuyoshi Nakada + + * file.c (file_load_ok): checks if regular file, except for the + platform disallows to open directories, e.g. dosish. + [ruby-dev:38097], [Bug #1221] + Mon Mar 9 20:59:24 2009 Shugo Maeda * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify diff --git a/file.c b/file.c index ca80795817..3e4db29876 100644 --- a/file.c +++ b/file.c @@ -288,7 +288,6 @@ rb_stat_dev_minor(self) #endif } - /* * call-seq: * stat.ino => fixnum @@ -353,7 +352,6 @@ rb_stat_nlink(self) return UINT2NUM(get_stat(self)->st_nlink); } - /* * call-seq: * stat.uid => fixnum @@ -388,7 +386,6 @@ rb_stat_gid(self) return UINT2NUM(get_stat(self)->st_gid); } - /* * call-seq: * stat.rdev => fixnum or nil @@ -518,7 +515,6 @@ rb_stat_blocks(self) #endif } - /* * call-seq: * stat.atime => time @@ -784,7 +780,6 @@ rb_file_s_lstat(klass, fname) #endif } - /* * call-seq: * file.lstat => stat @@ -914,7 +909,6 @@ eaccess(path, mode) * */ - /* * call-seq: * File.directory?(file_name) => true or false @@ -1103,7 +1097,6 @@ test_c(obj, fname) return Qfalse; } - /* * call-seq: * File.exist?(file_name) => true or false @@ -1156,7 +1149,6 @@ test_R(obj, fname) return Qtrue; } - /* * call-seq: * File.writable?(file_name) => true or false @@ -1934,7 +1926,6 @@ lchown_internal(path, argp) rb_sys_fail(path); } - /* * call-seq: * file.lchown(owner_int, group_int, file_name,..) => integer @@ -3630,7 +3621,6 @@ rb_f_test(argc, argv) } - /* * Document-class: File::Stat * @@ -3948,8 +3938,6 @@ rb_stat_r(obj) return Qtrue; } - - /* * call-seq: * stat.readable_real? -> true or false @@ -4098,7 +4086,6 @@ rb_stat_x(obj) * the process. */ - static VALUE rb_stat_X(obj) VALUE obj; @@ -4162,7 +4149,6 @@ rb_stat_z(obj) return Qfalse; } - /* * call-seq: * state.size => integer @@ -4379,13 +4365,19 @@ static int file_load_ok(file) const char *file; { - FILE *f; - - if (!file) return 0; - f = fopen(file, "r"); - if (f == NULL) return 0; - fclose(f); - return 1; + int ret = 1; + int fd = open(file, O_RDONLY); + if (fd == -1) return 0; +#if !defined DOSISH + { + struct stat st; + if (fstat(fd, &st) || !S_ISREG(st.st_mode)) { + ret = 0; + } + } +#endif + (void)close(fd); + return ret; } extern VALUE rb_load_path; diff --git a/version.h b/version.h index 5c418d4e74..18fbc5ffed 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-03-09" +#define RUBY_RELEASE_DATE "2009-03-23" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090309 -#define RUBY_PATCHLEVEL 150 +#define RUBY_RELEASE_CODE 20090323 +#define RUBY_PATCHLEVEL 151 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 23 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3