mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ba37db0453
commit
1cda6e3968
2 changed files with 11 additions and 9 deletions
|
@ -1,3 +1,11 @@
|
|||
Thu Feb 21 13:15:40 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||
|
||||
* 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.
|
||||
|
||||
Thu Feb 21 13:04:59 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||
|
||||
* file.c (eaccess): use access() when not using setuid nor setgid.
|
||||
|
|
12
file.c
12
file.c
|
@ -1113,12 +1113,6 @@ eaccess(const char *path, int mode)
|
|||
}
|
||||
#endif
|
||||
|
||||
static inline int
|
||||
access_internal(const char *path, int mode)
|
||||
{
|
||||
return access(path, mode);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Document-class: FileTest
|
||||
|
@ -1350,7 +1344,7 @@ rb_file_readable_real_p(VALUE obj, VALUE fname)
|
|||
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;
|
||||
}
|
||||
|
||||
|
@ -1422,7 +1416,7 @@ rb_file_writable_real_p(VALUE obj, VALUE fname)
|
|||
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;
|
||||
}
|
||||
|
||||
|
@ -1486,7 +1480,7 @@ rb_file_executable_real_p(VALUE obj, VALUE fname)
|
|||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue