Move VERBOSE flags to progress callbacks

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index 883b1e0527a55fc34f957995aec314790671582d..61a93fbef260e509120f702d36b3f70b1472f156 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -363,6 +363,12 @@ static int imagex_progress_func(enum wimlib_progress_msg msg,
        case WIMLIB_PROGRESS_MSG_SCAN_BEGIN:
                printf("Scanning `%s'...\n", info->scan.source);
                break;
+       case WIMLIB_PROGRESS_MSG_SCAN_DENTRY:
+               if (info->scan.excluded)
+                       printf("Excluding `%s' from capture\n", info->scan.cur_path);
+               else
+                       printf("Scanning `%s'\n", info->scan.cur_path);
+               break;
        /*case WIMLIB_PROGRESS_MSG_SCAN_END:*/
                /*break;*/
        case WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY:
@@ -413,6 +419,9 @@ static int imagex_progress_func(enum wimlib_progress_msg msg,
                if (info->extract.completed_bytes == info->extract.total_bytes)
                        putchar('\n');
                break;
+       case WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY:
+               puts(info->extract.cur_path);
+               break;
        case WIMLIB_PROGRESS_MSG_JOIN_STREAMS:
                percent_done = TO_PERCENT(info->join.completed_bytes,
                                          info->join.total_bytes);
@@ -1457,7 +1466,7 @@ static int imagex_mount_rw_or_ro(int argc, const char **argv)
        }
 
        ret = wimlib_mount_image(w, image, dir, mount_flags, additional_swms,
-                                num_additional_swms);
+                                num_additional_swms, NULL);
        if (ret != 0) {
                imagex_error("Failed to mount image %d from `%s' on `%s'",
                             image, wimfile, dir);
@@ -1615,7 +1624,8 @@ static int imagex_unmount(int argc, const char **argv)
                return -1;
        }
 
-       ret = wimlib_unmount_image(argv[0], unmount_flags);
+       ret = wimlib_unmount_image(argv[0], unmount_flags,
+                                  imagex_progress_func);
        if (ret != 0)
                imagex_error("Failed to unmount `%s'", argv[0]);
        return ret;