From edcb6f0d4a843d4e05a7b7e3b72006ac4b4acf6f Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 9 Jan 2016 11:53:16 -0600 Subject: [PATCH] Report every link in scan progress --- NEWS | 2 ++ include/wimlib.h | 6 ++---- src/capture_common.c | 30 ++++++++++++++++++------------ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index e20b859f..602c1dab 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,8 @@ Version 1.9.0-BETA: The progress messages printed by wimlib-imagex while writing WIM files have been slightly tweaked. + Progress information for directory tree scans now counts all hard links. + Added a new '--image-property' option to 'wimcapture', 'wimappend', and 'wiminfo'. This option lets you assign values to elements in a WIM file's XML document by name. diff --git a/include/wimlib.h b/include/wimlib.h index 2e5ba3c6..33f124b9 100644 --- a/include/wimlib.h +++ b/include/wimlib.h @@ -856,13 +856,11 @@ union wimlib_progress_info { uint64_t num_dirs_scanned; /** The number of non-directories scanned so far, not counting - * excluded/unsupported files. If a file has multiple names - * (hard links), it is only counted one time. */ + * excluded/unsupported files. */ uint64_t num_nondirs_scanned; /** The number of bytes of file data detected so far, not - * counting excluded/unsupported files. If a file has multiple - * names (hard links), its data is counted only one time. */ + * counting excluded/unsupported files. */ uint64_t num_bytes_scanned; } scan; diff --git a/src/capture_common.c b/src/capture_common.c index 0a2f26cd..82794971 100644 --- a/src/capture_common.c +++ b/src/capture_common.c @@ -67,20 +67,26 @@ do_capture_progress(struct capture_params *params, int status, 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++; -- 2.43.0