have been slightly tweaked.
Progress information for directory tree scans now counts all hard links.
+ Also, on Windows "\\?\" is no longer stripped from the current path.
Added a new '--image-property' option to 'wimcapture', 'wimappend', and
'wiminfo'. This option lets you assign values to elements in a WIM
do_capture_progress(struct capture_params *params, int status,
const struct wim_inode *inode)
{
+ int ret;
+ tchar *cookie;
+
switch (status) {
case WIMLIB_SCAN_DENTRY_OK:
if (!(params->add_flags & WIMLIB_ADD_FLAG_VERBOSE))
}
/* Call the user-provided progress function. */
- return call_progress(params->progfunc, WIMLIB_PROGRESS_MSG_SCAN_DENTRY,
+
+ cookie = progress_get_win32_path(params->progress.scan.cur_path);
+ ret = call_progress(params->progfunc, WIMLIB_PROGRESS_MSG_SCAN_DENTRY,
¶ms->progress, params->progctx);
+ progress_put_win32_path(cookie);
+ return ret;
}
/*
wmemcpy(print_name0, link->print_name, print_name_nchars);
print_name0[print_name_nchars] = L'\0';
- params->progress.scan.cur_path = printable_path(path);
+ params->progress.scan.cur_path = path;
params->progress.scan.symlink_target = print_name0;
return do_capture_progress(params, scan_status, NULL);
}
}
out_progress:
- ctx->params->progress.scan.cur_path = printable_path(full_path);
+ ctx->params->progress.scan.cur_path = full_path;
if (likely(root))
ret = do_capture_progress(ctx->params, WIMLIB_SCAN_DENTRY_OK, inode);
else
}
out_progress:
- ctx->params->progress.scan.cur_path = printable_path(path);
+ ctx->params->progress.scan.cur_path = path;
if (likely(root))
ret = do_capture_progress(ctx->params, WIMLIB_SCAN_DENTRY_OK, inode);
else