From d7dc0c5f037c4e98817ab0cc94b01c08052b4cf9 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 2 Jul 2015 12:32:09 +0000 Subject: dir.c: show warnings * dir.c (replace_real_basename): show warnings at errors. [Bug #10015] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ dir.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1536c3c69..615b9da505 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 2 21:32:06 2015 Nobuyoshi Nakada + + * dir.c (replace_real_basename): show warnings at errors. + [Bug #10015] + Thu Jul 2 18:39:20 2015 Koichi Sasada * gc.c: remove `#define RGENGC_OBJ_INFO 1' line introduced to diff --git a/dir.c b/dir.c index 4118c3f8e7..ce8cb6324a 100644 --- a/dir.c +++ b/dir.c @@ -1462,7 +1462,7 @@ is_case_sensitive(DIR *dirp) } static char * -replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, rb_pathtype_t *type) +replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int flags, rb_pathtype_t *type) { struct { u_int32_t length; @@ -1478,8 +1478,11 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, rb_pa IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil); *type = path_noent; - if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) + if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) { + if (!to_be_ignored(errno)) + sys_warning(path, enc); return path; + } switch (attrbuf[0].objtype) { case VREG: *type = path_regular; break; @@ -1513,7 +1516,7 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, rb_pa VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc); static char * -replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, rb_pathtype_t *type) +replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int flags, rb_pathtype_t *type) { char *plainname = path; volatile VALUE tmp = 0; @@ -1538,6 +1541,8 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, rb_pa free(wplain); if (h == INVALID_HANDLE_VALUE) { *type = path_noent; + if (!to_be_ignored(errno)) + sys_warning(path, enc); return path; } FindClose(h); @@ -1883,7 +1888,7 @@ glob_helper( if ((*cur)->type == ALPHA) { long base = pathlen + (dirsep != 0); buf = replace_real_basename(buf, base, enc, IF_NORMALIZE_UTF8PATH(1)+0, - &new_pathtype); + flags, &new_pathtype); } #endif status = glob_helper(buf, 1, new_pathtype, new_beg, -- cgit v1.2.3