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

diff --git a/programs/imagex.c b/programs/imagex.c
index 5af55ebd..d3588a9e 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -120,6 +120,7 @@ enum {
 	IMAGEX_ALLOW_OTHER_OPTION,
 	IMAGEX_BOOT_OPTION,
 	IMAGEX_CHECK_OPTION,
+	IMAGEX_CHUNK_SIZE_OPTION,
 	IMAGEX_COMMAND_OPTION,
 	IMAGEX_COMMIT_OPTION,
 	IMAGEX_COMPRESS_OPTION,
@@ -190,6 +191,7 @@ static const struct option capture_or_append_options[] = {
 	{T("nocheck"),     no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{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("config"),      required_argument, NULL, IMAGEX_CONFIG_OPTION},
 	{T("dereference"), no_argument,       NULL, IMAGEX_DEREFERENCE_OPTION},
 	{T("flags"),       required_argument, NULL, IMAGEX_FLAGS_OPTION},
@@ -282,8 +284,11 @@ static const struct option optimize_options[] = {
 	{T("check"),       no_argument,       NULL, IMAGEX_CHECK_OPTION},
 	{T("nocheck"),     no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
+	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
 	{T("recompress"),  no_argument,       NULL, IMAGEX_RECOMPRESS_OPTION},
 	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
+	{T("recompress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
+	{T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
 	{T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
 	{T("pipable"),     no_argument,       NULL, IMAGEX_PIPABLE_OPTION},
 	{T("not-pipable"), no_argument,       NULL, IMAGEX_NOT_PIPABLE_OPTION},
@@ -418,9 +423,10 @@ get_compression_type(const tchar *optarg)
 	}
 }
 
-static void
+static int
 set_compress_slow(void)
 {
+	int ret;
 	static const struct wimlib_lzx_params slow_params = {
 		.size_of_this = sizeof(struct wimlib_lzx_params),
 		.algorithm = WIMLIB_LZX_ALGORITHM_SLOW,
@@ -429,7 +435,6 @@ set_compress_slow(void)
 				.use_len2_matches = 1,
 				.num_fast_bytes = 96,
 				.num_optim_passes = 4,
-				.num_split_passes = 0,
 				.max_search_depth = 100,
 				.max_matches_per_pos = 10,
 				.main_nostat_cost = 15,
@@ -438,8 +443,10 @@ set_compress_slow(void)
 			},
 		},
 	};
-	if (wimlib_lzx_set_default_params(&slow_params))
+	ret = wimlib_lzx_set_default_params(&slow_params);
+	if (ret)
 		imagex_error(T("Couldn't set slow compression parameters.!"));
+	return ret;
 }
 
 struct string_set {
@@ -1269,6 +1276,19 @@ parse_num_threads(const tchar *optarg)
 	}
 }
 
+static uint32_t parse_chunk_size(const char *optarg)
+{
+       char *tmp;
+       unsigned long chunk_size = strtoul(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;
+       } else {
+               return chunk_size;
+       }
+}
+
+
 /*
  * Parse an option passed to an update command.
  *
@@ -1667,6 +1687,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 			      WIMLIB_ADD_IMAGE_FLAG_WINCONFIG;
 	int write_flags = 0;
 	int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
+	uint32_t chunk_size = UINT32_MAX;
 	const tchar *wimfile;
 	int wim_fd;
 	const tchar *name;
@@ -1722,7 +1743,15 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 				goto out_err;
 			break;
 		case IMAGEX_COMPRESS_SLOW_OPTION:
-			set_compress_slow();
+			ret = set_compress_slow();
+			if (ret)
+				goto out_err;
+			compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+			break;
+		case IMAGEX_CHUNK_SIZE_OPTION:
+			chunk_size = parse_chunk_size(optarg);
+			if (chunk_size == UINT32_MAX)
+				goto out_err;
 			break;
 		case IMAGEX_FLAGS_OPTION:
 			flags_element = optarg;
@@ -1954,6 +1983,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	if (ret)
 		goto out_free_config;
 
+	/* Set chunk size if non-default.  */
+	if (chunk_size != UINT32_MAX) {
+		ret = wimlib_set_output_chunk_size(wim, chunk_size);
+		if (ret)
+			goto out_free_wim;
+	}
+
 #ifndef __WIN32__
 	/* Detect if source is regular file or block device and set NTFS volume
 	 * capture mode.  */
@@ -2479,6 +2515,8 @@ imagex_export(int argc, tchar **argv, int cmd)
 		ret = wimlib_create_new_wim(compression_type, &dest_wim);
 		if (ret)
 			goto out_free_src_wim;
+
+		wimlib_set_output_chunk_size(dest_wim, src_info.chunk_size);
 	}
 
 	image = wimlib_resolve_image(src_wim, src_image_num_or_name);
@@ -2738,6 +2776,8 @@ print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info)
 	tprintf(T("Image Count:    %d\n"), info->image_count);
 	tprintf(T("Compression:    %"TS"\n"),
 		wimlib_get_compression_type_string(info->compression_type));
+	tprintf(T("Chunk Size:     %"PRIu32" bytes\n"),
+		info->chunk_size);
 	tprintf(T("Part Number:    %d/%d\n"), info->part_number, info->total_parts);
 	tprintf(T("Boot Index:     %d\n"), info->boot_index);
 	tprintf(T("Size:           %"PRIu64" bytes\n"), info->total_bytes);
@@ -3240,6 +3280,8 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 	int c;
 	int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS;
 	int write_flags = WIMLIB_WRITE_FLAG_REBUILD;
+	int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
+	uint32_t chunk_size = UINT32_MAX;
 	int ret;
 	WIMStruct *wim;
 	const tchar *wimfile;
@@ -3256,11 +3298,26 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 		case IMAGEX_NOCHECK_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY;
 			break;
+		case IMAGEX_COMPRESS_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+			compression_type = get_compression_type(optarg);
+			if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
+				goto out_err;
+			break;
 		case IMAGEX_RECOMPRESS_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
 			break;
 		case IMAGEX_COMPRESS_SLOW_OPTION:
-			set_compress_slow();
+			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+			compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+			ret = set_compress_slow();
+			if (ret)
+				goto out_err;
+			break;
+		case IMAGEX_CHUNK_SIZE_OPTION:
+			chunk_size = parse_chunk_size(optarg);
+			if (chunk_size == UINT32_MAX)
+				goto out_err;
 			break;
 		case IMAGEX_THREADS_OPTION:
 			num_threads = parse_num_threads(optarg);
@@ -3289,6 +3346,20 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 	if (ret)
 		goto out;
 
+	if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) {
+		/* Change compression type.  */
+		ret = wimlib_set_output_compression_type(wim, compression_type);
+		if (ret)
+			goto out_wimlib_free;
+	}
+
+	if (chunk_size != UINT32_MAX) {
+		/* Change chunk size.  */
+		ret = wimlib_set_output_chunk_size(wim, chunk_size);
+		if (ret)
+			goto out_wimlib_free;
+	}
+
 	old_size = file_get_size(wimfile);
 	tprintf(T("\"%"TS"\" original size: "), wimfile);
 	if (old_size == -1)
@@ -3753,6 +3824,7 @@ T(
 [CMD_OPTIMIZE] =
 T(
 "    %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n"
+"                    [--recompress-slow] [--compress=TYPE]\n"
 "                    [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n"
 ),
 [CMD_SPLIT] =