X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fiterate_dir.c;h=e4eb87d7875d0c92dcbf02bdb064997df19f4240;hb=88afc46984c143cbf928a3186f8cc93d819e9269;hp=ad34e7990b038df68d4e7d464cb4848c3070ad11;hpb=4e32f48feb64932954953a87f064170500f93221;p=wimlib diff --git a/src/iterate_dir.c b/src/iterate_dir.c index ad34e799..e4eb87d7 100644 --- a/src/iterate_dir.c +++ b/src/iterate_dir.c @@ -121,9 +121,19 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry, wdentry->num_links = inode->i_nlink; wdentry->attributes = inode->i_attributes; wdentry->hard_link_group_id = inode->i_ino; + + /* For Windows builds, to maintain ABI compatibility with previous + * versions of the DLLs, double-check that we're using the expected size + * for 'struct timespec'. */ +#ifdef _WIN64 + STATIC_ASSERT(sizeof(struct timespec) == 16); +#elif defined(_WIN32) + STATIC_ASSERT(sizeof(struct timespec) == 8); +#endif wdentry->creation_time = wim_timestamp_to_timespec(inode->i_creation_time); wdentry->last_write_time = wim_timestamp_to_timespec(inode->i_last_write_time); wdentry->last_access_time = wim_timestamp_to_timespec(inode->i_last_access_time); + if (inode_get_unix_data(inode, &unix_data)) { wdentry->unix_uid = unix_data.uid; wdentry->unix_gid = unix_data.gid; @@ -206,22 +216,12 @@ do_iterate_dir_tree(WIMStruct *wim, struct wim_dentry *child; ret = 0; - if (default_ignore_case) { - for_dentry_child_case_insensitive(child, dentry) { - ret = do_iterate_dir_tree(wim, child, - flags & ~WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN, - cb, user_ctx); - if (ret) - break; - } - } else { - for_dentry_child(child, dentry) { - ret = do_iterate_dir_tree(wim, child, - flags & ~WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN, - cb, user_ctx); - if (ret) - break; - } + for_dentry_child(child, dentry) { + ret = do_iterate_dir_tree(wim, child, + flags & ~WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN, + cb, user_ctx); + if (ret) + break; } } out_free_wimlib_dentry: