MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-133844 (correct handling of DT_UNKNOWN in fsnotifier)

Browse Source
This commit is contained in:
Roman Shevchenko
2014-12-19 11:01:41 +01:00
parent fb43c3a18e
commit 7f3d5a71e3
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/linux/fsnotifier
View File

Binary file not shown.

BIN
bin/linux/fsnotifier64
View File

Binary file not shown.

19
native/fsNotifier/linux/inotify.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2000-2012 JetBrains s.r.o. * Copyright 2000-2014 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -270,14 +270,27 @@ static int walk_tree(int path_len, watch_node* parent, bool recursive, array* mo
struct dirent* entry; struct dirent* entry;
while ((entry = readdir(dir)) != NULL) { while ((entry = readdir(dir)) != NULL) {
if (entry->d_type != DT_DIR || if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) { continue;
}
if (entry->d_type != DT_UNKNOWN && entry->d_type != DT_DIR) {
continue; continue;
} }
int name_len = strlen(entry->d_name); int name_len = strlen(entry->d_name);
memcpy(path_buf + path_len + 1, entry->d_name, name_len + 1); memcpy(path_buf + path_len + 1, entry->d_name, name_len + 1);
if (entry->d_type == DT_UNKNOWN) {
struct stat st;
if (stat(path_buf, &st) != 0) {
userlog(LOG_DEBUG, "(DT_UNKNOWN) stat(%s): %d", path_buf, errno);
continue;
}
if (!S_ISDIR(st.st_mode)) {
continue;
}
}
int subdir_id = walk_tree(path_len + 1 + name_len, table_get(watches, id), recursive, mounts); int subdir_id = walk_tree(path_len + 1 + name_len, table_get(watches, id), recursive, mounts);
if (subdir_id < 0 && subdir_id != ERR_IGNORE) { if (subdir_id < 0 && subdir_id != ERR_IGNORE) {
rm_watch(id, true); rm_watch(id, true);