Check for rename loops

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index d5167e8b25d8c6629d0c8eba6d541eebc6086b05..81771898906b3a6566d0ca7134cb97a7c33aafda 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -1235,6 +1235,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 +1302,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 +1482,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)
@@ -4226,7 +4232,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);