Refactor read_dentry_tree()

[wimlib] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 9a43e630b7c0e3d2b840be0bc83769aafcaae29e..3e4fbcc88fca43e94d489aea8de3b11591548d3c 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -1707,17 +1707,6 @@ file_name_valid(utf16lechar *name, size_t num_chars, bool fix)
        return true;
 }
 
        return true;
 }
 

-static bool
-dentry_is_dot_or_dotdot(const struct wim_dentry *dentry)
-{
-       const utf16lechar *file_name = dentry->file_name;
-       return file_name != NULL &&
-               file_name[0] == cpu_to_le16('.') &&
-               (file_name[1] == cpu_to_le16('\0') ||
-                (file_name[1] == cpu_to_le16('.') &&
-                 file_name[2] == cpu_to_le16('\0')));
-}
-

 static int
 dentry_mark_skipped(struct wim_dentry *dentry, void *_ignore)
 {
 static int
 dentry_mark_skipped(struct wim_dentry *dentry, void *_ignore)
 {


@@ -1755,14 +1744,6 @@ dentry_calculate_extraction_path(struct wim_dentry *dentry, void *_args)
        if (!dentry_is_supported(dentry, &ctx->supported_features))
                goto skip_dentry;
 
        if (!dentry_is_supported(dentry, &ctx->supported_features))
                goto skip_dentry;
 

-       if (dentry_is_dot_or_dotdot(dentry)) {
-               /* WIM files shouldn't contain . or .. entries.  But if they are
-                * there, don't attempt to extract them. */
-               WARNING("Skipping extraction of unexpected . or .. file "
-                       "\"%"TS"\"", dentry_full_path(dentry));
-               goto skip_dentry;
-       }
-

        if (!ctx->ops->supports_case_sensitive_filenames)
        {
                struct wim_dentry *other;
        if (!ctx->ops->supports_case_sensitive_filenames)
        {
                struct wim_dentry *other;