extract.c: Fix short name reordering
authorEric Biggers <ebiggers3@gmail.com>
Sun, 29 Dec 2013 21:41:23 +0000 (15:41 -0600)
committerEric Biggers <ebiggers3@gmail.com>
Sun, 29 Dec 2013 21:41:23 +0000 (15:41 -0600)
configure.ac
src/extract.c

index c5443fa..20ee907 100644 (file)
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.6.0], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.6.0-BETA], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
index 6f49c67..2e285f5 100644 (file)
@@ -1147,7 +1147,8 @@ dentry_extract_skeleton(struct wim_dentry *dentry, void *_ctx)
                inode_for_each_dentry(other_dentry, dentry->d_inode) {
                        if (dentry_has_short_name(other_dentry)
                            && !other_dentry->skeleton_extracted
-                           && other_dentry->in_extraction_tree)
+                           && other_dentry->in_extraction_tree
+                           && !other_dentry->extraction_skipped)
                        {
                                DEBUG("Creating %"TS" before %"TS" "
                                      "to guarantee correct DOS name extraction",