*/
/*
- * Copyright (C) 2012, 2013, 2014 Eric Biggers
+ * Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
IMAGEX_NO_ATTRIBUTES_OPTION,
IMAGEX_NO_REPLACE_OPTION,
IMAGEX_NO_GLOBS_OPTION,
+ IMAGEX_NO_SOLID_SORT_OPTION,
IMAGEX_NULLGLOB_OPTION,
IMAGEX_ONE_FILE_ONLY_OPTION,
IMAGEX_PATH_OPTION,
{T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION},
{T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
{T("pack-chunk-size"), required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
+ {T("no-solid-sort"), no_argument, NULL, IMAGEX_NO_SOLID_SORT_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("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION},
{T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
{T("pack-chunk-size"), required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
+ {T("no-solid-sort"), no_argument, NULL, IMAGEX_NO_SOLID_SORT_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("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION},
{T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
{T("pack-chunk-size"), required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
+ {T("no-solid-sort"), no_argument, NULL, IMAGEX_NO_SOLID_SORT_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},
static const struct option verify_options[] = {
{T("ref"), required_argument, NULL, IMAGEX_REF_OPTION},
+ {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
{NULL, 0, NULL, 0},
};
T("NTFS volume") : T("directory")),
info->extract.target);
break;
+ case WIMLIB_PROGRESS_MSG_EXTRACT_FILE_STRUCTURE:
+ if (info->extract.end_file_count >= 2000) {
+ percent_done = TO_PERCENT(info->extract.current_file_count,
+ info->extract.end_file_count);
+ imagex_printf(T("\rCreating files: %"PRIu64" of %"PRIu64" (%u%%) done"),
+ info->extract.current_file_count,
+ info->extract.end_file_count, percent_done);
+ if (info->extract.current_file_count == info->extract.end_file_count)
+ imagex_printf(T("\n"));
+ }
+ break;
case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS:
percent_done = TO_PERCENT(info->extract.completed_bytes,
info->extract.total_bytes);
if (info->extract.completed_bytes >= info->extract.total_bytes)
imagex_printf(T("\n"));
break;
+ case WIMLIB_PROGRESS_MSG_EXTRACT_METADATA:
+ if (info->extract.end_file_count >= 2000) {
+ percent_done = TO_PERCENT(info->extract.current_file_count,
+ info->extract.end_file_count);
+ imagex_printf(T("\rApplying metadata to files: %"PRIu64" of %"PRIu64" (%u%%) done"),
+ info->extract.current_file_count,
+ info->extract.end_file_count, percent_done);
+ if (info->extract.current_file_count == info->extract.end_file_count)
+ imagex_printf(T("\n"));
+ }
+ break;
case WIMLIB_PROGRESS_MSG_EXTRACT_SPWM_PART_BEGIN:
if (info->extract.total_parts != 1) {
imagex_printf(T("\nReading split pipable WIM part %u of %u\n"),
}
}
-static uint32_t parse_chunk_size(const tchar *optarg)
+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;
- }
+ tchar *tmp;
+ uint64_t chunk_size = tstrtoul(optarg, &tmp, 10);
+ if (chunk_size == 0) {
+ imagex_error(T("Invalid chunk size specification; must be a positive integer\n"
+ " with optional K, M, or G suffix"));
+ return UINT32_MAX;
+ }
+ if (*tmp) {
+ if (*tmp == T('k') || *tmp == T('K')) {
+ chunk_size <<= 10;
+ tmp++;
+ } else if (*tmp == T('m') || *tmp == T('M')) {
+ chunk_size <<= 20;
+ tmp++;
+ } else if (*tmp == T('g') || *tmp == T('G')) {
+ chunk_size <<= 30;
+ tmp++;
+ }
+ if (*tmp && !(*tmp == T('i') && *(tmp + 1) == T('B'))) {
+ imagex_error(T("Invalid chunk size specification; suffix must be K, M, or G"));
+ return UINT32_MAX;
+ }
+ }
+ if (chunk_size >= UINT32_MAX) {
+ imagex_error(T("Invalid chunk size specification; the value is too large!"));
+ return UINT32_MAX;
+ }
+ return chunk_size;
}
imagex_capture_or_append(int argc, tchar **argv, int cmd)
{
int c;
- int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS;
- int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE |
- WIMLIB_ADD_IMAGE_FLAG_WINCONFIG |
- WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
+ int open_flags = 0;
+ int add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE |
+ WIMLIB_ADD_FLAG_WINCONFIG |
+ WIMLIB_ADD_FLAG_VERBOSE;
int write_flags = 0;
int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
uint32_t chunk_size = UINT32_MAX;
for_opt(c, capture_or_append_options) {
switch (c) {
case IMAGEX_BOOT_OPTION:
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_BOOT;
+ add_flags |= WIMLIB_ADD_FLAG_BOOT;
break;
case IMAGEX_CHECK_OPTION:
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
break;
case IMAGEX_CONFIG_OPTION:
config_file = optarg;
- add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_WINCONFIG;
+ add_flags &= ~WIMLIB_ADD_FLAG_WINCONFIG;
break;
case IMAGEX_COMPRESS_OPTION:
compression_type = get_compression_type(optarg);
goto out_err;
break;
case IMAGEX_SOLID_OPTION:
- write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
+ write_flags |= WIMLIB_WRITE_FLAG_SOLID;
+ break;
+ case IMAGEX_NO_SOLID_SORT_OPTION:
+ write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT;
break;
case IMAGEX_FLAGS_OPTION:
flags_element = optarg;
break;
case IMAGEX_DEREFERENCE_OPTION:
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+ add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE;
break;
case IMAGEX_VERBOSE_OPTION:
/* No longer does anything. */
write_flags |= WIMLIB_WRITE_FLAG_REBUILD;
break;
case IMAGEX_UNIX_DATA_OPTION:
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA;
+ add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA;
break;
case IMAGEX_SOURCE_LIST_OPTION:
source_list = true;
break;
case IMAGEX_NO_ACLS_OPTION:
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS;
+ add_flags |= WIMLIB_ADD_FLAG_NO_ACLS;
break;
case IMAGEX_STRICT_ACLS_OPTION:
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS;
+ add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS;
break;
case IMAGEX_RPFIX_OPTION:
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_RPFIX;
+ add_flags |= WIMLIB_ADD_FLAG_RPFIX;
break;
case IMAGEX_NORPFIX_OPTION:
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NORPFIX;
+ add_flags |= WIMLIB_ADD_FLAG_NORPFIX;
break;
case IMAGEX_PIPABLE_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_PIPABLE;
write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS;
break;
case IMAGEX_WIMBOOT_OPTION:
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_WIMBOOT;
+ add_flags |= WIMLIB_ADD_FLAG_WIMBOOT;
break;
default:
goto out_usage;
if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) {
/* No compression type specified. Use the default. */
- if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) {
+ if (add_flags & WIMLIB_ADD_FLAG_WIMBOOT) {
/* With --wimboot, default to XPRESS compression. */
compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
- } else if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS) {
+ } else if (write_flags & WIMLIB_WRITE_FLAG_SOLID) {
/* With --solid, default to LZMS compression. (However,
- * this will not affect solid blocks!) */
+ * this will not affect solid resources!) */
compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
} else {
/* Otherwise, default to LZX compression. */
/* Open the existing WIM, or create a new one. */
if (cmd == CMD_APPEND) {
- ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim,
- imagex_progress_func, NULL);
+ ret = wimlib_open_wim_with_progress(wimfile,
+ open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS,
+ &wim,
+ imagex_progress_func,
+ NULL);
if (ret)
goto out_free_capture_sources;
} else {
ret = wimlib_set_output_chunk_size(wim, chunk_size);
if (ret)
goto out_free_wim;
- } else if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) &&
+ } else if ((add_flags & WIMLIB_ADD_FLAG_WIMBOOT) &&
compression_type == WIMLIB_COMPRESSION_TYPE_XPRESS) {
ret = wimlib_set_output_chunk_size(wim, 4096);
if (ret)
if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) {
imagex_printf(T("Capturing WIM image from NTFS "
"filesystem on \"%"TS"\"\n"), source);
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NTFS;
+ add_flags |= WIMLIB_ADD_FLAG_NTFS;
}
} else {
if (errno != ENOENT) {
for (size_t i = 0; i < base_wimfiles.num_strings; i++) {
ret = wimlib_open_wim_with_progress(
- base_wimfiles.strings[i],
- open_flags, &base_wims[i],
- imagex_progress_func, NULL);
+ base_wimfiles.strings[i], open_flags,
+ &base_wims[i], imagex_progress_func, NULL);
if (ret)
goto out_free_base_wims;
num_sources,
name,
config_file,
- add_image_flags);
+ add_flags);
if (ret)
goto out_free_template_wim;
if (resource->is_spanned)
tprintf(T("WIM_RESHDR_FLAG_SPANNED "));
if (resource->packed)
- tprintf(T("WIM_RESHDR_FLAG_PACKED_STREAMS "));
+ tprintf(T("WIM_RESHDR_FLAG_SOLID "));
tputchar(T('\n'));
}
tputchar(T('\n'));
write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
break;
case IMAGEX_SOLID_OPTION:
- write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
+ write_flags |= WIMLIB_WRITE_FLAG_SOLID;
+ break;
+ case IMAGEX_NO_SOLID_SORT_OPTION:
+ write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT;
break;
case IMAGEX_CHUNK_SIZE_OPTION:
chunk_size = parse_chunk_size(optarg);
* to that of the source WIM, unless --solid or
* --wimboot was specified. */
- if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS)
+ if (write_flags & WIMLIB_WRITE_FLAG_SOLID)
compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
else if (export_flags & WIMLIB_EXPORT_FLAG_WIMBOOT)
compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
goto out_err;
break;
case IMAGEX_SOLID_OPTION:
- write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
+ write_flags |= WIMLIB_WRITE_FLAG_SOLID;
write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
break;
+ case IMAGEX_NO_SOLID_SORT_OPTION:
+ write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT;
+ break;
case IMAGEX_THREADS_OPTION:
num_threads = parse_num_threads(optarg);
if (num_threads == UINT_MAX)
if (ret)
goto out_free_refglobs;
break;
+ case IMAGEX_NOCHECK_OPTION:
+ open_flags &= ~WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ break;
default:
goto out_usage;
}
{
static tchar buf[50];
if (cmd == CMD_NONE) {
- tsprintf(buf, T("%"TS), T(IMAGEX_PROGNAME));
+ return T("wimlib-imagex");
} else if (invocation_cmd != CMD_NONE) {
tsprintf(buf, T("wim%"TS), imagex_commands[cmd].name);
} else {
{
static const tchar *s =
T(
-IMAGEX_PROGNAME " (distributed with " PACKAGE " " PACKAGE_VERSION ")\n"
-"Copyright (C) 2012, 2013, 2014 Eric Biggers\n"
+"wimlib-imagex (distributed with " PACKAGE " " PACKAGE_VERSION ")\n"
+"Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers\n"
"License GPLv3+; GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
/* Allow being invoked as wimCOMMAND (e.g. wimapply). */
cmd = CMD_NONE;
if (!tstrncmp(invocation_name, T("wim"), 3) &&
- tstrcmp(invocation_name, T(IMAGEX_PROGNAME))) {
+ tstrcmp(invocation_name, T("wimlib-imagex"))) {
for (int i = 0; i < CMD_MAX; i++) {
if (!tstrcmp(invocation_name + 3,
imagex_commands[i].name))