X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract.c;h=e80bbe94a4d2e65f0b23cc0b8ce4ee96c94d53fb;hp=706282e00306dc73e465cca403c9268758cd95e0;hb=e9a04c1cb384cf3cf23d70107e85f79c4ac0a555;hpb=9b53e465be528eb95ede2c464e603f5d79873794

diff --git a/src/extract.c b/src/extract.c
index 706282e0..e80bbe94 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -84,7 +84,12 @@
 	 WIMLIB_EXTRACT_FLAG_STRICT_GLOB		|	\
 	 WIMLIB_EXTRACT_FLAG_NO_ATTRIBUTES		|	\
 	 WIMLIB_EXTRACT_FLAG_NO_PRESERVE_DIR_STRUCTURE  |	\
-	 WIMLIB_EXTRACT_FLAG_WIMBOOT)
+	 WIMLIB_EXTRACT_FLAG_WIMBOOT			|	\
+	 WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS4K		|	\
+	 WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS8K		|	\
+	 WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS16K		|	\
+	 WIMLIB_EXTRACT_FLAG_COMPACT_LZX			\
+	 )
 
 /* Send WIMLIB_PROGRESS_MSG_EXTRACT_FILE_STRUCTURE or
  * WIMLIB_PROGRESS_MSG_EXTRACT_METADATA.  */
@@ -655,19 +660,20 @@ file_name_valid(utf16lechar *name, size_t num_chars, bool fix)
 	if (num_chars == 0)
 		return true;
 	for (i = 0; i < num_chars; i++) {
-		switch (name[i]) {
+		switch (le16_to_cpu(name[i])) {
 	#ifdef __WIN32__
-		case cpu_to_le16('\\'):
-		case cpu_to_le16(':'):
-		case cpu_to_le16('*'):
-		case cpu_to_le16('?'):
-		case cpu_to_le16('"'):
-		case cpu_to_le16('<'):
-		case cpu_to_le16('>'):
-		case cpu_to_le16('|'):
+		case '\x01'...'\x1F':
+		case '\\':
+		case ':':
+		case '*':
+		case '?':
+		case '"':
+		case '<':
+		case '>':
+		case '|':
 	#endif
-		case cpu_to_le16('/'):
-		case cpu_to_le16('\0'):
+		case '/':
+		case '\0':
 			if (fix)
 				name[i] = replacement_char;
 			else
@@ -972,10 +978,11 @@ ref_stream_if_needed(struct wim_dentry *dentry, struct wim_inode *inode,
 			 * - file is a directory
 			 * - file is encrypted
 			 * - backend needs to create the file as UNIX symlink
-			 * - backend will extract the stream as externally backed
+			 * - backend will extract the stream as externally
+			 *   backed from the WIM archive itself
 			 */
-			if (ctx->apply_ops->will_externally_back) {
-				int ret = (*ctx->apply_ops->will_externally_back)(dentry, ctx);
+			if (ctx->apply_ops->will_back_from_wim) {
+				int ret = (*ctx->apply_ops->will_back_from_wim)(dentry, ctx);
 				if (ret > 0) /* Error?  */
 					return ret;
 				if (ret < 0) /* Won't externally back?  */
@@ -1478,6 +1485,34 @@ check_extract_flags(const WIMStruct *wim, int *extract_flags_p)
 #endif
 	}
 
+	if (extract_flags & (WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS4K |
+			     WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS8K |
+			     WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS16K |
+			     WIMLIB_EXTRACT_FLAG_COMPACT_LZX))
+	{
+	#ifdef __WIN32__
+		int count = 0;
+		count += ((extract_flags & WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS4K) != 0);
+		count += ((extract_flags & WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS8K) != 0);
+		count += ((extract_flags & WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS16K) != 0);
+		count += ((extract_flags & WIMLIB_EXTRACT_FLAG_COMPACT_LZX) != 0);
+		if (count != 1) {
+			ERROR("Only one compression format can be specified "
+			      "for compact-mode extraction!");
+			return WIMLIB_ERR_INVALID_PARAM;
+		}
+		if (extract_flags & WIMLIB_EXTRACT_FLAG_WIMBOOT) {
+			ERROR("Compact-mode extraction and WIMBoot-mode "
+			      "extraction are mutually exclusive!");
+			return WIMLIB_ERR_INVALID_PARAM;
+		}
+	#else
+		ERROR("Compact-mode extraction (System Compression) "
+		      "is only supported on Windows!");
+		return WIMLIB_ERR_UNSUPPORTED;
+	#endif
+	}
+
 
 	if ((extract_flags & (WIMLIB_EXTRACT_FLAG_RPFIX |
 			      WIMLIB_EXTRACT_FLAG_NORPFIX |