*/
/*
- * Copyright (C) 2012-2018 Eric Biggers
+ * Copyright 2012-2023 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
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#define WIMLIB_COMPRESSION_TYPE_INVALID (-1)
-#ifdef __WIN32__
+#ifdef _WIN32
# include "imagex-win32.h"
# define print_security_descriptor win32_print_security_descriptor
-#else /* __WIN32__ */
+#else /* _WIN32 */
# include <getopt.h>
# include <langinfo.h>
# define print_security_descriptor default_print_security_descriptor
#ifndef HAVE_GETOPT_LONG_ONLY
# define getopt_long_only getopt_long
#endif
-#endif /* !__WIN32 */
+#endif /* !_WIN32 */
/* Don't confuse the user by presenting the mounting commands on Windows when
* they will never work. However on UNIX-like systems we always present them,
* even if WITH_FUSE is not defined at this point, as to not tie the build of
* wimlib-imagex to a specific build of wimlib. */
-#ifdef __WIN32__
+#ifdef _WIN32
# define WIM_MOUNTING_SUPPORTED 0
#else
# define WIM_MOUNTING_SUPPORTED 1
IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION,
IMAGEX_REBUILD_OPTION,
IMAGEX_RECOMPRESS_OPTION,
+ IMAGEX_RECOVER_DATA_OPTION,
IMAGEX_RECURSIVE_OPTION,
IMAGEX_REF_OPTION,
IMAGEX_RPFIX_OPTION,
{T("include-invalid-names"), no_argument, NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION},
{T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION},
{T("compact"), required_argument, NULL, IMAGEX_COMPACT_OPTION},
+ {T("recover-data"), no_argument, NULL, IMAGEX_RECOVER_DATA_OPTION},
{NULL, 0, NULL, 0},
};
{T("preserve-dir-structure"), no_argument, NULL, IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION},
{T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION},
{T("compact"), required_argument, NULL, IMAGEX_COMPACT_OPTION},
+ {T("recover-data"), no_argument, NULL, IMAGEX_RECOVER_DATA_OPTION},
{NULL, 0, NULL, 0},
};
static const struct option update_options[] = {
/* Careful: some of the options here set the defaults for update
* commands, but the flags given to an actual update command (and not to
- * `imagex update' itself are also handled in
- * update_command_add_option(). */
+ * wimupdate itself) are also handled in update_command_add_option(). */
{T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION},
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
{T("include-integrity"), no_argument, NULL, IMAGEX_INCLUDE_INTEGRITY_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},
+ {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION},
/* Default delete options */
{T("force"), no_argument, NULL, IMAGEX_FORCE_OPTION},
static tchar *
translate_text_to_tstr(char *text, size_t num_bytes, size_t *num_tchars_ret)
{
-#ifndef __WIN32__
+#ifndef _WIN32
/* On non-Windows, assume an ASCII-compatible encoding, such as UTF-8.
* */
*num_tchars_ret = num_bytes;
return text;
-#else /* !__WIN32__ */
+#else /* !_WIN32 */
/* On Windows, translate the text to UTF-16LE */
wchar_t *text_wstr;
size_t num_wchars;
}
*num_tchars_ret = num_wchars;
return text_wstr;
-#endif /* __WIN32__ */
+#endif /* _WIN32 */
}
static tchar *
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) {
* default installation. On UNIX-like systems, warn the
* user when fixing the target of an absolute symbolic
* link, so they know to disable this if they want. */
- #ifndef __WIN32__
+ #ifndef _WIN32
imagex_printf(T("\nWARNING: Adjusted target of "
"absolute symbolic link \"%"TS"\"\n"
" (Use --norpfix to capture "
}
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) {
return recognized;
}
-/* How many nonoption arguments each `imagex update' command expects */
+/* How many nonoption arguments each wimupdate command expects */
static const unsigned update_command_num_nonoptions[] = {
[WIMLIB_UPDATE_OP_ADD] = 2,
[WIMLIB_UPDATE_OP_DELETE] = 1,
}
/*
- * Parse a command passed on stdin to `imagex update'.
+ * Parse a command passed on stdin to wimupdate.
*
* @line: Text of the command.
* @len: Length of the line, including a null terminator
if (ret)
goto out_free_refglobs;
break;
+ case IMAGEX_RECOVER_DATA_OPTION:
+ extract_flags |= WIMLIB_EXTRACT_FLAG_RECOVER_DATA;
+ break;
default:
goto out_usage;
}
goto out_wimlib_free;
}
-#ifndef __WIN32__
+#ifndef _WIN32
{
/* Interpret a regular file or block device target as an NTFS
* volume. */
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);
goto out_free_wim;
}
-#ifndef __WIN32__
+#ifndef _WIN32
/* Detect if source is regular file or block device and set NTFS volume
* capture mode. */
if (!source_list) {
wimlib_iterate_lookup_table(wim, 0, print_resource, NULL);
}
-#ifndef __WIN32__
+#ifndef _WIN32
static void
default_print_security_descriptor(const uint8_t *sd, size_t size)
{
if (ret)
goto out_free_refglobs;
break;
+ case IMAGEX_RECOVER_DATA_OPTION:
+ extract_flags |= WIMLIB_EXTRACT_FLAG_RECOVER_DATA;
+ break;
default:
goto out_usage;
}
int solid_ctype = WIMLIB_COMPRESSION_TYPE_INVALID;
int ret;
WIMStruct *wim;
+ struct wimlib_wim_info info;
const tchar *wimfile;
off_t old_size;
off_t new_size;
case IMAGEX_SOLID_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_SOLID;
write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+ /* Reset the non-solid compression type to LZMS. */
+ if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
+ compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
break;
case IMAGEX_NO_SOLID_SORT_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT;
if (ret)
goto out;
- if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) {
+ wimlib_get_wim_info(wim, &info);
+
+ if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID &&
+ compression_type != info.compression_type) {
/* Change compression type. */
ret = wimlib_set_output_compression_type(wim, compression_type);
if (ret)
goto out_wimlib_free;
+
+ /* Reset the chunk size. */
+ if (chunk_size == UINT32_MAX)
+ chunk_size = 0;
}
if (chunk_size != UINT32_MAX) {
int c;
int open_flags = 0;
int write_flags = 0;
- unsigned long part_size;
+ uint64_t part_size;
tchar *tmp;
int ret;
WIMStruct *wim;
goto out;
ret = wimlib_split(wim, argv[1], part_size, write_flags);
+ if (ret == 0)
+ tprintf(T("\nFinished splitting \"%"TS"\"\n"), argv[0]);
wimlib_free(wim);
out:
return ret;
WIMLIB_ADD_FLAG_WINCONFIG;
int default_delete_flags = 0;
unsigned num_threads = 0;
+ STRING_LIST(refglobs);
int c;
tchar *cmd_file_contents;
size_t cmd_file_nchars;
case IMAGEX_WIMBOOT_CONFIG_OPTION:
wimboot_config = optarg;
break;
+ case IMAGEX_REF_OPTION:
+ ret = string_list_append(&refglobs, optarg);
+ if (ret)
+ goto out;
+ /* assume delta WIM */
+ write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS;
+ break;
/* Default delete options */
case IMAGEX_FORCE_OPTION:
default_delete_flags |= WIMLIB_DELETE_FLAG_FORCE;
ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim,
imagex_progress_func, NULL);
if (ret)
- goto out_free_command_str;
+ goto out;
if (argc >= 2) {
/* Image explicitly specified. */
image = 1;
}
+ ret = wim_reference_globs(wim, &refglobs, open_flags);
+ if (ret)
+ goto out_wimlib_free;
+
/* Read update commands from standard input, or the command string if
* specified. */
if (command_str) {
free(cmd_file_contents);
out_wimlib_free:
wimlib_free(wim);
-out_free_command_str:
+out:
free(command_str);
+ string_list_destroy(&refglobs);
return ret;
out_usage:
usage(CMD_UPDATE, stderr);
out_err:
ret = -1;
- goto out_free_command_str;
+ goto out;
}
/* Verify a WIM file. */
[CMD_VERIFY] = {T("verify"), imagex_verify},
};
-#ifdef __WIN32__
+#ifdef _WIN32
/* Can be a directory or source list file. But source list file is probably
* a rare use case, so just say directory. */
" [--check] [--ref=\"GLOB\"] [--no-acls] [--strict-acls]\n"
" [--no-attributes] [--rpfix] [--norpfix]\n"
" [--include-invalid-names] [--wimboot] [--unix-data]\n"
-" [--compact=FORMAT]\n"
+" [--compact=FORMAT] [--recover-data]\n"
),
[CMD_CAPTURE] =
T(
" %"TS" WIMFILE IMAGE [(PATH | @LISTFILE)...]\n"
" [--check] [--ref=\"GLOB\"] [--dest-dir=CMD_DIR]\n"
" [--to-stdout] [--no-acls] [--strict-acls]\n"
-" [--no-attributes] [--include-invalid-names]\n"
-" [--no-globs] [--nullglob] [--preserve-dir-structure]\n"
+" [--no-attributes] [--include-invalid-names] [--no-globs]\n"
+" [--nullglob] [--preserve-dir-structure] [--recover-data]\n"
),
[CMD_INFO] =
T(
static const tchar * const fmt =
T(
"wimlib-imagex " PACKAGE_VERSION " (using wimlib %"TS")\n"
-"Copyright (C) 2012-2018 Eric Biggers\n"
-"License GPLv3+; GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"Copyright 2012-2023 Eric Biggers\n"
+"License GPLv3+; GNU GPL version 3 or later <https://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"
"\n"
recommend_man_page(int cmd, FILE *fp)
{
const tchar *format_str;
-#ifdef __WIN32__
+#ifdef _WIN32
format_str = T("Some uncommon options are not listed;\n"
"See %"TS".pdf in the doc directory for more details.\n");
#else
recommend_man_page(CMD_NONE, fp);
}
-#ifdef __WIN32__
-extern int wmain(int argc, wchar_t **argv);
+#ifdef _WIN32
+int wmain(int argc, wchar_t **argv);
#define main wmain
#endif
git://wimlib.net / wimlib / blobdiff