summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-23 08:41:12 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-23 08:41:12 +0000
commitcaaa35f068acb2de75262b328e6085561b323a47 (patch)
treed18c549eb5382fddb781832b7023504a42be6db2
parent32c140b961d80a65dadce651dc2364ac878742a5 (diff)
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_6@23038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--file.c34
-rw-r--r--version.h8
3 files changed, 23 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index a8de1cdd15..8e9e681ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 23 17:39:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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]
+
Tue Mar 10 16:05:36 2009 Akinori MUSHA <knu@iDaemons.org>
* ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted
diff --git a/file.c b/file.c
index 8e8dae3a97..16ef2c9028 100644
--- a/file.c
+++ b/file.c
@@ -291,7 +291,6 @@ rb_stat_dev_minor(self)
#endif
}
-
/*
* call-seq:
* stat.ino => fixnum
@@ -356,7 +355,6 @@ rb_stat_nlink(self)
return UINT2NUM(get_stat(self)->st_nlink);
}
-
/*
* call-seq:
* stat.uid => fixnum
@@ -391,7 +389,6 @@ rb_stat_gid(self)
return UINT2NUM(get_stat(self)->st_gid);
}
-
/*
* call-seq:
* stat.rdev => fixnum or nil
@@ -521,7 +518,6 @@ rb_stat_blocks(self)
#endif
}
-
/*
* call-seq:
* stat.atime => time
@@ -787,7 +783,6 @@ rb_file_s_lstat(klass, fname)
#endif
}
-
/*
* call-seq:
* file.lstat => stat
@@ -917,7 +912,6 @@ eaccess(path, mode)
*
*/
-
/*
* call-seq:
* File.directory?(file_name) => true or false
@@ -1106,7 +1100,6 @@ test_c(obj, fname)
return Qfalse;
}
-
/*
* call-seq:
* File.exist?(file_name) => true or false
@@ -1159,7 +1152,6 @@ test_R(obj, fname)
return Qtrue;
}
-
/*
* call-seq:
* File.writable?(file_name) => true or false
@@ -1937,7 +1929,6 @@ lchown_internal(path, argp)
rb_sys_fail(path);
}
-
/*
* call-seq:
* file.lchown(owner_int, group_int, file_name,..) => integer
@@ -3629,7 +3620,6 @@ rb_f_test(argc, argv)
}
-
/*
* Document-class: File::Stat
*
@@ -3947,8 +3937,6 @@ rb_stat_r(obj)
return Qtrue;
}
-
-
/*
* call-seq:
* stat.readable_real? -> true or false
@@ -4097,7 +4085,6 @@ rb_stat_x(obj)
* the process.
*/
-
static VALUE
rb_stat_X(obj)
VALUE obj;
@@ -4161,7 +4148,6 @@ rb_stat_z(obj)
return Qfalse;
}
-
/*
* call-seq:
* state.size => integer
@@ -4378,13 +4364,19 @@ static int
file_load_ok(file)
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 c7a9a1784d..b30ddb6002 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-03-10"
+#define RUBY_RELEASE_DATE "2009-03-23"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090310
-#define RUBY_PATCHLEVEL 362
+#define RUBY_RELEASE_CODE 20090323
+#define RUBY_PATCHLEVEL 363
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 23
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];