# include <alloca.h>
#endif
-/* NetBSD is missing getopt_long_only() but has getopt_long() */
-#ifndef HAVE_GETOPT_LONG_ONLY
-# define getopt_long_only getopt_long
-#endif
-
#define WIMLIB_COMPRESSION_TYPE_INVALID (-1)
#ifdef __WIN32__
static inline void set_fd_to_binary_mode(int fd)
{
}
+/* NetBSD is missing getopt_long_only() but has getopt_long() */
+#ifndef HAVE_GETOPT_LONG_ONLY
+# define getopt_long_only getopt_long
+#endif
#endif /* !__WIN32 */
/* Don't confuse the user by presenting the mounting commands on Windows when
IMAGEX_COMPACT_OPTION,
IMAGEX_COMPRESS_OPTION,
IMAGEX_CONFIG_OPTION,
+ IMAGEX_CREATE_OPTION,
IMAGEX_DEBUG_OPTION,
IMAGEX_DELTA_FROM_OPTION,
IMAGEX_DEREFERENCE_OPTION,
{T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION},
{T("unsafe-compact"), no_argument, NULL, IMAGEX_UNSAFE_COMPACT_OPTION},
{T("snapshot"), no_argument, NULL, IMAGEX_SNAPSHOT_OPTION},
+ {T("create"), no_argument, NULL, IMAGEX_CREATE_OPTION},
{NULL, 0, NULL, 0},
};
last_scan_progress = *scan;
}
}
+
+static struct wimlib_progress_info_split last_split_progress;
+
+static void
+report_split_progress(uint64_t bytes_completed_in_part)
+{
+ uint64_t completed_bytes = last_split_progress.completed_bytes +
+ bytes_completed_in_part;
+ unsigned percent_done = TO_PERCENT(completed_bytes,
+ last_split_progress.total_bytes);
+ unsigned unit_shift;
+ const tchar *unit_name;
+
+ unit_shift = get_unit(last_split_progress.total_bytes, &unit_name);
+ imagex_printf(T("\rSplitting WIM: %"PRIu64" %"TS" of "
+ "%"PRIu64" %"TS" (%u%%) written, part %u of %u"),
+ completed_bytes >> unit_shift,
+ unit_name,
+ last_split_progress.total_bytes >> unit_shift,
+ unit_name,
+ percent_done,
+ last_split_progress.cur_part_number,
+ last_split_progress.total_parts);
+}
+
/* Progress callback function passed to various wimlib functions. */
static enum wimlib_progress_status
imagex_progress_func(enum wimlib_progress_msg msg,
switch (msg) {
case WIMLIB_PROGRESS_MSG_WRITE_STREAMS:
+ if (last_split_progress.total_bytes != 0) {
+ /* wimlib_split() in progress; use the split-specific
+ * progress message. */
+ report_split_progress(info->write_streams.completed_compressed_bytes);
+ break;
+ }
{
static bool started;
if (!started) {
}
break;
case WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART:
- percent_done = TO_PERCENT(info->split.completed_bytes,
- info->split.total_bytes);
- unit_shift = get_unit(info->split.total_bytes, &unit_name);
- imagex_printf(T("Writing \"%"TS"\" (part %u of %u): %"PRIu64" %"TS" of "
- "%"PRIu64" %"TS" (%u%%) written\n"),
- info->split.part_name,
- info->split.cur_part_number,
- info->split.total_parts,
- info->split.completed_bytes >> unit_shift,
- unit_name,
- info->split.total_bytes >> unit_shift,
- unit_name,
- percent_done);
- break;
case WIMLIB_PROGRESS_MSG_SPLIT_END_PART:
- if (info->split.completed_bytes == info->split.total_bytes) {
- imagex_printf(T("Finished writing split WIM part %u of %u\n"),
- info->split.cur_part_number,
- info->split.total_parts);
- }
+ last_split_progress = info->split;
+ report_split_progress(0);
break;
case WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND:
switch (info->update.command->op) {
goto out_free_refglobs;
}
-/* Create a WIM image from a directory tree, NTFS volume, or multiple files or
- * directory trees. 'wimlib-imagex capture': create a new WIM file containing
- * the desired image. 'wimlib-imagex append': add a new image to an existing
- * WIM file. */
+/*
+ * Create a WIM image from a directory tree, NTFS volume, or multiple files or
+ * directory trees. 'wimcapture': create a new WIM file containing the desired
+ * image. 'wimappend': add a new image to an existing WIM file; or, with
+ * '--create' behave like 'wimcapture' if the WIM file doesn't exist.
+ */
static int
imagex_capture_or_append(int argc, tchar **argv, int cmd)
{
int c;
+ bool create = false;
+ bool appending = (cmd == CMD_APPEND);
int open_flags = 0;
int add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE |
WIMLIB_ADD_FLAG_WINCONFIG |
template_image_name_or_num = optarg;
}
}
+ #ifdef __WIN32__
+ imagex_printf(T("[WARNING] '--update-of' is unreliable on Windows!\n"));
+ #endif
break;
case IMAGEX_DELTA_FROM_OPTION:
ret = string_list_append(&base_wimfiles, optarg);
add_flags |= WIMLIB_ADD_FLAG_WIMBOOT;
break;
case IMAGEX_UNSAFE_COMPACT_OPTION:
- if (cmd != CMD_APPEND) {
- imagex_error(T("'--unsafe-compact' is only "
- "valid for append!"));
- goto out_err;
- }
write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT;
break;
case IMAGEX_SNAPSHOT_OPTION:
add_flags |= WIMLIB_ADD_FLAG_SNAPSHOT;
break;
+ case IMAGEX_CREATE_OPTION:
+ if (cmd == CMD_CAPTURE) {
+ imagex_error(T("'--create' is only valid for 'wimappend', not 'wimcapture'"));
+ goto out_err;
+ }
+ create = true;
+ break;
default:
goto out_usage;
}
if (!tstrcmp(wimfile, T("-"))) {
/* Writing captured WIM to standard output. */
+ if (create)
+ appending = false;
#if 0
if (!(write_flags & WIMLIB_WRITE_FLAG_PIPABLE)) {
imagex_error("Can't write a non-pipable WIM to "
#else
write_flags |= WIMLIB_WRITE_FLAG_PIPABLE;
#endif
- if (cmd == CMD_APPEND) {
+ if (appending) {
imagex_error(T("Using standard output for append does "
"not make sense."));
goto out_err;
wimfile = NULL;
imagex_output_to_stderr();
set_fd_to_binary_mode(wim_fd);
+ } else {
+ struct stat stbuf;
+
+ /* Check for 'wimappend --create' acting as wimcapture */
+ if (create && tstat(wimfile, &stbuf) != 0 && errno == ENOENT) {
+
+ appending = false;
+
+ /* Ignore '--update-of' for the target WIMFILE */
+ if (template_image_name_or_num &&
+ (!template_wimfile ||
+ !tstrcmp(template_wimfile, wimfile)))
+ {
+ template_image_name_or_num = NULL;
+ template_wimfile = NULL;
+ }
+ }
+ }
+
+ if ((write_flags & WIMLIB_WRITE_FLAG_UNSAFE_COMPACT) && !appending) {
+ imagex_error(T("'--unsafe-compact' is only valid for append!"));
+ goto out_err;
}
/* If template image was specified using --update-of=IMAGE rather
/* Capturing delta WIM based on single WIM: default to
* base WIM. */
template_wimfile = base_wimfiles.strings[0];
- } else if (cmd == CMD_APPEND) {
+ } else if (appending) {
/* Appending to WIM: default to WIM being appended to.
*/
template_wimfile = wimfile;
}
/* Open the existing WIM, or create a new one. */
- if (cmd == CMD_APPEND) {
+ if (appending) {
ret = wimlib_open_wim_with_progress(wimfile,
open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS,
&wim,
int ctype = compression_type;
- if (cmd == CMD_APPEND) {
+ if (appending) {
struct wimlib_wim_info info;
wimlib_get_wim_info(wim, &info);
ctype = info.compression_type;
/* 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 (appending && name_defaulted) {
unsigned long conflict_idx;
tchar *name_end = tstrchr(name, T('\0'));
for (conflict_idx = 1;
* open the WIM if needed and parse the image index. */
if (template_image_name_or_num) {
- if (cmd == CMD_APPEND && !tstrcmp(template_wimfile, wimfile)) {
+ if (appending && !tstrcmp(template_wimfile, wimfile)) {
template_wim = wim;
} else {
for (size_t i = 0; i < base_wimfiles.num_strings; i++) {
/* Write the new WIM or overwrite the existing WIM with the new image
* appended. */
- if (cmd == CMD_APPEND) {
+ if (appending) {
ret = wimlib_overwrite(wim, write_flags, num_threads);
} else if (wimfile) {
ret = wimlib_write(wim, wimfile, WIMLIB_ALL_IMAGES,
argc -= num_paths;
argv += num_paths;
} else {
+ const tchar *listfile = argv[0] + 1;
+
+ if (!tstrcmp(listfile, T("-"))) {
+ tputs(T("Reading pathlist file from standard input..."));
+ listfile = NULL;
+ }
+
ret = wimlib_extract_pathlist(wim, image, dest_dir,
- argv[0] + 1,
- extract_flags);
+ listfile, extract_flags);
argc--;
argv++;
}
goto out;
ret = wimlib_split(wim, argv[1], part_size, write_flags);
+ tprintf(T("\nFinished splitting \"%"TS"\"\n"), argv[0]);
wimlib_free(wim);
out:
return ret;
" [--threads=NUM_THREADS] [--no-acls] [--strict-acls]\n"
" [--rpfix] [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n"
" [--delta-from=WIMFILE] [--wimboot] [--unix-data]\n"
-" [--dereference] [--snapshot]\n"
+" [--dereference] [--snapshot] [--create]\n"
),
[CMD_APPLY] =
T(
git://wimlib.net / wimlib / blobdiff