nagachika	2013-03-09 21:16:12 +0900 (Sat, 09 Mar 2013)

  New Revision: 39651

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39651

  Log:
    merge revision(s) 39351:
    
    * file.c (access_internal): removed.
    
    * file.c (rb_file_readable_real): use access() instead of
      access_internal().
    
    * file.c (rb_file_writable_real): ditto.
    
    * file.c (rb_file_executable_real): ditto.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/file.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39650)
+++ ruby_2_0_0/ChangeLog	(revision 39651)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Mar  9 21:15:39 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* file.c (access_internal): removed.
+	* file.c (rb_file_readable_real): use access() instead of
+	  access_internal().
+	* file.c (rb_file_writable_real): ditto.
+	* file.c (rb_file_executable_real): ditto.
+
 Wed Mar  6 22:13:38 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 merge revision(s) 39297: [Backport #8032]
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39650)
+++ ruby_2_0_0/version.h	(revision 39651)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-03-06"
-#define RUBY_PATCHLEVEL 20
+#define RUBY_RELEASE_DATE "2013-03-09"
+#define RUBY_PATCHLEVEL 21
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/file.c
===================================================================
--- ruby_2_0_0/file.c	(revision 39650)
+++ ruby_2_0_0/file.c	(revision 39651)
@@ -1109,12 +1109,6 @@ eaccess(const char *path, int mode) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1109
 }
 #endif
 
-static inline int
-access_internal(const char *path, int mode)
-{
-    return access(path, mode);
-}
-
 
 /*
  * Document-class: FileTest
@@ -1346,7 +1340,7 @@ rb_file_readable_real_p(VALUE obj, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1340
     rb_secure(2);
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (access_internal(StringValueCStr(fname), R_OK) < 0) return Qfalse;
+    if (access(StringValueCStr(fname), R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1418,7 +1412,7 @@ rb_file_writable_real_p(VALUE obj, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1412
     rb_secure(2);
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (access_internal(StringValueCStr(fname), W_OK) < 0) return Qfalse;
+    if (access(StringValueCStr(fname), W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1482,7 +1476,7 @@ rb_file_executable_real_p(VALUE obj, VAL https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1476
     rb_secure(2);
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (access_internal(StringValueCStr(fname), X_OK) < 0) return Qfalse;
+    if (access(StringValueCStr(fname), X_OK) < 0) return Qfalse;
     return Qtrue;
 }
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39351


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/