Move VERBOSE flags to progress callbacks

[wimlib] / src / ntfs-apply.c

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 61199b81ac3c154220f8738c1de13a78f5e7f018..7522ec898f9e6aada30cde4fde4ea33d9eddecc7 100644 (file)
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -600,10 +600,16 @@ int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg)
                if (inode_unnamed_lte_resolved(dentry->d_inode))
                        return 0;
 
                if (inode_unnamed_lte_resolved(dentry->d_inode))
                        return 0;
 

+

        DEBUG("Applying dentry `%s' to NTFS", dentry->full_path_utf8);
 
        DEBUG("Applying dentry `%s' to NTFS", dentry->full_path_utf8);
 

-       if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE)
-               puts(dentry->full_path_utf8);
+       if ((extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) &&
+            args->progress_func)
+       {
+               args->progress.extract.cur_path = dentry->full_path_utf8;
+               args->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY,
+                                   &args->progress);
+       }

 
        if (dentry_is_root(dentry))
                return wim_apply_root_dentry_ntfs(dentry, vol, w);
 
        if (dentry_is_root(dentry))
                return wim_apply_root_dentry_ntfs(dentry, vol, w);