summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--dir.c13
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e1536c3..615b9da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 2 21:32:06 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (replace_real_basename): show warnings at errors.
+ [Bug #10015]
+
Thu Jul 2 18:39:20 2015 Koichi Sasada <ko1@atdot.net>
* gc.c: remove `#define RGENGC_OBJ_INFO 1' line introduced to
diff --git a/dir.c b/dir.c
index 4118c3f..ce8cb63 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,