*/
/*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012, 2013, 2014 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
#ifdef __WIN32__
# include "imagex-win32.h"
-# define tbasename win32_wbasename
# define OS_PREFERRED_PATH_SEPARATOR L'\\'
# define OS_PREFERRED_PATH_SEPARATOR_STRING L"\\"
# define print_security_descriptor win32_print_security_descriptor
#else /* __WIN32__ */
-# include <glob.h>
# include <getopt.h>
# include <langinfo.h>
-# define tbasename basename
# define OS_PREFERRED_PATH_SEPARATOR '/'
# define OS_PREFERRED_PATH_SEPARATOR_STRING "/"
# define print_security_descriptor default_print_security_descriptor
#define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0]))
+static inline bool
+is_any_path_separator(tchar c)
+{
+ return c == T('/') || c == T('\\');
+}
+
+/* Like basename(), but handles both forward and backwards slashes. */
+static tchar *
+tbasename(tchar *path)
+{
+ tchar *p = tstrchr(path, T('\0'));
+
+ for (;;) {
+ if (p == path)
+ return path;
+ if (!is_any_path_separator(*--p))
+ break;
+ *p = T('\0');
+ }
+
+ for (;;) {
+ if (p == path)
+ return path;
+ if (is_any_path_separator(*--p))
+ return ++p;
+ }
+}
+
#define for_opt(c, opts) while ((c = getopt_long_only(argc, (tchar**)argv, T(""), \
opts, NULL)) != -1)
IMAGEX_LAZY_OPTION,
IMAGEX_LOOKUP_TABLE_OPTION,
IMAGEX_METADATA_OPTION,
- IMAGEX_NORPFIX_OPTION,
+ IMAGEX_NEW_IMAGE_OPTION,
IMAGEX_NOCHECK_OPTION,
+ IMAGEX_NORPFIX_OPTION,
+ IMAGEX_NOT_PIPABLE_OPTION,
IMAGEX_NO_ACLS_OPTION,
IMAGEX_NO_ATTRIBUTES_OPTION,
IMAGEX_NO_WILDCARDS_OPTION,
+ IMAGEX_NULLGLOB_OPTION,
IMAGEX_ONE_FILE_ONLY_OPTION,
- IMAGEX_NOT_PIPABLE_OPTION,
IMAGEX_PACK_CHUNK_SIZE_OPTION,
IMAGEX_PACK_STREAMS_OPTION,
IMAGEX_PATH_OPTION,
IMAGEX_PIPABLE_OPTION,
+ IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION,
IMAGEX_REBUILD_OPTION,
IMAGEX_RECOMPRESS_OPTION,
IMAGEX_RECURSIVE_OPTION,
IMAGEX_STAGING_DIR_OPTION,
IMAGEX_STREAMS_INTERFACE_OPTION,
IMAGEX_STRICT_ACLS_OPTION,
- IMAGEX_STRICT_WILDCARDS_OPTION,
IMAGEX_SYMLINK_OPTION,
IMAGEX_THREADS_OPTION,
IMAGEX_TO_STDOUT_OPTION,
IMAGEX_UNIX_DATA_OPTION,
IMAGEX_UPDATE_OF_OPTION,
IMAGEX_VERBOSE_OPTION,
+ IMAGEX_WIMBOOT_OPTION,
IMAGEX_XML_OPTION,
};
/* --resume is undocumented for now as it needs improvement. */
{T("resume"), no_argument, NULL, IMAGEX_RESUME_OPTION},
+ {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION},
{NULL, 0, NULL, 0},
};
{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},
+ {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION},
{NULL, 0, NULL, 0},
};
{T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
{T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION},
{T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION},
+ {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION},
{T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION},
{T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION},
{T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
{T("dest-dir"), required_argument, NULL, IMAGEX_DEST_DIR_OPTION},
{T("to-stdout"), no_argument, NULL, IMAGEX_TO_STDOUT_OPTION},
{T("include-invalid-names"), no_argument, NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION},
- {T("strict-wildcards"), no_argument, NULL, IMAGEX_STRICT_WILDCARDS_OPTION},
{T("no-wildcards"), no_argument, NULL, IMAGEX_NO_WILDCARDS_OPTION},
+ {T("nullglob"), no_argument, NULL, IMAGEX_NULLGLOB_OPTION},
+ {T("preserve-dir-structure"), no_argument, NULL, IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION},
+ {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION},
{NULL, 0, NULL, 0},
};
{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
{T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION},
{T("lazy"), no_argument, NULL, IMAGEX_LAZY_OPTION},
+ {T("new-image"), no_argument, NULL, IMAGEX_NEW_IMAGE_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, ...)
is_comment_line(const tchar *line, size_t len)
{
for (;;) {
- if (*line == T('#'))
+ if (*line == T('#') || *line == T(';'))
return true;
if (!istspace(*line) && *line != T('\0'))
return false;
"of capture config file\n"),
stderr);
} else {
- imagex_error(T("Invalid capture config file section \"%"TS"\""),
- line - 1);
+ imagex_warning(T("Unknown capture config file section \"%"TS"\""),
+ line - 1);
return CAPTURE_CONFIG_INVALID_SECTION;
}
return CAPTURE_CONFIG_CHANGED_SECTION;
int ret;
ret = check_config_section(line, len, cur_section);
- if (ret == CAPTURE_CONFIG_INVALID_SECTION)
- return false;
- if (ret == CAPTURE_CONFIG_CHANGED_SECTION)
+ if (ret == CAPTURE_CONFIG_CHANGED_SECTION ||
+ ret == CAPTURE_CONFIG_INVALID_SECTION)
return true;
switch (*cur_section) {
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;
info->extract.target);
break;
case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN:
- if (info->extract.extract_root_wim_source_path[0] != T('\0')) {
- imagex_printf(T("Extracting "
- "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"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);
+ 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:
case IMAGEX_RESUME_OPTION:
extract_flags |= WIMLIB_EXTRACT_FLAG_RESUME;
break;
+ case IMAGEX_WIMBOOT_OPTION:
+ extract_flags |= WIMLIB_EXTRACT_FLAG_WIMBOOT;
+ break;
default:
goto out_usage;
}
tchar *source;
tchar *source_copy;
- const tchar *config_file = NULL;
+ tchar *config_file = NULL;
tchar *config_str;
struct wimlib_capture_config *config;
goto out_free_base_wimfiles;
write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS;
break;
+ case IMAGEX_WIMBOOT_OPTION:
+ add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_WIMBOOT;
+ break;
default:
goto out_usage;
}
if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) {
- compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
-
- if (!compress_slow) {
- struct wimlib_lzx_compressor_params params = {
- .hdr.size = sizeof(params),
- .algorithm = WIMLIB_LZX_ALGORITHM_FAST,
- .use_defaults = 1,
- };
- wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX,
- ¶ms.hdr);
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) {
+ compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
+ } else {
+ compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+ if (!compress_slow) {
+ struct wimlib_lzx_compressor_params params = {
+ .hdr.size = sizeof(params),
+ .algorithm = WIMLIB_LZX_ALGORITHM_FAST,
+ .use_defaults = 1,
+ };
+ wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX,
+ ¶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
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) &&
+ compression_type == WIMLIB_COMPRESSION_TYPE_XPRESS) {
+ ret = wimlib_set_output_chunk_size(wim, 4096);
+ if (ret)
+ goto out_free_wim;
}
if (pack_chunk_size != UINT32_MAX) {
ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size);
if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
goto out_err;
break;
+ case IMAGEX_COMPRESS_SLOW_OPTION:
+ write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+ set_compress_slow();
+ break;
case IMAGEX_PACK_STREAMS_OPTION:
write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
break;
goto out_free_refglobs;
}
-static bool
-is_root_wim_path(const tchar *path)
-{
- const tchar *p;
- for (p = path; *p; p++)
- if (*p != T('\\') && *p != T('/'))
- return false;
- return true;
-}
-
-static void
-free_extract_commands(struct wimlib_extract_command *cmds, size_t num_cmds,
- const tchar *dest_dir)
-{
- for (size_t i = 0; i < num_cmds; i++)
- if (cmds[i].fs_dest_path != dest_dir)
- free(cmds[i].fs_dest_path);
- free(cmds);
-}
-
-static struct wimlib_extract_command *
-prepare_extract_commands(tchar **paths, unsigned num_paths,
- int extract_flags, tchar *dest_dir,
- size_t *num_cmds_ret)
-{
- struct wimlib_extract_command *cmds;
- size_t num_cmds;
- tchar *emptystr = T("");
-
- if (num_paths == 0) {
- num_paths = 1;
- paths = &emptystr;
- }
- num_cmds = num_paths;
- cmds = calloc(num_cmds, sizeof(cmds[0]));
- if (!cmds) {
- imagex_error(T("Out of memory!"));
- return NULL;
- }
-
- for (size_t i = 0; i < num_cmds; i++) {
- cmds[i].extract_flags = extract_flags;
- cmds[i].wim_source_path = paths[i];
- if (is_root_wim_path(paths[i])) {
- cmds[i].fs_dest_path = dest_dir;
- } else {
- size_t len = tstrlen(dest_dir) + 1 + tstrlen(paths[i]);
- cmds[i].fs_dest_path = malloc((len + 1) * sizeof(tchar));
- if (!cmds[i].fs_dest_path) {
- free_extract_commands(cmds, num_cmds, dest_dir);
- return NULL;
- }
- tsprintf(cmds[i].fs_dest_path,
- T("%"TS""OS_PREFERRED_PATH_SEPARATOR_STRING"%"TS),
- dest_dir, tbasename(paths[i]));
- }
- }
- *num_cmds_ret = num_cmds;
- return cmds;
-}
-
/* Extract files or directories from a WIM image */
static int
imagex_extract(int argc, tchar **argv, int cmd)
int ret;
const tchar *wimfile;
const tchar *image_num_or_name;
- const tchar *pathlist;
tchar *dest_dir = T(".");
- int extract_flags = WIMLIB_EXTRACT_FLAG_NORPFIX;
- int listfile_extract_flags = WIMLIB_EXTRACT_FLAG_GLOB_PATHS;
+ int extract_flags = WIMLIB_EXTRACT_FLAG_NORPFIX |
+ WIMLIB_EXTRACT_FLAG_GLOB_PATHS |
+ WIMLIB_EXTRACT_FLAG_STRICT_GLOB;
+ int notlist_extract_flags = WIMLIB_EXTRACT_FLAG_NO_PRESERVE_DIR_STRUCTURE;
STRING_SET(refglobs);
- struct wimlib_extract_command *cmds;
- size_t num_cmds;
+ tchar *root_path = T("");
for_opt(c, extract_options) {
switch (c) {
extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS;
break;
case IMAGEX_NO_WILDCARDS_OPTION:
- listfile_extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS;
+ extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS;
+ break;
+ case IMAGEX_NULLGLOB_OPTION:
+ extract_flags &= ~WIMLIB_EXTRACT_FLAG_STRICT_GLOB;
+ break;
+ case IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION:
+ notlist_extract_flags &= ~WIMLIB_EXTRACT_FLAG_NO_PRESERVE_DIR_STRUCTURE;
break;
- case IMAGEX_STRICT_WILDCARDS_OPTION:
- listfile_extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_GLOB;
+ case IMAGEX_WIMBOOT_OPTION:
+ extract_flags |= WIMLIB_EXTRACT_FLAG_WIMBOOT;
break;
default:
goto out_usage;
if (argc < 2)
goto out_usage;
+ if (!(extract_flags & (WIMLIB_EXTRACT_FLAG_GLOB_PATHS |
+ WIMLIB_EXTRACT_FLAG_STRICT_GLOB)))
+ {
+ imagex_error(T("Can't combine --no-wildcards and --nullglob!"));
+ goto out_err;
+ }
+
wimfile = argv[0];
image_num_or_name = argv[1];
argc -= 2;
argv += 2;
- if (argc == 1 && argv[0][0] == T('@')) {
- pathlist = argv[0] + 1;
- cmds = NULL;
- num_cmds = 0;
- } else {
- cmds = prepare_extract_commands(argv, argc, extract_flags, dest_dir,
- &num_cmds);
- if (cmds == NULL)
- goto out_err;
- pathlist = NULL;
- }
-
ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func);
if (ret)
- goto out_free_cmds;
+ goto out_free_refglobs;
image = wimlib_resolve_image(wim, image_num_or_name);
ret = verify_image_exists_and_is_single(image,
goto out_wimlib_free;
}
- ret = 0;
- if (ret == 0 && cmds != NULL) {
- ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0,
- imagex_progress_func);
+ if (argc == 0) {
+ argv = &root_path;
+ argc = 1;
+ extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS;
}
- if (ret == 0 && pathlist != NULL) {
- ret = wimlib_extract_pathlist(wim, image, dest_dir,
- pathlist,
- extract_flags | listfile_extract_flags,
- imagex_progress_func);
+
+ while (argc != 0 && ret == 0) {
+ int num_paths;
+
+ for (num_paths = 0;
+ num_paths < argc && argv[num_paths][0] != T('@');
+ num_paths++)
+ ;
+
+ if (num_paths) {
+ ret = wimlib_extract_paths(wim, image, dest_dir,
+ (const tchar **)argv,
+ num_paths,
+ extract_flags | notlist_extract_flags,
+ imagex_progress_func);
+ argc -= num_paths;
+ argv += num_paths;
+ } else {
+ ret = wimlib_extract_pathlist(wim, image, dest_dir,
+ argv[0] + 1,
+ extract_flags,
+ imagex_progress_func);
+ argc--;
+ argv++;
+ }
}
+
if (ret == 0) {
if (!imagex_be_quiet)
imagex_printf(T("Done extracting files.\n"));
}
out_wimlib_free:
wimlib_free(wim);
-out_free_cmds:
- free_extract_commands(cmds, num_cmds, dest_dir);
out_free_refglobs:
string_set_destroy(&refglobs);
return ret;
case IMAGEX_LAZY_OPTION:
unmount_flags |= WIMLIB_UNMOUNT_FLAG_LAZY;
break;
+ case IMAGEX_NEW_IMAGE_OPTION:
+ unmount_flags |= WIMLIB_UNMOUNT_FLAG_NEW_IMAGE;
+ break;
default:
goto out_usage;
}
if (argc != 1)
goto out_usage;
+ if (unmount_flags & WIMLIB_UNMOUNT_FLAG_NEW_IMAGE) {
+ if (!(unmount_flags & WIMLIB_UNMOUNT_FLAG_COMMIT)) {
+ imagex_error(T("--new-image is meaningless "
+ "without --commit also specified!"));
+ goto out_err;
+ }
+ imagex_printf(T("Committing changes as new image...\n"));
+ }
+
ret = wimlib_unmount_image(argv[0], unmount_flags,
imagex_progress_func);
if (ret)
out_usage:
usage(CMD_UNMOUNT, stderr);
+out_err:
ret = -1;
goto out;
}
),
[CMD_EXTRACT] =
T(
-" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) ([PATH...] | @LISTFILE)\n"
-" [--check] [--ref=\"GLOB\"] [--no-acls] [--strict-acls]\n"
-" [--no-attributes] [--to-stdout] [--dest-dir=CMD_DIR]\n"
-" [--include-invalid-names]\n"
+" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) [(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-wildcards] [--nullglob] [--preserve-dir-structure]\n"
),
[CMD_INFO] =
T(
[CMD_UNMOUNT] =
T(
" %"TS" DIRECTORY [--commit] [--check] [--rebuild] [--lazy]\n"
+" [--new-image]\n"
),
#endif
[CMD_UPDATE] =
{
static const tchar *s =
T(
-IMAGEX_PROGNAME " (" PACKAGE ") " PACKAGE_VERSION "\n"
-"Copyright (C) 2012, 2013 Eric Biggers\n"
+IMAGEX_PROGNAME " (distributed with " PACKAGE " " PACKAGE_VERSION ")\n"
+"Copyright (C) 2012, 2013, 2014 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"
git://wimlib.net / wimlib / blobdiff