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))
break;
}
params->progress.scan.status = status;
- if (status == WIMLIB_SCAN_DENTRY_OK && inode->i_nlink == 1) {
-
- /* Successful scan, and visiting inode for the first time */
-
- /* Tally size of all streams. */
- for (unsigned i = 0; i < inode->i_num_streams; i++) {
- const struct blob_descriptor *blob =
- stream_blob_resolved(&inode->i_streams[i]);
- if (blob)
- params->progress.scan.num_bytes_scanned += blob->size;
+ if (status == WIMLIB_SCAN_DENTRY_OK) {
+
+ /* The first time the inode is seen, tally all its streams. */
+ if (inode->i_nlink == 1) {
+ for (unsigned i = 0; i < inode->i_num_streams; i++) {
+ const struct blob_descriptor *blob =
+ stream_blob_resolved(&inode->i_streams[i]);
+ if (blob)
+ params->progress.scan.num_bytes_scanned += blob->size;
+ }
}
- /* Tally the file itself. */
- if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY)
+ /* Tally the file itself, counting every hard link. It's
+ * debatable whether every link should be counted, but counting
+ * every link makes the statistics consistent with the ones
+ * placed in the FILECOUNT and DIRCOUNT elements of the WIM
+ * file's XML document. It also avoids possible user confusion
+ * if the number of files reported were to be lower than that
+ * displayed by some other software such as file browsers. */
+ if (inode_is_directory(inode))
params->progress.scan.num_dirs_scanned++;
else
params->progress.scan.num_nondirs_scanned++;
}
/* 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;
}
/*
* Note: we expect that this function produces patterns that can be used
* for both filesystem paths and WIM paths, so the desired path
* separators must be the same. */
- BUILD_BUG_ON(OS_PREFERRED_PATH_SEPARATOR != WIM_PATH_SEPARATOR);
+ STATIC_ASSERT(OS_PREFERRED_PATH_SEPARATOR == WIM_PATH_SEPARATOR);
do_canonicalize_path(pat, pat);
/* Relative patterns can only match file names, so they must be
return false;
}
+
+/* Attach a newly scanned directory tree to its parent directory, with duplicate
+ * handling. */
+void
+attach_scanned_tree(struct wim_dentry *parent, struct wim_dentry *child,
+ struct blob_table *blob_table)
+{
+ struct wim_dentry *duplicate;
+
+ if (child && (duplicate = dentry_add_child(parent, child))) {
+ WARNING("Duplicate file path: \"%"TS"\". Only capturing "
+ "the first version.", dentry_full_path(duplicate));
+ free_dentry_tree(child, blob_table);
+ }
+}