X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=c280bf332afbaaa43540d3f47d1a1beee19b5bd0;hb=e176e9731e696562bab8de7b9bd34c019deef3e8;hp=d3588a9e5175f94fc10b393b31d8b0df6fa73b09;hpb=49a63aa13cdeb4c1348697ccd92207a1a65ec7b0;p=wimlib

diff --git a/programs/imagex.c b/programs/imagex.c
index d3588a9e..c280bf33 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -142,7 +142,9 @@ enum {
 	IMAGEX_NORPFIX_OPTION,
 	IMAGEX_NOCHECK_OPTION,
 	IMAGEX_NO_ACLS_OPTION,
+	IMAGEX_NO_PACK_STREAMS_OPTION,
 	IMAGEX_NOT_PIPABLE_OPTION,
+	IMAGEX_PACK_STREAMS_OPTION,
 	IMAGEX_PATH_OPTION,
 	IMAGEX_PIPABLE_OPTION,
 	IMAGEX_REBUILD_OPTION,
@@ -192,6 +194,7 @@ static const struct option capture_or_append_options[] = {
 	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
 	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
 	{T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
+	{T("pack-streams"), no_argument,      NULL, IMAGEX_PACK_STREAMS_OPTION},
 	{T("config"),      required_argument, NULL, IMAGEX_CONFIG_OPTION},
 	{T("dereference"), no_argument,       NULL, IMAGEX_DEREFERENCE_OPTION},
 	{T("flags"),       required_argument, NULL, IMAGEX_FLAGS_OPTION},
@@ -1024,22 +1027,6 @@ stdin_get_text_contents(size_t *num_tchars_ret)
 #define TO_PERCENT(numerator, denominator) \
 	(((denominator) == 0) ? 0 : ((numerator) * 100 / (denominator)))
 
-/* Given an enumerated value for WIM compression type, return a descriptive
- * string. */
-static const tchar *
-get_data_type(int ctype)
-{
-	switch (ctype) {
-	case WIMLIB_COMPRESSION_TYPE_NONE:
-		return T("uncompressed");
-	case WIMLIB_COMPRESSION_TYPE_LZX:
-		return T("LZX-compressed");
-	case WIMLIB_COMPRESSION_TYPE_XPRESS:
-		return T("XPRESS-compressed");
-	}
-	return NULL;
-}
-
 #define GIBIBYTE_MIN_NBYTES 10000000000ULL
 #define MEBIBYTE_MIN_NBYTES 10000000ULL
 #define KIBIBYTE_MIN_NBYTES 10000ULL
@@ -1079,11 +1066,9 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 					  info->write_streams.total_bytes);
 
 		if (info->write_streams.completed_streams == 0) {
-			const tchar *data_type;
-
-			data_type = get_data_type(info->write_streams.compression_type);
-			imagex_printf(T("Writing %"TS" data using %u thread%"TS"\n"),
-				data_type, info->write_streams.num_threads,
+			imagex_printf(T("Writing %"TS"-compressed data using %u thread%"TS"\n"),
+				wimlib_get_compression_type_string(info->write_streams.compression_type),
+				info->write_streams.num_threads,
 				(info->write_streams.num_threads == 1) ? T("") : T("s"));
 		}
 		if (info->write_streams.total_parts <= 1) {
@@ -1276,10 +1261,10 @@ parse_num_threads(const tchar *optarg)
 	}
 }
 
-static uint32_t parse_chunk_size(const char *optarg)
+static uint32_t parse_chunk_size(const tchar *optarg)
 {
-       char *tmp;
-       unsigned long chunk_size = strtoul(optarg, &tmp, 10);
+       tchar *tmp;
+       unsigned long chunk_size = tstrtoul(optarg, &tmp, 10);
        if (chunk_size >= UINT32_MAX || *tmp || tmp == optarg) {
                imagex_error(T("Chunk size must be a non-negative integer!"));
                return UINT32_MAX;
@@ -1753,6 +1738,9 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 			if (chunk_size == UINT32_MAX)
 				goto out_err;
 			break;
+		case IMAGEX_PACK_STREAMS_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
+			break;
 		case IMAGEX_FLAGS_OPTION:
 			flags_element = optarg;
 			break;
@@ -2773,6 +2761,7 @@ print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info)
 	tprintf(T("GUID:           0x"));
 	print_byte_field(info->guid, sizeof(info->guid));
 	tputchar(T('\n'));
+	tprintf(T("Version:        %u\n"), info->wim_version);
 	tprintf(T("Image Count:    %d\n"), info->image_count);
 	tprintf(T("Compression:    %"TS"\n"),
 		wimlib_get_compression_type_string(info->compression_type));
@@ -2794,25 +2783,33 @@ static int
 print_resource(const struct wimlib_resource_entry *resource,
 	       void *_ignore)
 {
-
-	tprintf(T("Uncompressed size   = %"PRIu64" bytes\n"),
+	tprintf(T("Uncompressed size     = %"PRIu64" bytes\n"),
 		resource->uncompressed_size);
+	if (resource->packed) {
+		tprintf(T("Raw compressed size   = %"PRIu64" bytes\n"),
+			resource->raw_resource_compressed_size);
 
-	tprintf(T("Compressed size     = %"PRIu64" bytes\n"),
-		resource->compressed_size);
+		tprintf(T("Raw offset in WIM     = %"PRIu64" bytes\n"),
+			resource->raw_resource_offset_in_wim);
 
-	tprintf(T("Offset              = %"PRIu64" bytes\n"),
-		resource->offset);
+		tprintf(T("Offset in raw         = %"PRIu64" bytes\n"),
+			resource->offset);
+	} else {
+		tprintf(T("Compressed size       = %"PRIu64" bytes\n"),
+			resource->compressed_size);
 
+		tprintf(T("Offset in WIM         = %"PRIu64" bytes\n"),
+			resource->offset);
+	}
 
-	tprintf(T("Part Number         = %u\n"), resource->part_number);
-	tprintf(T("Reference Count     = %u\n"), resource->reference_count);
+	tprintf(T("Part Number           = %u\n"), resource->part_number);
+	tprintf(T("Reference Count       = %u\n"), resource->reference_count);
 
-	tprintf(T("Hash                = 0x"));
+	tprintf(T("Hash                  = 0x"));
 	print_byte_field(resource->sha1_hash, sizeof(resource->sha1_hash));
 	tputchar(T('\n'));
 
-	tprintf(T("Flags               = "));
+	tprintf(T("Flags                 = "));
 	if (resource->is_compressed)
 		tprintf(T("WIM_RESHDR_FLAG_COMPRESSED  "));
 	if (resource->is_metadata)
@@ -2821,6 +2818,8 @@ print_resource(const struct wimlib_resource_entry *resource,
 		tprintf(T("WIM_RESHDR_FLAG_FREE  "));
 	if (resource->is_spanned)
 		tprintf(T("WIM_RESHDR_FLAG_SPANNED  "));
+	if (resource->packed)
+		tprintf(T("WIM_RESHDR_FLAG_PACKED_STREAMS  "));
 	tputchar(T('\n'));
 	tputchar(T('\n'));
 	return 0;