X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=da58a147f6cb61d733f671545d38e39c25b8054d;hp=90b53dd6bd815165ca30cb6ede5ee4b29d400338;hb=4f754f1026513b5a17d2f455d306488ac1f7975a;hpb=ca1be480fd209d8c24e19350e440c01832310a2d diff --git a/programs/imagex.c b/programs/imagex.c index 90b53dd6..da58a147 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -1032,10 +1032,18 @@ imagex_progress_func(enum wimlib_progress_msg msg, } break; case WIMLIB_PROGRESS_MSG_SCAN_DENTRY: - if (info->scan.excluded) - imagex_printf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path); - else + switch (info->scan.status) { + case WIMLIB_SCAN_DENTRY_OK: imagex_printf(T("Scanning \"%"TS"\"\n"), info->scan.cur_path); + break; + case WIMLIB_SCAN_DENTRY_EXCLUDED: + imagex_printf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path); + break; + case WIMLIB_SCAN_DENTRY_UNSUPPORTED: + imagex_printf(T("WARNING: Excluding unsupported file or directory\n" + " \"%"TS"\" from capture\n"), info->scan.cur_path); + break; + } break; case WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY: unit_shift = get_unit(info->integrity.total_bytes, &unit_name); @@ -3365,13 +3373,11 @@ imagex_update(int argc, tchar **argv, int cmd) } /* Set default flags and capture config on the update commands */ - bool have_add_command = false; for (size_t i = 0; i < num_cmds; i++) { switch (cmds[i].op) { case WIMLIB_UPDATE_OP_ADD: cmds[i].add.add_flags |= default_add_flags; cmds[i].add.config = config; - have_add_command = true; break; case WIMLIB_UPDATE_OP_DELETE: cmds[i].delete.delete_flags |= default_delete_flags;