From e23558673dcae92c2395e46fdd583aa6bf50208e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 27 Feb 2009 06:49:43 +0000
Subject: * file.c (file_load_ok): checks if regular file.  [ruby-dev:38097]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  4 ++++
 file.c    | 28 +++++++---------------------
 version.h |  6 +++---
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ede5c89065..4bb35449a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 27 15:49:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_load_ok): checks if regular file.  [ruby-dev:38097]
+
 Thu Feb 26 14:31:27 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify
diff --git a/file.c b/file.c
index 4ca2bda08c..c1b84dd80f 100644
--- a/file.c
+++ b/file.c
@@ -290,7 +290,6 @@ rb_stat_dev_minor(self)
 #endif
 }
 
-
 /*
  *  call-seq:
  *     stat.ino   => fixnum
@@ -351,7 +350,6 @@ rb_stat_nlink(self)
     return UINT2NUM(get_stat(self)->st_nlink);
 }
 
-
 /*
  *  call-seq:
  *     stat.uid    => fixnum
@@ -386,7 +384,6 @@ rb_stat_gid(self)
     return UINT2NUM(get_stat(self)->st_gid);
 }
 
-
 /*
  *  call-seq:
  *     stat.rdev   =>  fixnum or nil
@@ -516,7 +513,6 @@ rb_stat_blocks(self)
 #endif
 }
 
-
 /*
  *  call-seq:
  *     stat.atime   => time
@@ -782,7 +778,6 @@ rb_file_s_lstat(klass, fname)
 #endif
 }
 
-
 /*
  *  call-seq:
  *     file.lstat   =>  stat
@@ -912,7 +907,6 @@ eaccess(path, mode)
  *     
  */
 
-
 /*
  * call-seq:
  *   File.directory?(file_name)   =>  true or false
@@ -1085,7 +1079,6 @@ test_c(obj, fname)
     return Qfalse;
 }
 
-
 /*
  * call-seq:
  *    File.exist?(file_name)    =>  true or false
@@ -1138,7 +1131,6 @@ test_R(obj, fname)
     return Qtrue;
 }
 
-
 /*
  * call-seq:
  *    File.writable?(file_name)   => true or false
@@ -1916,7 +1908,6 @@ lchown_internal(path, argp)
 	rb_sys_fail(path);
 }
 
-
 /*
  *  call-seq:
  *     file.lchown(owner_int, group_int, file_name,..) => integer
@@ -3624,7 +3615,6 @@ rb_f_test(argc, argv)
 }
 
 
-
 /*
  *  Document-class: File::Stat
  *
@@ -3942,8 +3932,6 @@ rb_stat_r(obj)
     return Qtrue;
 }
 
-
-
 /*
  *  call-seq:
  *     stat.readable_real? -> true or false
@@ -4092,7 +4080,6 @@ rb_stat_x(obj)
  *  the process.
  */
 
-
 static VALUE
 rb_stat_X(obj)
     VALUE obj;
@@ -4156,7 +4143,6 @@ rb_stat_z(obj)
     return Qfalse;
 }
 
-
 /*
  *  call-seq:
  *     state.size    => integer
@@ -4373,13 +4359,13 @@ 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;
+    struct stat st;
+    int ret, fd = open(file, O_RDONLY);
+    if (fd == -1) return 0;
+    ret = fstat(fd, &st);
+    (void)close(fd);
+    if (ret) return 0;
+    return S_ISREG(st.st_mode);
 }
 
 static int
diff --git a/version.h b/version.h
index 4214590f65..dae22ab48a 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-02-26"
+#define RUBY_RELEASE_DATE "2009-02-27"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090226
+#define RUBY_RELEASE_CODE 20090227
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
-- 
cgit v1.2.3