1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prefer rb_syserr_fail

Browse Source 
* dir.c (dir_initialize, dir_read): prefer rb_syserr_fail over
  rb_sys_fail.

* io.c (ruby_dup, rb_sysopen): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-10-21 07:40:47 +00:00
parent 4791b2bc22
commit ccc9841a82
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dir.c
View File

@ -526,11 +526,12 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
path = RSTRING_PTR(dirname); path = RSTRING_PTR(dirname);
dp->dir = opendir(path); dp->dir = opendir(path);
if (dp->dir == NULL) { if (dp->dir == NULL) {
if (rb_gc_for_fd(errno)) { int e = errno;
if (rb_gc_for_fd(e)) {
dp->dir = opendir(path); dp->dir = opendir(path);
} }
#ifdef HAVE_GETATTRLIST #ifdef HAVE_GETATTRLIST
else if (errno == EIO) { else if (e == EIO) {
u_int32_t attrbuf[1]; u_int32_t attrbuf[1];
struct attrlist al = {ATTR_BIT_MAP_COUNT, 0}; struct attrlist al = {ATTR_BIT_MAP_COUNT, 0};
if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW) == 0) { if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW) == 0) {
@ -540,7 +541,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
#endif #endif
if (dp->dir == NULL) { if (dp->dir == NULL) {
RB_GC_GUARD(dirname); RB_GC_GUARD(dirname);
rb_sys_fail_path(orig); rb_syserr_fail_path(e, orig);
} }
} }
dp->path = orig; dp->path = orig;
@ -752,7 +753,8 @@ dir_read(VALUE dir)
return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc); return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
} }
else { else {
if (errno != 0) rb_sys_fail(0); int e = errno;
if (e != 0) rb_syserr_fail(e, 0);
return Qnil; /* end of stream */ return Qnil; /* end of stream */
} }
} }

16
io.c
View File

@ -889,11 +889,12 @@ ruby_dup(int orig)
fd = rb_cloexec_dup(orig); fd = rb_cloexec_dup(orig);
if (fd < 0) { if (fd < 0) {
if (rb_gc_for_fd(errno)) { int e = errno;
if (rb_gc_for_fd(e)) {
fd = rb_cloexec_dup(orig); fd = rb_cloexec_dup(orig);
} }
if (fd < 0) { if (fd < 0) {
rb_sys_fail(0); rb_syserr_fail(e, 0);
} }
} }
rb_update_max_fd(fd); rb_update_max_fd(fd);
@ -5468,11 +5469,12 @@ rb_sysopen(VALUE fname, int oflags, mode_t perm)
fd = rb_sysopen_internal(&data); fd = rb_sysopen_internal(&data);
if (fd < 0) { if (fd < 0) {
if (rb_gc_for_fd(errno)) { int e = errno;
if (rb_gc_for_fd(e)) {
fd = rb_sysopen_internal(&data); fd = rb_sysopen_internal(&data);
} }
if (fd < 0) { if (fd < 0) {
rb_sys_fail_path(fname); rb_syserr_fail_path(e, fname);
} }
} }
return fd; return fd;
@ -5488,19 +5490,19 @@ rb_fdopen(int fd, const char *modestr)
#endif #endif
file = fdopen(fd, modestr); file = fdopen(fd, modestr);
if (!file) { if (!file) {
int e = errno;
#if defined(__sun) #if defined(__sun)
if (errno == 0) { if (e == 0) {
rb_gc(); rb_gc();
errno = 0; errno = 0;
file = fdopen(fd, modestr); file = fdopen(fd, modestr);
} }
else else
#endif #endif
if (rb_gc_for_fd(errno)) { if (rb_gc_for_fd(e)) {
file = fdopen(fd, modestr); file = fdopen(fd, modestr);
} }
if (!file) { if (!file) {
int e = errno;
#ifdef _WIN32 #ifdef _WIN32
if (e == 0) e = EINVAL; if (e == 0) e = EINVAL;
#elif defined(__sun) #elif defined(__sun)