opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed displaying progress percentage for metadata images 

When building (options -ms) or restoring a metadata image, the progress
percentages were wrong (evaluated against a wrong base)
edge.strict_endians
Jean-Pierre André 2012-08-20 13:44:33 +02:00
parent f61b34ee2c
commit ba3cb2c88b
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ntfsprogs/ntfsclone.c
View File

@ -1233,7 +1233,7 @@ static void clone_logfile_parts(ntfs_walk_clusters_ctx *image, runlist *rl)
copy_cluster(opt.rescue, lcn, lcn);
image->current_lcn = lcn + 1;
if (opt.metadata_image)
if (opt.metadata_image && !wipe)
image->inuse++;
if (offset == 0)
@ -1513,8 +1513,6 @@ static void dump_clusters(ntfs_walk_clusters_ctx *image, runlist *rl)
copy_cluster(opt.rescue, rl->lcn + i, rl->lcn + i);
image->current_lcn = rl->lcn + len;
}
if (opt.metadata_image)
image->inuse += len;
}
static void walk_runs(struct ntfs_walk_cluster *walk)
@ -1583,6 +1581,24 @@ static void walk_runs(struct ntfs_walk_cluster *walk)
if (!opt.metadata_image)
walk->image->inuse += lcn_length;
/*
* For a metadata image, we have to compute the
* number of metadata clusters for the percentages
* to be displayed correctly while restoring.
*/
if (!wipe && opt.metadata_image) {
if ((walk->image->ni->mft_no == FILE_LogFile)
&& (walk->image->ctx->attr->type == AT_DATA)) {
/* 16 KiB of FILE_LogFile */
walk->image->inuse
+= is_critical_metadata(walk->image,rl);
} else {
if ((walk->image->ni->mft_no
<= LAST_METADATA_INODE)
|| (walk->image->ctx->attr->type != AT_DATA))
walk->image->inuse += lcn_length;
}
}
}
if (wipe && opt.metadata_image) {
if (mft_data)
@ -1811,7 +1827,9 @@ out:
if (opt.metadata_image ? wipe : !wipe)
copy_cluster(opt.rescue, nr_clusters, nr_clusters);
walk->image->current_lcn = nr_clusters;
walk->image->inuse++;
/* Not counted, for compatibility with older versions */
if (!opt.metadata_image)
walk->image->inuse++;
}
return 0;
}