]> wimlib.net Git - wimlib/blobdiff - programs/imagex.c
git://wimlib.net / wimlib / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Replace unnamed union initializers
[wimlib] / programs / imagex.c
diff --git a/programs/imagex.c b/programs/imagex.c
index 466eaf9e04f2f134eed46e55045e20b417bd073e..644a2babdea58bad76431405ebd636dbb814db2a 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -173,6 +173,7 @@ enum {
        IMAGEX_NOT_PIPABLE_OPTION,
        IMAGEX_NO_ACLS_OPTION,
        IMAGEX_NO_ATTRIBUTES_OPTION,
+       IMAGEX_NO_REPLACE_OPTION,
        IMAGEX_NO_WILDCARDS_OPTION,
        IMAGEX_NULLGLOB_OPTION,
        IMAGEX_ONE_FILE_ONLY_OPTION,
@@ -200,6 +201,7 @@ enum {
        IMAGEX_UPDATE_OF_OPTION,
        IMAGEX_VERBOSE_OPTION,
        IMAGEX_WIMBOOT_OPTION,
+       IMAGEX_WIMBOOT_CONFIG_OPTION,
        IMAGEX_XML_OPTION,
 };
 
@@ -386,6 +388,7 @@ static const struct option update_options[] = {
        {T("check"),       no_argument,       NULL, IMAGEX_CHECK_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},
 
        /* Default delete options */
        {T("force"),       no_argument,       NULL, IMAGEX_FORCE_OPTION},
@@ -401,6 +404,7 @@ static const struct option update_options[] = {
        {T("noacls"),      no_argument,       NULL, IMAGEX_NO_ACLS_OPTION},
        {T("no-acls"),     no_argument,       NULL, IMAGEX_NO_ACLS_OPTION},
        {T("strict-acls"), no_argument,       NULL, IMAGEX_STRICT_ACLS_OPTION},
+       {T("no-replace"),  no_argument,       NULL, IMAGEX_NO_REPLACE_OPTION},
 
        {NULL, 0, NULL, 0},
 };
@@ -1051,28 +1055,13 @@ imagex_progress_func(enum wimlib_progress_msg msg,
                percent_done = TO_PERCENT(info->write_streams.completed_bytes,
                                          info->write_streams.total_bytes);
 
-               if (info->write_streams.total_parts <= 1) {
-                       imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) "
-                               "written (%u%% done)"),
-                               info->write_streams.completed_bytes >> unit_shift,
-                               unit_name,
-                               info->write_streams.total_bytes >> unit_shift,
-                               unit_name,
-                               percent_done);
-               } else {
-                       imagex_printf(T("\rWriting resources from part %u of %u: "
-                                 "%"PRIu64 " %"TS" of %"PRIu64" %"TS" (%u%%) written"),
-                               (info->write_streams.completed_parts ==
-                                       info->write_streams.total_parts) ?
-                                               info->write_streams.completed_parts :
-                                               info->write_streams.completed_parts + 1,
-                               info->write_streams.total_parts,
-                               info->write_streams.completed_bytes >> unit_shift,
-                               unit_name,
-                               info->write_streams.total_bytes >> unit_shift,
-                               unit_name,
-                               percent_done);
-               }
+               imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) "
+                       "written (%u%% done)"),
+                       info->write_streams.completed_bytes >> unit_shift,
+                       unit_name,
+                       info->write_streams.total_bytes >> unit_shift,
+                       unit_name,
+                       percent_done);
                if (info->write_streams.completed_bytes >= info->write_streams.total_bytes)
                        imagex_printf(T("\n"));
                break;
@@ -1235,6 +1224,10 @@ imagex_progress_func(enum wimlib_progress_msg msg,
                        break;
                }
                break;
+       case WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM:
+               imagex_printf(T("Updating \"%"TS"\" in WIM image\n"),
+                             info->replace.path_in_wim);
+               break;
        default:
                break;
        }
