wimupdate: Add --no-replace default option

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index d5167e8b25d8c6629d0c8eba6d541eebc6086b05..c3a08e8e1ff08f6e4f1e26a70afdab2b2032edbb 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,
@@ -401,6 +402,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},
 };
@@ -1235,6 +1237,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 +1304,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;
@@ -1476,7 +1484,7 @@ parse_update_command_file(tchar **cmd_file_contents_p, size_t cmd_file_nchars,
        return cmds;
 }
 
-/* Apply one image, or all images, from a WIM file into a directory, OR apply
+/* Apply one image, or all images, from a WIM file to a directory, OR apply
  * one image from a WIM file to a NTFS volume.  */
 static int
 imagex_apply(int argc, tchar **argv, int cmd)
@@ -3772,6 +3780,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;
                }
@@ -4226,7 +4237,7 @@ main(int argc, char **argv)
                exit(2);
        }
 
-       /* Enable warning and error messages in wimlib be more user-friendly.
+       /* Enable warning and error messages in wimlib to be more user-friendly.
         * */
        wimlib_set_print_errors(true);