#ifdef __WIN32__
# include "imagex-win32.h"
# define tbasename win32_wbasename
-# define tglob win32_wglob
# define OS_PREFERRED_PATH_SEPARATOR L'\\'
# define OS_PREFERRED_PATH_SEPARATOR_STRING L"\\"
#else /* __WIN32__ */
# include <getopt.h>
# include <langinfo.h>
# define tbasename basename
-# define tglob glob
# define OS_PREFERRED_PATH_SEPARATOR '/'
# define OS_PREFERRED_PATH_SEPARATOR_STRING "/"
static inline void set_fd_to_binary_mode(int fd)
#define for_opt(c, opts) while ((c = getopt_long_only(argc, (tchar**)argv, T(""), \
opts, NULL)) != -1)
-
enum {
CMD_NONE = -1,
CMD_APPEND = 0,
static void recommend_man_page(int cmd, FILE *fp);
static const tchar *get_cmd_string(int cmd, bool nospace);
+static int imagex_progress_func(enum wimlib_progress_msg msg,
+ const union wimlib_progress_info *info);
+
static bool imagex_be_quiet = false;
static FILE *imagex_info_file;
IMAGEX_COMPRESS_OPTION,
IMAGEX_CONFIG_OPTION,
IMAGEX_DEBUG_OPTION,
+ IMAGEX_DELTA_FROM_OPTION,
IMAGEX_DEREFERENCE_OPTION,
IMAGEX_DEST_DIR_OPTION,
IMAGEX_EXTRACT_XML_OPTION,
IMAGEX_RECOMPRESS_OPTION,
IMAGEX_RECURSIVE_OPTION,
IMAGEX_REF_OPTION,
+ IMAGEX_RESUME_OPTION,
IMAGEX_RPFIX_OPTION,
IMAGEX_SOFT_OPTION,
IMAGEX_SOURCE_LIST_OPTION,
IMAGEX_THREADS_OPTION,
IMAGEX_TO_STDOUT_OPTION,
IMAGEX_UNIX_DATA_OPTION,
+ IMAGEX_UPDATE_OF_OPTION,
IMAGEX_VERBOSE_OPTION,
IMAGEX_XML_OPTION,
};
{T("rpfix"), no_argument, NULL, IMAGEX_RPFIX_OPTION},
{T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION},
{T("include-invalid-names"), no_argument, NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION},
+
+ /* --resume is undocumented for now as it needs improvement. */
+ {T("resume"), no_argument, NULL, IMAGEX_RESUME_OPTION},
{NULL, 0, NULL, 0},
};
{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},
};
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;
}
}
}
+struct string_set {
+ const tchar **strings;
+ unsigned num_strings;
+ unsigned num_alloc_strings;
+};
+
+#define STRING_SET_INITIALIZER \
+ { .strings = NULL, .num_strings = 0, .num_alloc_strings = 0, }
+
+#define STRING_SET(_strings) \
+ struct string_set _strings = STRING_SET_INITIALIZER
+
+static int
+string_set_append(struct string_set *set, const tchar *glob)
+{
+ unsigned num_alloc_strings = set->num_alloc_strings;
+
+ if (set->num_strings == num_alloc_strings) {
+ const tchar **new_strings;
+
+ 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->strings = new_strings;
+ set->num_alloc_strings = num_alloc_strings;
+ }
+ 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 string_set *set, int open_flags)
+{
+ return wimlib_reference_resource_files(wim, set->strings,
+ set->num_strings,
+ WIMLIB_REF_FLAG_GLOB_ENABLE,
+ open_flags,
+ imagex_progress_func);
+}
+
+static void
+do_resource_not_found_warning(const tchar *wimfile,
+ const struct wimlib_wim_info *info,
+ const struct string_set *refglobs)
+{
+ if (info->total_parts > 1) {
+ 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("Perhaps the '--ref' argument did not "
+ "specify all other parts of the split "
+ "WIM?"));
+ }
+ } else {
+ imagex_error(T("If this is a delta WIM, use the --ref argument "
+ "to specify the WIM on which it is based."));
+ }
+}
+
/* Returns the size of a file given its name, or -1 if the file does not exist
* or its size cannot be determined. */
static off_t
return (off_t)-1;
}
-tchar pat_ntfs_log[] = T("/$ntfs.log");
-tchar pat_hiberfil_sys[] = T("/hiberfil.sys");
-tchar pat_pagefile_sys[] = T("/pagefile.sys");
-tchar pat_system_volume_information[] = T("/System Volume Information");
-tchar pat_recycler[] = T("/RECYCLER");
-tchar pat_windows_csc[] = T("/Windows/CSC");
-
-tchar *default_pats[] = {
- pat_ntfs_log,
- pat_hiberfil_sys,
- pat_pagefile_sys,
- pat_system_volume_information,
- pat_recycler,
- pat_windows_csc,
-};
-
-static struct wimlib_capture_config default_capture_config = {
- .exclusion_pats = {
- .num_pats = sizeof(default_pats) / sizeof(default_pats[0]),
- .pats = default_pats,
- },
-};
-
enum {
PARSE_STRING_SUCCESS = 0,
PARSE_STRING_FAILURE = 1,
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
}
break;
case WIMLIB_PROGRESS_MSG_SCAN_DENTRY:
- if (info->scan.excluded)
- imagex_printf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path);
- else
+ switch (info->scan.status) {
+ case WIMLIB_SCAN_DENTRY_OK:
imagex_printf(T("Scanning \"%"TS"\"\n"), info->scan.cur_path);
+ break;
+ case WIMLIB_SCAN_DENTRY_EXCLUDED:
+ imagex_printf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path);
+ break;
+ case WIMLIB_SCAN_DENTRY_UNSUPPORTED:
+ imagex_printf(T("WARNING: Excluding unsupported file or directory\n"
+ " \"%"TS"\" from capture\n"), info->scan.cur_path);
+ break;
+ }
break;
case WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY:
unit_shift = get_unit(info->integrity.total_bytes, &unit_name);
if (info->extract.completed_bytes >= info->extract.total_bytes)
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"),
+ info->extract.part_number,
+ info->extract.total_parts);
+ }
+ 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"));
break;
case WIMLIB_PROGRESS_MSG_SPLIT_END_PART:
if (info->split.completed_bytes == info->split.total_bytes) {
- imagex_printf(T("Finished writing part %u of %u WIM parts\n"),
+ imagex_printf(T("Finished writing split WIM part %u of %u\n"),
info->split.cur_part_number,
info->split.total_parts);
}
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 "
return 0;
}
-/* Open all the split WIM parts that correspond to a file glob.
- *
- * @first_part specifies the first part of the split WIM and it may be either
- * included or omitted from the glob. */
-static int
-open_swms_from_glob(const tchar *swm_glob,
- const tchar *first_part,
- int open_flags,
- WIMStruct ***additional_swms_ret,
- unsigned *num_additional_swms_ret)
-{
- unsigned num_additional_swms = 0;
- WIMStruct **additional_swms = NULL;
- glob_t globbuf;
- int ret;
-
- /* Warning: glob() is replaced in Windows native builds */
- ret = tglob(swm_glob, GLOB_ERR | GLOB_NOSORT, NULL, &globbuf);
- if (ret) {
- if (ret == GLOB_NOMATCH) {
- imagex_error(T("Found no files for glob \"%"TS"\""),
- swm_glob);
- } else {
- imagex_error_with_errno(T("Failed to process glob \"%"TS"\""),
- swm_glob);
- }
- ret = -1;
- goto out;
- }
- num_additional_swms = globbuf.gl_pathc;
- additional_swms = calloc(num_additional_swms, sizeof(additional_swms[0]));
- if (!additional_swms) {
- imagex_error(T("Out of memory"));
- ret = -1;
- goto out_globfree;
- }
- unsigned offset = 0;
- for (unsigned i = 0; i < num_additional_swms; i++) {
- if (tstrcmp(globbuf.gl_pathv[i], first_part) == 0) {
- offset++;
- continue;
- }
- ret = wimlib_open_wim(globbuf.gl_pathv[i],
- open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK,
- &additional_swms[i - offset],
- imagex_progress_func);
- if (ret)
- goto out_close_swms;
- }
- *additional_swms_ret = additional_swms;
- *num_additional_swms_ret = num_additional_swms - offset;
- ret = 0;
- goto out_globfree;
-out_close_swms:
- for (unsigned i = 0; i < num_additional_swms; i++)
- wimlib_free(additional_swms[i]);
- free(additional_swms);
-out_globfree:
- globfree(&globbuf);
-out:
- return ret;
-}
-
-
static unsigned
parse_num_threads(const tchar *optarg)
{
switch (op) {
case WIMLIB_UPDATE_OP_ADD:
if (!tstrcmp(option, T("--verbose")))
- cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
+ cmd->add.add_flags |= WIMLIB_ADD_FLAG_VERBOSE;
else if (!tstrcmp(option, T("--unix-data")))
- cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA;
+ cmd->add.add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA;
else if (!tstrcmp(option, T("--no-acls")) || !tstrcmp(option, T("--noacls")))
- cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS;
+ cmd->add.add_flags |= WIMLIB_ADD_FLAG_NO_ACLS;
else if (!tstrcmp(option, T("--strict-acls")))
- cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS;
+ cmd->add.add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS;
else if (!tstrcmp(option, T("--dereference")))
- cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+ cmd->add.add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE;
else
recognized = false;
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;
- const tchar *swm_glob = NULL;
- WIMStruct **additional_swms;
- unsigned num_additional_swms;
+ STRING_SET(refglobs);
for_opt(c, apply_options) {
switch (c) {
extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE;
break;
case IMAGEX_REF_OPTION:
- swm_glob = optarg;
+ ret = string_set_append(&refglobs, optarg);
+ if (ret)
+ goto out_free_refglobs;
break;
case IMAGEX_UNIX_DATA_OPTION:
extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA;
extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES;
extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS;
break;
+ case IMAGEX_RESUME_OPTION:
+ extract_flags |= WIMLIB_EXTRACT_FLAG_RESUME;
+ break;
default:
goto out_usage;
}
target = argv[2];
}
wim = NULL;
- num_additional_swms = 0;
- additional_swms = NULL;
} else {
ret = wimlib_open_wim(wimfile, open_flags, &wim,
imagex_progress_func);
if (ret)
- goto out;
+ goto out_free_refglobs;
+
+ wimlib_get_wim_info(wim, &info);
if (argc >= 3) {
/* Image explicitly specified. */
} else {
/* No image specified; default to image 1, but only if the WIM
* contains exactly one image. */
- struct wimlib_wim_info info;
- wimlib_get_wim_info(wim, &info);
if (info.image_count != 1) {
imagex_error(T("\"%"TS"\" contains %d images; "
"Please select one (or all)."),
image = 1;
target = argv[1];
}
+ }
- if (swm_glob) {
- ret = open_swms_from_glob(swm_glob, wimfile, open_flags,
- &additional_swms,
- &num_additional_swms);
- if (ret)
- goto out_wimlib_free;
- } else {
- additional_swms = NULL;
- num_additional_swms = 0;
+ if (refglobs.num_strings) {
+ if (wim == NULL) {
+ imagex_error(T("Can't specify --ref when applying from stdin!"));
+ ret = -1;
+ goto out_wimlib_free;
}
+ ret = wim_reference_globs(wim, &refglobs, open_flags);
+ if (ret)
+ goto out_wimlib_free;
}
#ifndef __WIN32__
imagex_error_with_errno(T("Failed to stat \"%"TS"\""),
target);
ret = -1;
- goto out_free_swms;
+ goto out_wimlib_free;
}
} else {
if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode))
if (wim) {
ret = wimlib_extract_image(wim, image, target, extract_flags,
- additional_swms, num_additional_swms,
imagex_progress_func);
} else {
set_fd_to_binary_mode(STDIN_FILENO);
target, extract_flags,
imagex_progress_func);
}
- if (ret == 0)
+ if (ret == 0) {
imagex_printf(T("Done applying WIM image.\n"));
-out_free_swms:
- for (unsigned i = 0; i < num_additional_swms; i++)
- wimlib_free(additional_swms[i]);
- free(additional_swms);
+ } else if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) {
+ if (wim) {
+ do_resource_not_found_warning(wimfile, &info, &refglobs);
+ } else {
+ imagex_error(T( "If you are applying an image "
+ "from a split pipable WIM,\n"
+ " make sure you have "
+ "concatenated together all parts."));
+ }
+ }
out_wimlib_free:
wimlib_free(wim);
-out:
+out_free_refglobs:
+ string_set_destroy(&refglobs);
return ret;
out_usage:
usage(CMD_APPLY, stderr);
ret = -1;
- goto out;
+ goto out_free_refglobs;
}
/* Create a WIM image from a directory tree, NTFS volume, or multiple files or
{
int c;
int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS;
- int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE;
+ 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;
const tchar *wimfile;
const tchar *name;
const tchar *desc;
const tchar *flags_element = NULL;
+
WIMStruct *wim;
+ WIMStruct *base_wim;
+ const tchar *base_wimfile = NULL;
+ 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;
break;
case IMAGEX_CONFIG_OPTION:
config_file = optarg;
+ add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_WINCONFIG;
break;
case IMAGEX_COMPRESS_OPTION:
compression_type = get_compression_type(optarg);
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' is only "
+ "valid for capture!"));
+ goto out_usage;
+ }
+ if (base_wimfile) {
+ imagex_error(T("'--delta-from' can only be "
+ "specified one time!"));
+ goto out_err;
+ }
+ base_wimfile = optarg;
+ write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS;
+ break;
default:
goto out_usage;
}
wimfile = argv[1];
if (!tstrcmp(wimfile, T("-"))) {
+ /* Writing captured WIM to standard output. */
#if 0
if (!(write_flags & WIMLIB_WRITE_FLAG_PIPABLE)) {
imagex_error("Can't write a non-pipable WIM to "
wim_fd = STDOUT_FILENO;
wimfile = NULL;
imagex_info_file = stderr;
+ 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_wimfile) {
+ /* Capturing delta WIM: default to base WIM. */
+ template_wimfile = base_wimfile;
+ } 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. */
+ imagex_error(T("For capture of non-delta WIM, "
+ "'--update-of' must specify "
+ "WIMFILE:IMAGE!"));
+ goto out_usage;
+ }
}
if (argc >= 3) {
}
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 {
- config = &default_capture_config;
+ /* 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);
goto out_free_config;
#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;
tsprintf(name_end, T(" (%lu)"), conflict_idx);
}
}
+
+ /* If capturing a delta WIM, reference resources from the base WIM
+ * before adding the new image. */
+ if (base_wimfile) {
+ ret = wimlib_open_wim(base_wimfile, open_flags,
+ &base_wim, imagex_progress_func);
+ if (ret)
+ goto out_free_wim;
+
+ imagex_printf(T("Capturing delta WIM based on \"%"TS"\"\n"),
+ base_wimfile);
+
+ ret = wimlib_reference_resources(wim, &base_wim, 1, 0);
+ if (ret)
+ goto out_free_base_wim;
+ } else {
+ base_wim = 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) {
+
+
+ if (template_wimfile == base_wimfile) {
+ template_wim = base_wim;
+ } 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_wim;
+ }
+
+ 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(template_wim, &info);
+ n = tstrtoul(template_image_name_or_num + 1, &tmp, 10);
+ if (n >= 1 && n <= info.image_count &&
+ *tmp == T('\0') &&
+ tmp != template_image_name_or_num + 1)
+ {
+ template_image = info.image_count - (n - 1);
+ }
+ }
+ ret = verify_image_exists_and_is_single(template_image,
+ template_image_name_or_num,
+ template_wimfile);
+ if (ret)
+ goto out_free_template_wim;
+ } else {
+ template_wim = NULL;
+ }
+
ret = wimlib_add_image_multisource(wim,
capture_sources,
num_sources,
add_image_flags,
imagex_progress_func);
if (ret)
- goto out_wimlib_free;
+ goto out_free_template_wim;
- if (desc || flags_element) {
- /* User provided <DESCRIPTION> or <FLAGS> element. Get the
- * index of the image we just added, then use it to call the
- * appropriate functions. */
+ 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
+ * --update-of. Get the index of the image we just
+ * added, then use it to call the appropriate functions. */
struct wimlib_wim_info info;
wimlib_get_wim_info(wim, &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_free_template_wim;
}
}
write_flags, num_threads,
imagex_progress_func);
}
-out_wimlib_free:
+out_free_template_wim:
+ /* template_wim may alias base_wim or wim. */
+ if (template_wim != base_wim && template_wim != wim)
+ wimlib_free(template_wim);
+out_free_base_wim:
+ wimlib_free(base_wim);
+out_free_wim:
wimlib_free(wim);
out_free_config:
- if (config != &default_capture_config) {
+ if (config) {
free(config->exclusion_pats.pats);
free(config->exclusion_exception_pats.pats);
free(config_str);
}
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;
const tchar *dest_name;
const tchar *dest_desc;
WIMStruct *src_wim;
+ struct wimlib_wim_info src_info;
WIMStruct *dest_wim;
int ret;
int image;
struct stat stbuf;
bool wim_is_new;
- const tchar *swm_glob = NULL;
- WIMStruct **additional_swms;
- unsigned num_additional_swms;
+ STRING_SET(refglobs);
unsigned num_threads = 0;
for_opt(c, export_options) {
goto out_err;
break;
case IMAGEX_REF_OPTION:
- swm_glob = optarg;
+ ret = string_set_append(&refglobs, optarg);
+ if (ret)
+ goto out_free_refglobs;
break;
case IMAGEX_THREADS_OPTION:
num_threads = parse_num_threads(optarg);
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;
+ goto out_free_refglobs;
+
+ wimlib_get_wim_info(src_wim, &src_info);
/* Determine if the destination is an existing file or not. If so, we
* try to append the exported image(s) to it; otherwise, we create a new
dest_wimfile = NULL;
dest_wim_fd = STDOUT_FILENO;
imagex_info_file = stderr;
+ set_fd_to_binary_mode(dest_wim_fd);
}
errno = ENOENT;
if (dest_wimfile != NULL && tstat(dest_wimfile, &stbuf) == 0) {
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;
/* The user did not specify a compression type; default
* to that of the source WIM. */
- struct wimlib_wim_info src_info;
-
- wimlib_get_wim_info(src_wim, &src_info);
compression_type = src_info.compression_type;
}
ret = wimlib_create_new_wim(compression_type, &dest_wim);
if (ret)
goto out_free_dest_wim;
- if (swm_glob) {
- ret = open_swms_from_glob(swm_glob, src_wimfile, open_flags,
- &additional_swms,
- &num_additional_swms);
+ if (refglobs.num_strings) {
+ ret = wim_reference_globs(src_wim, &refglobs, open_flags);
if (ret)
goto out_free_dest_wim;
- } else {
- additional_swms = NULL;
- num_additional_swms = 0;
+ }
+
+ if ((export_flags & WIMLIB_EXPORT_FLAG_BOOT) &&
+ image == WIMLIB_ALL_IMAGES && src_info.boot_index == 0)
+ {
+ imagex_error(T("--boot specified for all-images export, but source WIM "
+ "has no bootable image."));
+ ret = -1;
+ goto out_free_dest_wim;
}
ret = wimlib_export_image(src_wim, image, dest_wim, dest_name,
- dest_desc, export_flags, additional_swms,
- num_additional_swms, imagex_progress_func);
- if (ret)
- goto out_free_swms;
+ dest_desc, export_flags, imagex_progress_func);
+ if (ret) {
+ if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) {
+ do_resource_not_found_warning(src_wimfile,
+ &src_info, &refglobs);
+ }
+ goto out_free_dest_wim;
+ }
if (!wim_is_new)
ret = wimlib_overwrite(dest_wim, write_flags, num_threads,
ret = wimlib_write_to_fd(dest_wim, dest_wim_fd,
WIMLIB_ALL_IMAGES, write_flags,
num_threads, imagex_progress_func);
- if (ret)
- imagex_error(T("Export failed."));
-out_free_swms:
- for (unsigned i = 0; i < num_additional_swms; i++)
- wimlib_free(additional_swms[i]);
- free(additional_swms);
out_free_dest_wim:
wimlib_free(dest_wim);
out_free_src_wim:
wimlib_free(src_wim);
-out:
+out_free_refglobs:
+ string_set_destroy(&refglobs);
return ret;
out_usage:
usage(CMD_EXPORT, stderr);
out_err:
ret = -1;
- goto out;
+ goto out_free_refglobs;
}
static bool
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;
- const tchar *swm_glob = NULL;
- WIMStruct **additional_swms;
- unsigned num_additional_swms;
+ STRING_SET(refglobs);
struct wimlib_extract_command *cmds;
size_t num_cmds;
extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE;
break;
case IMAGEX_REF_OPTION:
- swm_glob = optarg;
+ ret = string_set_append(&refglobs, optarg);
+ if (ret)
+ goto out_free_refglobs;
break;
case IMAGEX_UNIX_DATA_OPTION:
extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA;
if (ret)
goto out_wimlib_free;
- if (swm_glob) {
- ret = open_swms_from_glob(swm_glob, wimfile, open_flags,
- &additional_swms,
- &num_additional_swms);
+ if (refglobs.num_strings) {
+ ret = wim_reference_globs(wim, &refglobs, open_flags);
if (ret)
goto out_wimlib_free;
- } else {
- additional_swms = NULL;
- num_additional_swms = 0;
}
ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0,
- additional_swms, num_additional_swms,
imagex_progress_func);
if (ret == 0) {
if (!imagex_be_quiet)
"files and directories\n"
" are in the WIM image.\n"),
get_cmd_string(CMD_INFO, false));
+ } else if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) {
+ struct wimlib_wim_info info;
+
+ wimlib_get_wim_info(wim, &info);
+ do_resource_not_found_warning(wimfile, &info, &refglobs);
}
- for (unsigned i = 0; i < num_additional_swms; i++)
- wimlib_free(additional_swms[i]);
- free(additional_swms);
out_wimlib_free:
wimlib_free(wim);
out_free_cmds:
free_extract_commands(cmds, num_cmds, dest_dir);
-out:
+out_free_refglobs:
+ string_set_destroy(&refglobs);
return ret;
out_usage:
usage(CMD_EXTRACT, stderr);
out_err:
ret = -1;
- goto out;
+ goto out_free_refglobs;
}
static void print_byte_field(const uint8_t field[], size_t len)
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;
- const tchar *swm_glob = NULL;
+ int open_flags = 0;
const tchar *staging_dir = NULL;
const tchar *wimfile;
const tchar *dir;
WIMStruct *wim;
+ struct wimlib_wim_info info;
int image;
int ret;
- WIMStruct **additional_swms;
- unsigned num_additional_swms;
+
+ STRING_SET(refglobs);
if (cmd == CMD_MOUNTRW) {
mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE;
}
break;
case IMAGEX_REF_OPTION:
- swm_glob = optarg;
+ ret = string_set_append(&refglobs, optarg);
+ if (ret)
+ goto out_free_refglobs;
break;
case IMAGEX_STAGING_DIR_OPTION:
staging_dir = optarg;
ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func);
if (ret)
- goto out;
+ goto out_free_refglobs;
+
+ wimlib_get_wim_info(wim, &info);
if (argc >= 3) {
/* Image explicitly specified. */
} else {
/* No image specified; default to image 1, but only if the WIM
* contains exactly one image. */
- struct wimlib_wim_info info;
- wimlib_get_wim_info(wim, &info);
if (info.image_count != 1) {
imagex_error(T("\"%"TS"\" contains %d images; Please "
"select one."), wimfile, info.image_count);
dir = argv[1];
}
- if (swm_glob) {
- ret = open_swms_from_glob(swm_glob, wimfile, open_flags,
- &additional_swms,
- &num_additional_swms);
+ if (refglobs.num_strings) {
+ ret = wim_reference_globs(wim, &refglobs, open_flags);
if (ret)
goto out_free_wim;
- } else {
- additional_swms = NULL;
- num_additional_swms = 0;
}
- ret = wimlib_mount_image(wim, image, dir, mount_flags, additional_swms,
- num_additional_swms, staging_dir);
+ ret = wimlib_mount_image(wim, image, dir, mount_flags, staging_dir);
if (ret) {
imagex_error(T("Failed to mount image %d from \"%"TS"\" "
"on \"%"TS"\""),
image, wimfile, dir);
}
- for (unsigned i = 0; i < num_additional_swms; i++)
- wimlib_free(additional_swms[i]);
- free(additional_swms);
out_free_wim:
wimlib_free(wim);
-out:
+out_free_refglobs:
+ string_set_destroy(&refglobs);
return ret;
out_usage:
usage(cmd, stderr);
ret = -1;
- goto out;
+ goto out_free_refglobs;
}
#endif /* WIM_MOUNTING_SUPPORTED */
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_IMAGE_FLAG_EXCLUDE_VERBOSE;
+ int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE;
int default_delete_flags = 0;
unsigned num_threads = 0;
int c;
/* Global add option */
case IMAGEX_CONFIG_OPTION:
+ default_add_flags &= ~WIMLIB_ADD_FLAG_WINCONFIG;
config_file = optarg;
break;
/* Default add options */
case IMAGEX_VERBOSE_OPTION:
- default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
+ default_add_flags |= WIMLIB_ADD_FLAG_VERBOSE;
break;
case IMAGEX_DEREFERENCE_OPTION:
- default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+ default_add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE;
break;
case IMAGEX_UNIX_DATA_OPTION:
- default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA;
+ default_add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA;
break;
case IMAGEX_NO_ACLS_OPTION:
- default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS;
+ default_add_flags |= WIMLIB_ADD_FLAG_NO_ACLS;
break;
case IMAGEX_STRICT_ACLS_OPTION:
- default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS;
+ default_add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS;
break;
default:
goto out_usage;
if (ret)
goto out_free_config;
} else {
- config = &default_capture_config;
+ config = NULL;
+ default_add_flags |= WIMLIB_ADD_FLAG_WINCONFIG;
}
/* Read update commands from standard input, or the command string if
}
/* Set default flags and capture config on the update commands */
- bool have_add_command = false;
for (size_t i = 0; i < num_cmds; i++) {
switch (cmds[i].op) {
case WIMLIB_UPDATE_OP_ADD:
cmds[i].add.add_flags |= default_add_flags;
cmds[i].add.config = config;
- have_add_command = true;
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;
out_free_cmd_file_contents:
free(cmd_file_contents);
out_free_config:
- if (config != &default_capture_config) {
+ if (config) {
free(config->exclusion_pats.pats);
free(config->exclusion_exception_pats.pats);
free(config_str);
" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n"
" [--rebuild] [--unix-data] [--source-list] [--no-acls]\n"
" [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n"
-" [--not-pipable]\n"
+" [--not-pipable] [--update-of=[WIMFILE:]IMAGE]\n"
),
[CMD_APPLY] =
T(
" [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n"
" [--verbose] [--dereference] [--config=FILE]\n"
" [--threads=NUM_THREADS] [--unix-data] [--source-list]\n"
-" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n"
-" [--pipable] [--not-pipable]\n"
+" [--no-acls] [--strict-acls] [--norpfix] [--pipable]\n"
+" [--update-of=[WIMFILE:]IMAGE] [--delta-from=WIMFILE]\n"
),
[CMD_DELETE] =
T(
};
static const tchar *invocation_name;
-static bool using_cmd_from_invocation_name = false;
+static int invocation_cmd = CMD_NONE;
static const tchar *get_cmd_string(int cmd, bool nospace)
{
-
- if (using_cmd_from_invocation_name || cmd == CMD_NONE) {
- return invocation_name;
+ static tchar buf[50];
+ if (cmd == CMD_NONE) {
+ tsprintf(buf, T("%"TS), T(IMAGEX_PROGNAME));
+ } else if (invocation_cmd != CMD_NONE) {
+ tsprintf(buf, T("wim%"TS), imagex_commands[cmd].name);
} else {
const tchar *format;
- static tchar buf[50];
if (nospace)
format = T("%"TS"-%"TS"");
else
format = T("%"TS" %"TS"");
tsprintf(buf, format, invocation_name, imagex_commands[cmd].name);
- return buf;
}
+ return buf;
}
static void
if (!tstrcmp(invocation_name + 3,
imagex_commands[i].name))
{
- using_cmd_from_invocation_name = true;
+ invocation_cmd = i;
cmd = i;
break;
}
git://wimlib.net / wimlib / blobdiff