@@ -1298,6 +1291,8 @@ update_command_add_option(int op, const tchar *option,
                        cmd->add.add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS;
                else if (!tstrcmp(option, T("--dereference")))
                        cmd->add.add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE;
+               else if (!tstrcmp(option, T("--no-replace")))
+                       cmd->add.add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE;
                else
                        recognized = false;
                break;
@@ -3712,6 +3707,7 @@ imagex_update(int argc, tchar **argv, int cmd)
        size_t num_cmds;
        tchar *command_str = NULL;
        tchar *config_file = NULL;
+       tchar *wimboot_config = NULL;
 
        for_opt(c, update_options) {
                switch (c) {
@@ -3742,6 +3738,9 @@ imagex_update(int argc, tchar **argv, int cmd)
                                goto out_err;
                        }
                        break;
+               case IMAGEX_WIMBOOT_CONFIG_OPTION:
+                       wimboot_config = optarg;
+                       break;
                /* Default delete options */
                case IMAGEX_FORCE_OPTION:
                        default_delete_flags |= WIMLIB_DELETE_FLAG_FORCE;
@@ -3772,6 +3771,9 @@ imagex_update(int argc, tchar **argv, int cmd)
                case IMAGEX_STRICT_ACLS_OPTION:
                        default_add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS;
                        break;
+               case IMAGEX_NO_REPLACE_OPTION:
+                       default_add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE;
+                       break;
                default:
                        goto out_usage;
                }
@@ -3815,7 +3817,11 @@ imagex_update(int argc, tchar **argv, int cmd)
                cmd_file_contents = NULL;
                cmds = parse_update_command_file(&command_str, tstrlen(command_str),
                                                 &num_cmds);
-       } else {
+               if (!cmds) {
+                       ret = -1;
+                       goto out_free_cmd_file_contents;
+               }
+       } else if (!wimboot_config) {
                if (isatty(STDIN_FILENO)) {
                        tputs(T("Reading update commands from standard input..."));
                        recommend_man_page(CMD_UPDATE, stdout);
@@ -3829,10 +3835,14 @@ imagex_update(int argc, tchar **argv, int cmd)
                /* Parse the update commands */
                cmds = parse_update_command_file(&cmd_file_contents, cmd_file_nchars,
                                                 &num_cmds);
-       }
-       if (!cmds) {
-               ret = -1;
-               goto out_free_cmd_file_contents;
+               if (!cmds) {
+                       ret = -1;
+                       goto out_free_cmd_file_contents;
+               }
+       } else {
+               cmd_file_contents = NULL;
+               cmds = NULL;
+               num_cmds = 0;
        }
 
        /* Set default flags and capture config on the update commands */
@@ -3856,6 +3866,24 @@ imagex_update(int argc, tchar **argv, int cmd)
        if (ret)
                goto out_free_cmds;
 
+       if (wimboot_config) {
+               /* --wimboot-config=FILE is short for an
+                * "add FILE /Windows/System32/WimBootCompress.ini" command.
+                */
+               struct wimlib_update_command cmd;
+
+               cmd.op = WIMLIB_UPDATE_OP_ADD;
+               cmd.add.fs_source_path = wimboot_config;
+               cmd.add.wim_target_path = T("/Windows/System32/WimBootCompress.ini");
+               cmd.add.config_file = NULL;
+               cmd.add.add_flags = 0;
+
+               ret = wimlib_update_image(wim, image, &cmd, 1,
+                                         update_flags, imagex_progress_func);
+               if (ret)
+                       goto out_free_cmds;
+       }
+
        /* Overwrite the updated WIM */
        ret = wimlib_overwrite(wim, write_flags, num_threads,
                               imagex_progress_func);
@@ -3913,7 +3941,7 @@ T(
 "                    [--nocheck] [--flags EDITION_ID] [--dereference]\n"
 "                    [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n"
 "                    [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n"
-"                    [--update-of=[WIMFILE:]IMAGE]\n"
+"                    [--update-of=[WIMFILE:]IMAGE] [--wimboot]\n"
 ),
 [CMD_APPLY] =
 T(
@@ -3921,7 +3949,7 @@ T(
 "                    (DIRECTORY | NTFS_VOLUME) [--check] [--ref=\"GLOB\"]\n"
 "                    [--no-acls] [--strict-acls] [--no-attributes]\n"
 "                    [--rpfix] [--norpfix] [--hardlink] [--symlink]\n"
-"                    [--include-invalid-names]\n"
+"                    [--include-invalid-names] [--wimboot]\n"
 ),
 [CMD_CAPTURE] =
 T(
@@ -3931,7 +3959,7 @@ T(
 "                    [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n"
 "                    [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n"
 "                    [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n"
-"                    [--delta-from=WIMFILE]\n"
+"                    [--delta-from=WIMFILE] [--wimboot]\n"
 ),
 [CMD_DELETE] =
 T(
@@ -4002,7 +4030,8 @@ T(
 T(
 "    %"TS" WIMFILE [IMAGE_NUM | IMAGE_NAME] [--check] [--rebuild]\n"
 "                    [--threads=NUM_THREADS] [DEFAULT_ADD_OPTIONS]\n"
-"                    [DEFAULT_DELETE_OPTIONS] [--command=STRING] [< CMDFILE]\n"
+"                    [DEFAULT_DELETE_OPTIONS] [--command=STRING]\n"
+"                    [--wimboot-config=FILE| [< CMDFILE]\n"
 ),
 };
 
wimlib repository