IMAGEX_ALLOW_OTHER_OPTION,
IMAGEX_BOOT_OPTION,
IMAGEX_CHECK_OPTION,
+ IMAGEX_CHUNK_SIZE_OPTION,
IMAGEX_COMMAND_OPTION,
IMAGEX_COMMIT_OPTION,
IMAGEX_COMPRESS_OPTION,
+ IMAGEX_COMPRESS_SLOW_OPTION,
IMAGEX_CONFIG_OPTION,
IMAGEX_DEBUG_OPTION,
IMAGEX_DELTA_FROM_OPTION,
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,
IMAGEX_THREADS_OPTION,
IMAGEX_TO_STDOUT_OPTION,
IMAGEX_UNIX_DATA_OPTION,
+ IMAGEX_UPDATE_OF_OPTION,
IMAGEX_VERBOSE_OPTION,
IMAGEX_XML_OPTION,
};
{T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
{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("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},
{T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION},
{T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION},
{T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION},
+ {T("update-of"), required_argument, NULL, IMAGEX_UPDATE_OF_OPTION},
{T("delta-from"), required_argument, NULL, IMAGEX_DELTA_FROM_OPTION},
{NULL, 0, NULL, 0},
};
{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("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION},
+ {T("no-pack-streams"), no_argument, NULL, IMAGEX_NO_PACK_STREAMS_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},
if (image == WIMLIB_NO_IMAGE) {
imagex_error(T("\"%"TS"\" is not a valid image in \"%"TS"\"!\n"
" Please specify a 1-based image index or "
- "image name.\n"
- " You may use `%"TS"' to list the images "
- "contained in a WIM."),
- image_name, wim_name, get_cmd_string(CMD_INFO, false));
- return -1;
+ "image name. To list the images\n"
+ " contained in the WIM archive, run\n"
+ "\n"
+ " %"TS" \"%"TS"\"\n"),
+ image_name, wim_name,
+ get_cmd_string(CMD_INFO, false), wim_name);
+ return WIMLIB_ERR_INVALID_IMAGE;
}
return 0;
}
{
if (image == WIMLIB_ALL_IMAGES) {
imagex_error(T("Cannot specify all images for this action!"));
- return -1;
+ return WIMLIB_ERR_INVALID_IMAGE;
}
return 0;
}
return WIMLIB_COMPRESSION_TYPE_LZX;
else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress")))
return WIMLIB_COMPRESSION_TYPE_XPRESS;
+ else if (!tstrcasecmp(optarg, T("recovery")) || !tstrcasecmp(optarg, T("lzms")))
+ return WIMLIB_COMPRESSION_TYPE_LZMS;
else if (!tstrcasecmp(optarg, T("none")))
return WIMLIB_COMPRESSION_TYPE_NONE;
else {
}
}
-struct refglob_set {
- const tchar **globs;
- unsigned num_globs;
- unsigned num_alloc_globs;
+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,
+ .alg_params = {
+ .slow = {
+ .use_len2_matches = 1,
+ .num_fast_bytes = 96,
+ .num_optim_passes = 4,
+ .max_search_depth = 100,
+ .max_matches_per_pos = 10,
+ .main_nostat_cost = 15,
+ .len_nostat_cost = 15,
+ .aligned_nostat_cost = 7,
+ },
+ },
+ };
+ ret = wimlib_lzx_set_default_params(&slow_params);
+ if (ret)
+ imagex_error(T("Couldn't set slow compression parameters.!"));
+ return ret;
+}
+
+struct string_set {
+ const tchar **strings;
+ unsigned num_strings;
+ unsigned num_alloc_strings;
};
-#define REFGLOB_SET_INITIALIZER \
- { .globs = NULL, .num_globs = 0, .num_alloc_globs = 0, }
+#define STRING_SET_INITIALIZER \
+ { .strings = NULL, .num_strings = 0, .num_alloc_strings = 0, }
-#define REFGLOB_SET(_refglobs) \
- struct refglob_set _refglobs = REFGLOB_SET_INITIALIZER
+#define STRING_SET(_strings) \
+ struct string_set _strings = STRING_SET_INITIALIZER
static int
-refglob_set_append(struct refglob_set *set, const tchar *glob)
+string_set_append(struct string_set *set, const tchar *glob)
{
- unsigned num_alloc_globs = set->num_alloc_globs;
+ unsigned num_alloc_strings = set->num_alloc_strings;
- if (set->num_globs == num_alloc_globs) {
- const tchar **new_globs;
+ if (set->num_strings == num_alloc_strings) {
+ const tchar **new_strings;
- num_alloc_globs += 4;
- new_globs = realloc(set->globs, sizeof(set->globs[0]) * num_alloc_globs);
- if (!new_globs) {
+ num_alloc_strings += 4;
+ new_strings = realloc(set->strings,
+ sizeof(set->strings[0]) * num_alloc_strings);
+ if (!new_strings) {
imagex_error(T("Out of memory!"));
return -1;
}
- set->globs = new_globs;
- set->num_alloc_globs = num_alloc_globs;
+ set->strings = new_strings;
+ set->num_alloc_strings = num_alloc_strings;
}
- set->globs[set->num_globs++] = glob;
+ set->strings[set->num_strings++] = glob;
return 0;
}
+static void
+string_set_destroy(struct string_set *set)
+{
+ free(set->strings);
+}
+
static int
-wim_reference_globs(WIMStruct *wim, struct refglob_set *set, int open_flags)
+wim_reference_globs(WIMStruct *wim, struct string_set *set, int open_flags)
{
- return wimlib_reference_resource_files(wim, set->globs, set->num_globs,
+ return wimlib_reference_resource_files(wim, set->strings,
+ set->num_strings,
WIMLIB_REF_FLAG_GLOB_ENABLE,
open_flags,
imagex_progress_func);
}
-static void
-refglob_set_destroy(struct refglob_set *set)
-{
- free(set->globs);
-}
-
static void
do_resource_not_found_warning(const tchar *wimfile,
const struct wimlib_wim_info *info,
- const struct refglob_set *refglobs)
+ const struct string_set *refglobs)
{
if (info->total_parts > 1) {
- if (refglobs->num_globs == 0) {
+ if (refglobs->num_strings == 0) {
imagex_error(T("\"%"TS"\" is part of a split WIM. "
"Use --ref to specify the other parts."),
wimfile);
}
} else {
imagex_error(T("If this is a delta WIM, use the --ref argument "
- "to specify the WIM on which it is based."));
+ "to specify the WIM(s) on which it is based."));
}
}
size_t num_wchars;
if (num_bytes >= 2 &&
- ((text[0] == 0xff && text[1] == 0xfe) ||
- (text[0] <= 0x7f && text[1] == 0x00)))
+ (((unsigned char)text[0] == 0xff && (unsigned char)text[1] == 0xfe) ||
+ ((unsigned char)text[0] <= 0x7f && (unsigned char)text[1] == 0x00)))
{
/* File begins with 0xfeff, the BOM for UTF-16LE, or it begins
* with something that looks like an ASCII character encoded as
#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
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) {
case WIMLIB_UPDATE_OP_DELETE:
imagex_printf(T("Deleted WIM path "
"\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"),
- info->update.command->delete.wim_path);
+ info->update.command->delete_.wim_path);
break;
case WIMLIB_UPDATE_OP_RENAME:
imagex_printf(T("Renamed WIM path "
}
}
+static uint32_t parse_chunk_size(const tchar *optarg)
+{
+ 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;
+ } else {
+ return chunk_size;
+ }
+}
+
+
/*
* Parse an option passed to an update command.
*
break;
case WIMLIB_UPDATE_OP_DELETE:
if (!tstrcmp(option, T("--force")))
- cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_FORCE;
+ cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_FORCE;
else if (!tstrcmp(option, T("--recursive")))
- cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE;
+ cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE;
else
recognized = false;
break;
cmd->add.wim_target_path = (tchar*)nonoption;
break;
case WIMLIB_UPDATE_OP_DELETE:
- cmd->delete.wim_path = (tchar*)nonoption;
+ cmd->delete_.wim_path = (tchar*)nonoption;
break;
case WIMLIB_UPDATE_OP_RENAME:
if (num_nonoptions == 0)
imagex_apply(int argc, tchar **argv, int cmd)
{
int c;
- int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
- int image;
+ int open_flags = 0;
+ int image = WIMLIB_NO_IMAGE;
WIMStruct *wim;
struct wimlib_wim_info info;
int ret;
const tchar *wimfile;
const tchar *target;
- const tchar *image_num_or_name;
+ const tchar *image_num_or_name = NULL;
int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL;
- REFGLOB_SET(refglobs);
+ STRING_SET(refglobs);
for_opt(c, apply_options) {
switch (c) {
extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE;
break;
case IMAGEX_REF_OPTION:
- ret = refglob_set_append(&refglobs, optarg);
+ ret = string_set_append(&refglobs, optarg);
if (ret)
goto out_free_refglobs;
break;
}
}
- if (refglobs.num_globs) {
+ if (refglobs.num_strings) {
if (wim == NULL) {
imagex_error(T("Can't specify --ref when applying from stdin!"));
ret = -1;
out_wimlib_free:
wimlib_free(wim);
out_free_refglobs:
- refglob_set_destroy(&refglobs);
+ string_set_destroy(&refglobs);
return ret;
out_usage:
int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE |
WIMLIB_ADD_IMAGE_FLAG_WINCONFIG;
int write_flags = 0;
- int compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+ int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
+ uint32_t chunk_size = UINT32_MAX;
const tchar *wimfile;
int wim_fd;
const tchar *name;
const tchar *desc;
const tchar *flags_element = NULL;
- const tchar *template_image_name_or_num = NULL;
- int template_image;
+
WIMStruct *wim;
+ STRING_SET(base_wimfiles);
+ WIMStruct **base_wims;
+
+ WIMStruct *template_wim;
+ const tchar *template_wimfile = NULL;
+ const tchar *template_image_name_or_num = NULL;
+ int template_image = WIMLIB_NO_IMAGE;
+
int ret;
unsigned num_threads = 0;
struct wimlib_capture_config *config;
bool source_list = false;
- size_t source_list_nchars;
+ size_t source_list_nchars = 0;
tchar *source_list_contents;
bool capture_sources_malloced;
struct wimlib_capture_source *capture_sources;
if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
goto out_err;
break;
+ case IMAGEX_COMPRESS_SLOW_OPTION:
+ 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_PACK_STREAMS_OPTION:
+ write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
+ break;
case IMAGEX_FLAGS_OPTION:
flags_element = optarg;
break;
case IMAGEX_NOT_PIPABLE_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE;
break;
+ case IMAGEX_UPDATE_OF_OPTION:
+ if (template_image_name_or_num) {
+ imagex_error(T("'--update-of' can only be "
+ "specified one time!"));
+ goto out_err;
+ } else {
+ tchar *colon;
+ colon = tstrrchr(optarg, T(':'));
+
+ if (colon) {
+ template_wimfile = optarg;
+ *colon = T('\0');
+ template_image_name_or_num = colon + 1;
+ } else {
+ template_wimfile = NULL;
+ template_image_name_or_num = optarg;
+ }
+ }
+ break;
case IMAGEX_DELTA_FROM_OPTION:
- if (cmd == CMD_CAPTURE) {
- imagex_error(T("--delta-from=IMAGE is only "
- "valid for append."));
+ if (cmd != CMD_CAPTURE) {
+ imagex_error(T("'--delta-from' is only "
+ "valid for capture!"));
goto out_usage;
}
- template_image_name_or_num = optarg;
+ ret = string_set_append(&base_wimfiles, optarg);
+ if (ret)
+ goto out_free_base_wimfiles;
+ write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS;
break;
default:
goto out_usage;
source = argv[0];
wimfile = argv[1];
+ /* Set default compression type. */
+ if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) {
+ struct wimlib_lzx_params params;
+ memset(¶ms, 0, sizeof(params));
+ params.size_of_this = sizeof(params);
+ params.algorithm = WIMLIB_LZX_ALGORITHM_FAST;
+ params.use_defaults = 1;
+
+ wimlib_lzx_set_default_params(¶ms);
+ compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+ }
+
if (!tstrcmp(wimfile, T("-"))) {
/* Writing captured WIM to standard output. */
#if 0
set_fd_to_binary_mode(wim_fd);
}
+ /* If template image was specified using --update-of=IMAGE rather
+ * than --update-of=WIMFILE:IMAGE, set the default WIMFILE. */
+ if (template_image_name_or_num && !template_wimfile) {
+ if (base_wimfiles.num_strings == 1) {
+ /* Capturing delta WIM based on single WIM: default to
+ * base WIM. */
+ template_wimfile = base_wimfiles.strings[0];
+ } else if (cmd == CMD_APPEND) {
+ /* Appending to WIM: default to WIM being appended to.
+ */
+ template_wimfile = wimfile;
+ } else {
+ /* Capturing a normal (non-delta) WIM, so the WIM file
+ * *must* be explicitly specified. */
+ if (base_wimfiles.num_strings > 1) {
+ imagex_error(T("For capture of delta WIM "
+ "based on multiple existing "
+ "WIMs,\n"
+ " '--update-of' must "
+ "specify WIMFILE:IMAGE!"));
+ } else {
+ imagex_error(T("For capture of non-delta WIM, "
+ "'--update-of' must specify "
+ "WIMFILE:IMAGE!"));
+ }
+ goto out_usage;
+ }
+ }
+
if (argc >= 3) {
name = argv[2];
name_defaulted = false;
}
capture_sources_malloced = true;
} else {
- /* Set up capture source in non-source-list mode (could be
- * either "normal" mode or "NTFS mode"--- see the man page). */
+ /* Set up capture source in non-source-list mode. */
capture_sources = alloca(sizeof(struct wimlib_capture_source));
capture_sources[0].fs_source_path = source;
capture_sources[0].wim_target_path = NULL;
}
if (config_file) {
+ /* Read and parse capture configuration file. */
size_t config_len;
config_str = file_get_text_contents(config_file, &config_len);
if (ret)
goto out_free_config;
} else {
+ /* No capture configuration file specified; use default
+ * configuration for capturing Windows operating systems. */
config = NULL;
+ add_image_flags |= WIMLIB_ADD_FLAG_WINCONFIG;
}
+ /* Open the existing WIM, or create a new one. */
if (cmd == CMD_APPEND)
ret = wimlib_open_wim(wimfile, open_flags, &wim,
imagex_progress_func);
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. */
if (!source_list) {
struct stat stbuf;
imagex_error_with_errno(T("Failed to stat "
"\"%"TS"\""), source);
ret = -1;
- goto out_wimlib_free;
+ goto out_free_wim;
}
}
}
#endif
+ /* If the user did not specify an image name, and the basename of the
+ * source already exists as an image name in the WIM file, append a
+ * suffix to make it unique. */
if (cmd == CMD_APPEND && name_defaulted) {
- /* If the user did not specify an image name, and the basename
- * of the source already exists as an image name in the WIM
- * file, append a suffix to make it unique. */
unsigned long conflict_idx;
tchar *name_end = tstrchr(name, T('\0'));
for (conflict_idx = 1;
}
}
+ /* If capturing a delta WIM, reference resources from the base WIMs
+ * before adding the new image. */
+ if (base_wimfiles.num_strings) {
+ base_wims = calloc(base_wimfiles.num_strings,
+ sizeof(base_wims[0]));
+ if (base_wims == NULL) {
+ imagex_error(T("Out of memory!"));
+ ret = -1;
+ goto out_free_wim;
+ }
+
+ for (size_t i = 0; i < base_wimfiles.num_strings; i++) {
+ ret = wimlib_open_wim(base_wimfiles.strings[i],
+ open_flags, &base_wims[i],
+ imagex_progress_func);
+ if (ret)
+ goto out_free_base_wims;
+
+ }
+
+ ret = wimlib_reference_resources(wim, base_wims,
+ base_wimfiles.num_strings, 0);
+ if (ret)
+ goto out_free_base_wims;
+
+ if (base_wimfiles.num_strings == 1) {
+ imagex_printf(T("Capturing delta WIM based on \"%"TS"\"\n"),
+ base_wimfiles.strings[0]);
+ } else {
+ imagex_printf(T("Capturing delta WIM based on %u WIMs\n"),
+ base_wimfiles.num_strings);
+ }
+
+ } else {
+ base_wims = NULL;
+ }
+
+ /* If capturing or appending as an update of an existing (template) image,
+ * open the WIM if needed and parse the image index. */
if (template_image_name_or_num) {
- template_image = wimlib_resolve_image(wim, template_image_name_or_num);
+
+
+ if (base_wimfiles.num_strings == 1 &&
+ template_wimfile == base_wimfiles.strings[0]) {
+ template_wim = base_wims[0];
+ } else if (template_wimfile == wimfile) {
+ template_wim = wim;
+ } else {
+ ret = wimlib_open_wim(template_wimfile, open_flags,
+ &template_wim, imagex_progress_func);
+ if (ret)
+ goto out_free_base_wims;
+ }
+
+ template_image = wimlib_resolve_image(template_wim,
+ template_image_name_or_num);
+
if (template_image_name_or_num[0] == T('-')) {
tchar *tmp;
unsigned long n;
struct wimlib_wim_info info;
- wimlib_get_wim_info(wim, &info);
+ wimlib_get_wim_info(template_wim, &info);
n = tstrtoul(template_image_name_or_num + 1, &tmp, 10);
if (n >= 1 && n <= info.image_count &&
*tmp == T('\0') &&
}
ret = verify_image_exists_and_is_single(template_image,
template_image_name_or_num,
- wimfile);
+ template_wimfile);
if (ret)
- goto out_wimlib_free;
+ goto out_free_template_wim;
+ } else {
+ template_wim = NULL;
}
ret = wimlib_add_image_multisource(wim,
add_image_flags,
imagex_progress_func);
if (ret)
- goto out_wimlib_free;
+ goto out_free_template_wim;
if (desc || flags_element || template_image_name_or_num) {
/* User provided <DESCRIPTION> or <FLAGS> element, or an image
* on which the added one is to be based has been specified with
- * --delta-from=IMAGE. Get the index of the image we just
+ * --update-of. Get the index of the image we just
* added, then use it to call the appropriate functions. */
struct wimlib_wim_info info;
info.image_count,
desc);
if (ret)
- goto out_wimlib_free;
+ goto out_free_template_wim;
}
if (flags_element) {
ret = wimlib_set_image_flags(wim, info.image_count,
flags_element);
if (ret)
- goto out_wimlib_free;
+ goto out_free_template_wim;
}
+ /* Reference template image if the user provided one. */
if (template_image_name_or_num) {
+ imagex_printf(T("Using image %d "
+ "from \"%"TS"\" as template\n"),
+ template_image, template_wimfile);
ret = wimlib_reference_template_image(wim,
info.image_count,
+ template_wim,
template_image,
0, NULL);
if (ret)
- goto out_wimlib_free;
+ goto out_free_template_wim;
}
}
write_flags, num_threads,
imagex_progress_func);
}
-out_wimlib_free:
+out_free_template_wim:
+ /* template_wim may alias base_wims[0] or wim. */
+ if ((base_wimfiles.num_strings != 1 || template_wim != base_wims[0]) &&
+ template_wim != wim)
+ wimlib_free(template_wim);
+out_free_base_wims:
+ for (size_t i = 0; i < base_wimfiles.num_strings; i++)
+ wimlib_free(base_wims[i]);
+ free(base_wims);
+out_free_wim:
wimlib_free(wim);
out_free_config:
if (config) {
free(capture_sources);
out_free_source_list_contents:
free(source_list_contents);
-out:
+out_free_base_wimfiles:
+ string_set_destroy(&base_wimfiles);
return ret;
out_usage:
usage(cmd, stderr);
out_err:
ret = -1;
- goto out;
+ goto out_free_base_wimfiles;
}
/* Remove image(s) from a WIM. */
}
wimfile = argv[0];
- ret = wimlib_open_wim(wimfile, WIMLIB_OPEN_FLAG_SPLIT_OK, &wim,
- imagex_progress_func);
+ ret = wimlib_open_wim(wimfile, 0, &wim, imagex_progress_func);
if (ret)
goto out;
int image;
struct stat stbuf;
bool wim_is_new;
- REFGLOB_SET(refglobs);
+ STRING_SET(refglobs);
unsigned num_threads = 0;
for_opt(c, export_options) {
goto out_err;
break;
case IMAGEX_REF_OPTION:
- ret = refglob_set_append(&refglobs, optarg);
+ ret = string_set_append(&refglobs, optarg);
if (ret)
goto out_free_refglobs;
break;
dest_wimfile = argv[2];
dest_name = (argc >= 4) ? argv[3] : NULL;
dest_desc = (argc >= 5) ? argv[4] : NULL;
- ret = wimlib_open_wim(src_wimfile,
- open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK, &src_wim,
+ ret = wimlib_open_wim(src_wimfile, open_flags, &src_wim,
imagex_progress_func);
if (ret)
goto out_free_refglobs;
ret = -1;
goto out_free_src_wim;
}
- ret = wimlib_open_wim(dest_wimfile, open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS,
+ ret = wimlib_open_wim(dest_wimfile,
+ open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS,
&dest_wim, imagex_progress_func);
if (ret)
goto out_free_src_wim;
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);
if (ret)
goto out_free_dest_wim;
- if (refglobs.num_globs) {
+ if (refglobs.num_strings) {
ret = wim_reference_globs(src_wim, &refglobs, open_flags);
if (ret)
goto out_free_dest_wim;
out_free_src_wim:
wimlib_free(src_wim);
out_free_refglobs:
- refglob_set_destroy(&refglobs);
+ string_set_destroy(&refglobs);
return ret;
out_usage:
imagex_extract(int argc, tchar **argv, int cmd)
{
int c;
- int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
+ int open_flags = 0;
int image;
WIMStruct *wim;
int ret;
tchar *dest_dir = T(".");
int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_NORPFIX;
- REFGLOB_SET(refglobs);
+ STRING_SET(refglobs);
struct wimlib_extract_command *cmds;
size_t num_cmds;
extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE;
break;
case IMAGEX_REF_OPTION:
- ret = refglob_set_append(&refglobs, optarg);
+ ret = string_set_append(&refglobs, optarg);
if (ret)
goto out_free_refglobs;
break;
if (ret)
goto out_wimlib_free;
- if (refglobs.num_globs) {
+ if (refglobs.num_strings) {
ret = wim_reference_globs(wim, &refglobs, open_flags);
if (ret)
goto out_wimlib_free;
out_free_cmds:
free_extract_commands(cmds, num_cmds, dest_dir);
out_free_refglobs:
- refglob_set_destroy(&refglobs);
+ string_set_destroy(&refglobs);
return ret;
out_usage:
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));
+ 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);
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)
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;
WIMStruct *wim;
int image;
int ret;
- int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
+ int open_flags = 0;
struct wimlib_wim_info info;
for_opt(c, info_options) {
image = wimlib_resolve_image(wim, image_num_or_name);
ret = WIMLIB_ERR_INVALID_IMAGE;
if (image == WIMLIB_NO_IMAGE && tstrcmp(image_num_or_name, T("0"))) {
- imagex_error(T("The image \"%"TS"\" does not exist in \"%"TS"\""),
- image_num_or_name, wimfile);
+ verify_image_exists(image, image_num_or_name, wimfile);
if (boot) {
imagex_error(T("If you would like to set the boot "
"index to 0, specify image \"0\" with "
imagex_join(int argc, tchar **argv, int cmd)
{
int c;
- int swm_open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
+ int swm_open_flags = 0;
int wim_write_flags = 0;
const tchar *output_path;
int ret;
{
int c;
int mount_flags = 0;
- int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
+ int open_flags = 0;
const tchar *staging_dir = NULL;
const tchar *wimfile;
const tchar *dir;
int image;
int ret;
- REFGLOB_SET(refglobs);
+ STRING_SET(refglobs);
if (cmd == CMD_MOUNTRW) {
mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE;
}
break;
case IMAGEX_REF_OPTION:
- ret = refglob_set_append(&refglobs, optarg);
+ ret = string_set_append(&refglobs, optarg);
if (ret)
goto out_free_refglobs;
break;
dir = argv[1];
}
- if (refglobs.num_globs) {
+ if (refglobs.num_strings) {
ret = wim_reference_globs(wim, &refglobs, open_flags);
if (ret)
goto out_free_wim;
out_free_wim:
wimlib_free(wim);
out_free_refglobs:
- refglob_set_destroy(&refglobs);
+ string_set_destroy(&refglobs);
return ret;
out_usage:
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;
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:
+ 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_PACK_STREAMS_OPTION:
+ write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
+ write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+ break;
+ case IMAGEX_NO_PACK_STREAMS_OPTION:
+ write_flags |= WIMLIB_WRITE_FLAG_NO_PACK_STREAMS;
+ break;
case IMAGEX_THREADS_OPTION:
num_threads = parse_num_threads(optarg);
if (num_threads == UINT_MAX)
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)
int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS;
int write_flags = 0;
int update_flags = WIMLIB_UPDATE_FLAG_SEND_PROGRESS;
- int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE |
- WIMLIB_ADD_FLAG_WINCONFIG;
+ int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE;
int default_delete_flags = 0;
unsigned num_threads = 0;
int c;
goto out_free_config;
} else {
config = NULL;
+ default_add_flags |= WIMLIB_ADD_FLAG_WINCONFIG;
}
/* Read update commands from standard input, or the command string if
cmds[i].add.config = config;
break;
case WIMLIB_UPDATE_OP_DELETE:
- cmds[i].delete.delete_flags |= default_delete_flags;
+ cmds[i].delete_.delete_flags |= default_delete_flags;
break;
default:
break;
[CMD_APPEND] =
T(
" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n"
-" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n"
-" [--nocheck] [--flags EDITION_ID] [--verbose]\n"
+" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n"
+" [--check] [--nocheck] [--flags EDITION_ID] [--verbose]\n"
" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n"
-" [--rebuild] [--unix-data] [--source-list] [--no-acls]\n"
-" [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n"
-" [--not-pipable] [--delta-from=IMAGE]\n"
+" [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n"
+" [--norpfix] [--unix-data] [--pipable]\n"
+" [--update-of=[WIMFILE:]IMAGE]\n"
),
[CMD_APPLY] =
T(
[CMD_CAPTURE] =
T(
" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n"
-" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n"
-" [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n"
-" [--verbose] [--dereference] [--config=FILE]\n"
-" [--threads=NUM_THREADS] [--unix-data] [--source-list]\n"
-" [--no-acls] [--strict-acls] [--norpfix] [--pipable]\n"
+" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n"
+" [--check] [--nocheck] [--compress=TYPE]\n"
+" [--flags EDITION_ID] [--verbose] [--dereference]\n"
+" [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n"
+" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n"
+" [--unix-data] [--pipable] [--update-of=[WIMFILE:]IMAGE]\n"
+" [--delta-from=WIMFILE]\n"
),
[CMD_DELETE] =
T(
[CMD_OPTIMIZE] =
T(
" %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n"
+" [--recompress-slow] [--compress=TYPE]\n"
" [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n"
),
[CMD_SPLIT] =
git://wimlib.net / wimlib / blobdiff