From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 29 Dec 2013 21:41:23 +0000 (-0600)
Subject: extract.c:  Fix short name reordering
X-Git-Tag: v1.6.0~49
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=92502e53658f09310d67118a0bbc18fa83a1b6f0;hp=02c88b0b316e3ece9b488c7f078bf6a24c660928

extract.c:  Fix short name reordering
---

diff --git a/configure.ac b/configure.ac
index c5443fa2..20ee9075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
diff --git a/src/extract.c b/src/extract.c
index 6f49c675..2e285f54 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -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",