#ifdef __WIN32__
# include "imagex-win32.h"
-# define OS_PREFERRED_PATH_SEPARATOR L'\\'
-# define OS_PREFERRED_PATH_SEPARATOR_STRING L"\\"
# define print_security_descriptor win32_print_security_descriptor
#else /* __WIN32__ */
# include <getopt.h>
# include <langinfo.h>
-# define OS_PREFERRED_PATH_SEPARATOR '/'
-# define OS_PREFERRED_PATH_SEPARATOR_STRING "/"
# define print_security_descriptor default_print_security_descriptor
static inline void set_fd_to_binary_mode(int fd)
{
IMAGEX_NOT_PIPABLE_OPTION,
IMAGEX_NO_ACLS_OPTION,
IMAGEX_NO_ATTRIBUTES_OPTION,
+ IMAGEX_NO_REPLACE_OPTION,
IMAGEX_NO_WILDCARDS_OPTION,
IMAGEX_NULLGLOB_OPTION,
IMAGEX_ONE_FILE_ONLY_OPTION,
IMAGEX_PACK_CHUNK_SIZE_OPTION,
+ IMAGEX_PACK_COMPRESS_OPTION,
IMAGEX_PACK_STREAMS_OPTION,
IMAGEX_PATH_OPTION,
IMAGEX_PIPABLE_OPTION,
IMAGEX_UPDATE_OF_OPTION,
IMAGEX_VERBOSE_OPTION,
IMAGEX_WIMBOOT_OPTION,
+ IMAGEX_WIMBOOT_CONFIG_OPTION,
IMAGEX_XML_OPTION,
};
{T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
{T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION},
{T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION},
+ {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION},
+ {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION},
{T("pack-streams"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION},
{T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION},
{T("config"), required_argument, NULL, IMAGEX_CONFIG_OPTION},
{T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
{T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION},
{T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION},
+ {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION},
+ {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION},
{T("ref"), required_argument, NULL, IMAGEX_REF_OPTION},
{T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION},
{T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION},
{T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
{T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION},
{T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION},
+ {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION},
+ {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION},
{T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION},
{T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION},
{T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION},
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
{T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION},
{T("command"), required_argument, NULL, IMAGEX_COMMAND_OPTION},
+ {T("wimboot-config"), required_argument, NULL, IMAGEX_WIMBOOT_CONFIG_OPTION},
/* Default delete options */
{T("force"), no_argument, NULL, IMAGEX_FORCE_OPTION},
{T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION},
{T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION},
{T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION},
+ {T("no-replace"), no_argument, NULL, IMAGEX_NO_REPLACE_OPTION},
{NULL, 0, NULL, 0},
};
va_end(va);
}
-static void _format_attribute(printf, 1, 2)
-imagex_warning(const tchar *format, ...)
-{
- va_list va;
- va_start(va, format);
- tfputs(T("WARNING: "), stderr);
- tvfprintf(stderr, format, va);
- tputc(T('\n'), stderr);
- va_end(va);
-}
-
/* Print formatted error message to stderr. */
static void _format_attribute(printf, 1, 2)
imagex_error_with_errno(const tchar *format, ...)
static int
get_compression_type(const tchar *optarg)
{
- if (!tstrcasecmp(optarg, T("maximum")) || !tstrcasecmp(optarg, T("lzx")))
+ if (!tstrcasecmp(optarg, T("maximum")) ||
+ !tstrcasecmp(optarg, T("lzx")) ||
+ !tstrcasecmp(optarg, T("max")))
return WIMLIB_COMPRESSION_TYPE_LZX;
else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress")))
return WIMLIB_COMPRESSION_TYPE_XPRESS;
return sources;
}
-
-enum capture_config_section {
- CAPTURE_CONFIG_NO_SECTION,
- CAPTURE_CONFIG_EXCLUSION_SECTION,
- CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION,
- CAPTURE_CONFIG_IGNORE_SECTION,
-};
-
-enum {
- CAPTURE_CONFIG_INVALID_SECTION,
- CAPTURE_CONFIG_CHANGED_SECTION,
- CAPTURE_CONFIG_SAME_SECTION,
-};
-
-static int
-check_config_section(tchar *line, size_t len,
- enum capture_config_section *cur_section)
-{
- while (istspace(*line))
- line++;
-
- if (*line != T('['))
- return CAPTURE_CONFIG_SAME_SECTION;
-
- line++;
- tchar *endbrace = tstrrchr(line, T(']'));
- if (!endbrace)
- return CAPTURE_CONFIG_SAME_SECTION;
-
- if (!tmemcmp(line, T("ExclusionList"), endbrace - line)) {
- *cur_section = CAPTURE_CONFIG_EXCLUSION_SECTION;
- } else if (!tmemcmp(line, T("ExclusionException"), endbrace - line)) {
- *cur_section = CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION;
- } else if (!tmemcmp(line, T("CompressionExclusionList"), endbrace - line)) {
- *cur_section = CAPTURE_CONFIG_IGNORE_SECTION;
- tfputs(T("WARNING: Ignoring [CompressionExclusionList] section "
- "of capture config file\n"),
- stderr);
- } else if (!tmemcmp(line, T("AlignmentList"), endbrace - line)) {
- *cur_section = CAPTURE_CONFIG_IGNORE_SECTION;
- tfputs(T("WARNING: Ignoring [AlignmentList] section "
- "of capture config file\n"),
- stderr);
- } else {
- imagex_warning(T("Unknown capture config file section \"%"TS"\""),
- line - 1);
- return CAPTURE_CONFIG_INVALID_SECTION;
- }
- return CAPTURE_CONFIG_CHANGED_SECTION;
-}
-
-
-static bool
-pattern_list_add_pattern(struct wimlib_pattern_list *pat_list,
- tchar *pat)
-{
- if (pat_list->num_pats == pat_list->num_allocated_pats) {
- tchar **pats;
- size_t num_allocated_pats = pat_list->num_pats + 8;
-
- pats = realloc(pat_list->pats,
- num_allocated_pats * sizeof(pat_list->pats[0]));
- if (!pats) {
- imagex_error(T("Out of memory!"));
- return false;
- }
- pat_list->pats = pats;
- pat_list->num_allocated_pats = num_allocated_pats;
- }
- pat_list->pats[pat_list->num_pats++] = pat;
- return true;
-}
-
-static bool
-parse_capture_config_line(tchar *line, size_t len,
- enum capture_config_section *cur_section,
- struct wimlib_capture_config *config)
-{
- tchar *filename;
- int ret;
-
- ret = check_config_section(line, len, cur_section);
- if (ret == CAPTURE_CONFIG_CHANGED_SECTION ||
- ret == CAPTURE_CONFIG_INVALID_SECTION)
- return true;
-
- switch (*cur_section) {
- case CAPTURE_CONFIG_NO_SECTION:
- imagex_error(T("Line \"%"TS"\" is not in a section "
- "(such as [ExclusionList]"), line);
- return false;
- case CAPTURE_CONFIG_EXCLUSION_SECTION:
- if (parse_string(&line, &len, &filename) != PARSE_STRING_SUCCESS)
- return false;
- return pattern_list_add_pattern(&config->exclusion_pats,
- filename);
- case CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION:
- if (parse_string(&line, &len, &filename) != PARSE_STRING_SUCCESS)
- return false;
- return pattern_list_add_pattern(&config->exclusion_exception_pats,
- filename);
- case CAPTURE_CONFIG_IGNORE_SECTION:
- return true;
- }
- return false;
-}
-
-static int
-parse_capture_config(tchar **contents_p, size_t nchars,
- struct wimlib_capture_config *config)
-{
- ssize_t nlines;
- tchar *p;
- size_t i;
- enum capture_config_section cur_section;
-
- memset(config, 0, sizeof(*config));
-
- nlines = text_file_count_lines(contents_p, &nchars);
- if (nlines < 0)
- return -1;
-
- cur_section = CAPTURE_CONFIG_NO_SECTION;
- p = *contents_p;
- for (i = 0; i < nlines; i++) {
- tchar *endp = tmemchr(p, T('\n'), nchars);
- size_t len = endp - p + 1;
- *endp = T('\0');
- if (p != endp && *(endp - 1) == T('\r')) {
- *(endp - 1) = '\0';
- len--;
- }
- if (!is_comment_line(p, len))
- if (!parse_capture_config_line(p, len, &cur_section, config))
- return -1;
- p = endp + 1;
-
- }
- return 0;
-}
-
/* Reads the contents of a file into memory. */
static char *
file_get_contents(const tchar *filename, size_t *len_ret)
percent_done = TO_PERCENT(info->write_streams.completed_bytes,
info->write_streams.total_bytes);
- if (info->write_streams.total_parts <= 1) {
- imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) "
- "written (%u%% done)"),
- info->write_streams.completed_bytes >> unit_shift,
- unit_name,
- info->write_streams.total_bytes >> unit_shift,
- unit_name,
- percent_done);
- } else {
- imagex_printf(T("\rWriting resources from part %u of %u: "
- "%"PRIu64 " %"TS" of %"PRIu64" %"TS" (%u%%) written"),
- (info->write_streams.completed_parts ==
- info->write_streams.total_parts) ?
- info->write_streams.completed_parts :
- info->write_streams.completed_parts + 1,
- info->write_streams.total_parts,
- info->write_streams.completed_bytes >> unit_shift,
- unit_name,
- info->write_streams.total_bytes >> unit_shift,
- unit_name,
- percent_done);
- }
+ imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) "
+ "written (%u%% done)"),
+ info->write_streams.completed_bytes >> unit_shift,
+ unit_name,
+ info->write_streams.total_bytes >> unit_shift,
+ unit_name,
+ percent_done);
if (info->write_streams.completed_bytes >= info->write_streams.total_bytes)
imagex_printf(T("\n"));
break;
case WIMLIB_PROGRESS_MSG_SCAN_BEGIN:
imagex_printf(T("Scanning \"%"TS"\""), info->scan.source);
- if (*info->scan.wim_target_path) {
- imagex_printf(T(" (loading as WIM path: "
- "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\")...\n"),
- info->scan.wim_target_path);
- } else {
+ if (WIMLIB_IS_WIM_ROOT_PATH(info->scan.wim_target_path)) {
imagex_printf(T("\n"));
+ } else {
+ imagex_printf(T(" (loading as WIM path: \"%"TS"\")...\n"),
+ info->scan.wim_target_path);
}
memset(&last_scan_progress, 0, sizeof(last_scan_progress));
break;
T("NTFS volume") : T("directory")),
info->extract.target);
break;
- case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN:
- if (info->extract.extract_root_wim_source_path[0]) {
- imagex_printf(T("Extracting \"%"TS"\" from image %d "
- "(\"%"TS"\") in \"%"TS"\" to \"%"TS"\"\n"),
- info->extract.extract_root_wim_source_path,
- info->extract.image,
- info->extract.image_name,
- info->extract.wimfile_name,
- info->extract.target);
- }
- break;
case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS:
percent_done = TO_PERCENT(info->extract.completed_bytes,
info->extract.total_bytes);
}
break;
case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS:
- if (info->extract.extract_root_wim_source_path[0] == T('\0'))
- imagex_printf(T("Setting timestamps on all extracted files...\n"));
+ imagex_printf(T("Setting timestamps on all extracted files...\n"));
break;
case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END:
if (info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
case WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND:
switch (info->update.command->op) {
case WIMLIB_UPDATE_OP_DELETE:
- imagex_printf(T("Deleted WIM path "
- "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"),
+ imagex_printf(T("Deleted WIM path \"%"TS"\"\n"),
info->update.command->delete_.wim_path);
break;
case WIMLIB_UPDATE_OP_RENAME:
- imagex_printf(T("Renamed WIM path "
- "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\" => "
- "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"),
+ imagex_printf(T("Renamed WIM path \"%"TS"\" => \"%"TS"\"\n"),
info->update.command->rename.wim_source_path,
info->update.command->rename.wim_target_path);
break;
break;
}
break;
+ case WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM:
+ imagex_printf(T("Updating \"%"TS"\" in WIM image\n"),
+ info->replace.path_in_wim);
+ break;
+ case WIMLIB_PROGRESS_MSG_WIMBOOT_EXCLUDE:
+ imagex_printf(T("\nExtracting \"%"TS"\" as normal file (not WIMBoot pointer)\n"),
+ info->wimboot_exclude.path_in_wim);
+ break;
default:
break;
}
cmd->add.add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS;
else if (!tstrcmp(option, T("--dereference")))
cmd->add.add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE;
+ else if (!tstrcmp(option, T("--no-replace")))
+ cmd->add.add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE;
else
recognized = false;
break;
return cmds;
}
-/* Apply one image, or all images, from a WIM file into a directory, OR apply
+/* Apply one image, or all images, from a WIM file to a directory, OR apply
* one image from a WIM file to a NTFS volume. */
static int
imagex_apply(int argc, tchar **argv, int cmd)
int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
uint32_t chunk_size = UINT32_MAX;
uint32_t pack_chunk_size = UINT32_MAX;
+ int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID;
const tchar *wimfile;
int wim_fd;
const tchar *name;
tchar *source_copy;
tchar *config_file = NULL;
- tchar *config_str;
- struct wimlib_capture_config *config;
bool source_list = false;
size_t source_list_nchars = 0;
if (pack_chunk_size == UINT32_MAX)
goto out_err;
break;
+ case IMAGEX_PACK_COMPRESS_OPTION:
+ pack_ctype = get_compression_type(optarg);
+ if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID)
+ goto out_err;
+ break;
case IMAGEX_PACK_STREAMS_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
break;
if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) {
+ /* No compression type specified. Use the default. */
+
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) {
+ /* With --wimboot, default to XPRESS compression. */
compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
+ } else if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS) {
+ /* With --pack-streams or --solid, default to LZMS
+ * compression. (However, this will not affect packed
+ * resources!) */
+ compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
} else {
+ /* Otherwise, default to LZX compression in fast mode.
+ */
compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
- if (!compress_slow) {
+ if (!compress_slow && pack_ctype != WIMLIB_COMPRESSION_TYPE_LZX) {
struct wimlib_lzx_compressor_params params = {
.hdr.size = sizeof(params),
.algorithm = WIMLIB_LZX_ALGORITHM_FAST,
¶ms.hdr);
}
}
-
}
if (compress_slow)
set_compress_slow();
- /* Set default configuration file */
-#ifdef __WIN32__
- if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) && !config) {
- struct stat st;
-
- config_file = alloca(wcslen(source) * sizeof(wchar_t) + 100);
- swprintf(config_file, L"%ls\\%ls",
- source, L"Windows\\System32\\WimBootCompress.ini");
-
- if (tstat(config_file, &st)) {
- imagex_printf(L"\"%ls\" does not exist; using "
- "default configuration\n",
- config_file);
- config_file = NULL;
- } else {
- add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_WINCONFIG;
- }
- }
-#endif
-
if (!tstrcmp(wimfile, T("-"))) {
/* Writing captured WIM to standard output. */
#if 0
/* 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;
+ capture_sources[0].wim_target_path = WIMLIB_WIM_ROOT_PATH;
capture_sources[0].reserved = 0;
num_sources = 1;
capture_sources_malloced = false;
source_list_contents = 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 (!config_str) {
- ret = -1;
- goto out_free_capture_sources;
- }
-
- config = alloca(sizeof(*config));
- ret = parse_capture_config(&config_str, config_len, config);
- 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,
else
ret = wimlib_create_new_wim(compression_type, &wim);
if (ret)
- goto out_free_config;
+ goto out_free_capture_sources;
/* Set chunk size if non-default. */
if (chunk_size != UINT32_MAX) {
if (ret)
goto out_free_wim;
}
+ if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) {
+ ret = wimlib_set_output_pack_compression_type(wim, pack_ctype);
+ if (ret)
+ goto out_free_wim;
+ }
if (pack_chunk_size != UINT32_MAX) {
ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size);
if (ret)
capture_sources,
num_sources,
name,
- config,
+ config_file,
add_image_flags,
imagex_progress_func);
if (ret)
free(base_wims);
out_free_wim:
wimlib_free(wim);
-out_free_config:
- if (config) {
- free(config->exclusion_pats.pats);
- free(config->exclusion_exception_pats.pats);
- free(config_str);
- }
out_free_capture_sources:
if (capture_sources_malloced)
free(capture_sources);
WIMStruct *wim = NULL;
int image;
int ret;
- const tchar *path = T("");
+ const tchar *path = WIMLIB_WIM_ROOT_PATH;
int c;
struct print_dentry_options options = {
.detailed = false,
unsigned num_threads = 0;
uint32_t chunk_size = UINT32_MAX;
uint32_t pack_chunk_size = UINT32_MAX;
+ int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID;
for_opt(c, export_options) {
switch (c) {
if (pack_chunk_size == UINT32_MAX)
goto out_err;
break;
+ case IMAGEX_PACK_COMPRESS_OPTION:
+ pack_ctype = get_compression_type(optarg);
+ if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID)
+ goto out_err;
+ break;
case IMAGEX_REF_OPTION:
ret = string_set_append(&refglobs, optarg);
if (ret)
if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) {
/* The user did not specify a compression type; default
- * to that of the source WIM. */
+ * to that of the source WIM, unless --pack-streams or
+ * --solid was specified. */
- compression_type = src_info.compression_type;
+ if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS)
+ compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
+ else
+ compression_type = src_info.compression_type;
}
ret = wimlib_create_new_wim(compression_type, &dest_wim);
if (ret)
if (ret)
goto out_free_dest_wim;
}
+ if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) {
+ ret = wimlib_set_output_pack_compression_type(dest_wim, pack_ctype);
+ if (ret)
+ goto out_free_dest_wim;
+ }
if (pack_chunk_size != UINT32_MAX) {
ret = wimlib_set_output_pack_chunk_size(dest_wim, pack_chunk_size);
if (ret)
STRING_SET(refglobs);
- tchar *root_path = T("");
+ tchar *root_path = WIMLIB_WIM_ROOT_PATH;
for_opt(c, extract_options) {
switch (c) {
int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
uint32_t chunk_size = UINT32_MAX;
uint32_t pack_chunk_size = UINT32_MAX;
+ int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID;
int ret;
WIMStruct *wim;
const tchar *wimfile;
if (pack_chunk_size == UINT32_MAX)
goto out_err;
break;
+ case IMAGEX_PACK_COMPRESS_OPTION:
+ pack_ctype = get_compression_type(optarg);
+ if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID)
+ goto out_err;
+ break;
case IMAGEX_PACK_STREAMS_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
if (ret)
goto out_wimlib_free;
}
+ if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) {
+ ret = wimlib_set_output_pack_compression_type(wim, pack_ctype);
+ if (ret)
+ goto out_wimlib_free;
+ }
if (pack_chunk_size != UINT32_MAX) {
ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size);
if (ret)
int write_flags = 0;
int update_flags = WIMLIB_UPDATE_FLAG_SEND_PROGRESS;
int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE |
- WIMLIB_ADD_FLAG_VERBOSE;
+ WIMLIB_ADD_FLAG_VERBOSE |
+ WIMLIB_ADD_FLAG_WINCONFIG;
int default_delete_flags = 0;
unsigned num_threads = 0;
int c;
struct wimlib_update_command *cmds;
size_t num_cmds;
tchar *command_str = NULL;
-
- const tchar *config_file = NULL;
- tchar *config_str;
- struct wimlib_capture_config *config;
+ tchar *config_file = NULL;
+ tchar *wimboot_config = NULL;
for_opt(c, update_options) {
switch (c) {
goto out_err;
}
break;
+ case IMAGEX_WIMBOOT_CONFIG_OPTION:
+ wimboot_config = optarg;
+ break;
/* Default delete options */
case IMAGEX_FORCE_OPTION:
default_delete_flags |= WIMLIB_DELETE_FLAG_FORCE;
case IMAGEX_STRICT_ACLS_OPTION:
default_add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS;
break;
+ case IMAGEX_NO_REPLACE_OPTION:
+ default_add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE;
+ break;
default:
goto out_usage;
}
image = 1;
}
- /* Parse capture configuration file if specified */
- if (config_file) {
- size_t config_len;
-
- config_str = file_get_text_contents(config_file, &config_len);
- if (!config_str) {
- ret = -1;
- goto out_wimlib_free;
- }
-
- config = alloca(sizeof(*config));
- ret = parse_capture_config(&config_str, config_len, config);
- if (ret)
- 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
* specified. */
if (command_str) {
cmd_file_contents = NULL;
cmds = parse_update_command_file(&command_str, tstrlen(command_str),
&num_cmds);
- } else {
+ if (!cmds) {
+ ret = -1;
+ goto out_free_cmd_file_contents;
+ }
+ } else if (!wimboot_config) {
if (isatty(STDIN_FILENO)) {
tputs(T("Reading update commands from standard input..."));
recommend_man_page(CMD_UPDATE, stdout);
cmd_file_contents = stdin_get_text_contents(&cmd_file_nchars);
if (!cmd_file_contents) {
ret = -1;
- goto out_free_config;
+ goto out_wimlib_free;
}
/* Parse the update commands */
cmds = parse_update_command_file(&cmd_file_contents, cmd_file_nchars,
&num_cmds);
- }
- if (!cmds) {
- ret = -1;
- goto out_free_cmd_file_contents;
+ if (!cmds) {
+ ret = -1;
+ goto out_free_cmd_file_contents;
+ }
+ } else {
+ cmd_file_contents = NULL;
+ cmds = NULL;
+ num_cmds = 0;
}
/* Set default flags and capture config on the update commands */
switch (cmds[i].op) {
case WIMLIB_UPDATE_OP_ADD:
cmds[i].add.add_flags |= default_add_flags;
- cmds[i].add.config = config;
+ cmds[i].add.config_file = config_file;
break;
case WIMLIB_UPDATE_OP_DELETE:
cmds[i].delete_.delete_flags |= default_delete_flags;
if (ret)
goto out_free_cmds;
+ if (wimboot_config) {
+ /* --wimboot-config=FILE is short for an
+ * "add FILE /Windows/System32/WimBootCompress.ini" command.
+ */
+ struct wimlib_update_command cmd;
+
+ cmd.op = WIMLIB_UPDATE_OP_ADD;
+ cmd.add.fs_source_path = wimboot_config;
+ cmd.add.wim_target_path = T("/Windows/System32/WimBootCompress.ini");
+ cmd.add.config_file = NULL;
+ cmd.add.add_flags = 0;
+
+ ret = wimlib_update_image(wim, image, &cmd, 1,
+ update_flags, imagex_progress_func);
+ if (ret)
+ goto out_free_cmds;
+ }
+
/* Overwrite the updated WIM */
ret = wimlib_overwrite(wim, write_flags, num_threads,
imagex_progress_func);
free(cmds);
out_free_cmd_file_contents:
free(cmd_file_contents);
-out_free_config:
- if (config) {
- free(config->exclusion_pats.pats);
- free(config->exclusion_exception_pats.pats);
- free(config_str);
- }
out_wimlib_free:
wimlib_free(wim);
out_free_command_str:
" [--nocheck] [--flags EDITION_ID] [--dereference]\n"
" [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n"
" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n"
-" [--update-of=[WIMFILE:]IMAGE]\n"
+" [--update-of=[WIMFILE:]IMAGE] [--wimboot]\n"
),
[CMD_APPLY] =
T(
" (DIRECTORY | NTFS_VOLUME) [--check] [--ref=\"GLOB\"]\n"
" [--no-acls] [--strict-acls] [--no-attributes]\n"
" [--rpfix] [--norpfix] [--hardlink] [--symlink]\n"
-" [--include-invalid-names]\n"
+" [--include-invalid-names] [--wimboot]\n"
),
[CMD_CAPTURE] =
T(
" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n"
" [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n"
" [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n"
-" [--delta-from=WIMFILE]\n"
+" [--delta-from=WIMFILE] [--wimboot]\n"
),
[CMD_DELETE] =
T(
T(
" %"TS" WIMFILE [IMAGE_NUM | IMAGE_NAME] [--check] [--rebuild]\n"
" [--threads=NUM_THREADS] [DEFAULT_ADD_OPTIONS]\n"
-" [DEFAULT_DELETE_OPTIONS] [--command=STRING] [< CMDFILE]\n"
+" [DEFAULT_DELETE_OPTIONS] [--command=STRING]\n"
+" [--wimboot-config=FILE| [< CMDFILE]\n"
),
};
exit(2);
}
- /* Enable warning and error messages in wimlib be more user-friendly.
+ /* Enable warning and error messages in wimlib to be more user-friendly.
* */
wimlib_set_print_errors(true);
git://wimlib.net / wimlib / blobdiff