X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Funix_capture.c;h=2843c36a6c698204c4aace20f32ebb6bc435f008;hp=f7dd5074e7df7208d4cfc4d8d05a34bfb5e7fd39;hb=43a5725a59b3e5a55ba41ffe988b9bc9430225a4;hpb=d5a64bb4299105c93b4e9a95e97b579c6f9254af diff --git a/src/unix_capture.c b/src/unix_capture.c index f7dd5074..2843c36a 100644 --- a/src/unix_capture.c +++ b/src/unix_capture.c @@ -180,13 +180,12 @@ unix_scan_directory(struct wim_dentry *dir_dentry, break; } - if (entry->d_name[0] == '.' && - (entry->d_name[1] == '\0' || - (entry->d_name[1] == '.' && entry->d_name[2] == '\0'))) + name_len = strlen(entry->d_name); + + if (should_ignore_filename(entry->d_name, name_len)) continue; full_path[full_path_len] = '/'; - name_len = strlen(entry->d_name); memcpy(&full_path[full_path_len + 1], entry->d_name, name_len + 1); ret = unix_build_dentry_tree_recursive(&child, full_path, @@ -197,8 +196,7 @@ unix_scan_directory(struct wim_dentry *dir_dentry, full_path[full_path_len] = '\0'; if (ret) break; - if (child) - dentry_add_child(dir_dentry, child); + attach_scanned_tree(dir_dentry, child, params->blob_table); } closedir(dir); return ret; @@ -390,8 +388,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret, } ret = inode_table_new_dentry(params->inode_table, relpath, - stbuf.st_ino, stbuf.st_dev, - S_ISDIR(stbuf.st_mode), &tree); + stbuf.st_ino, stbuf.st_dev, false, &tree); if (ret) goto out;