mirrors/ntfs-3g
0
0
Fork 0
mirror of https://git.code.sf.net/p/ntfs-3g/ntfs-3g.git synced 2024-12-04 15:34:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

- fix mangled formatting in ntfsclone: use more space for wipe statistics

Browse Source
This commit is contained in:
szaka 2005-06-12 14:35:57 +00:00
parent 532e1b71cf
commit 6e1106fc79
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.ntfsprogs
View File

@ -27,9 +27,7 @@ Thanks,
- get rid of the unneeded lseek()'s during reads/writes (probably it - get rid of the unneeded lseek()'s during reads/writes (probably it
doesn't improve performance much, or any at all) doesn't improve performance much, or any at all)
- catch if source and dest are the same - catch if source and dest are the same
- rescue: when reading a cluster fails then try rescue at the sector level
- disable consistency check for --metadata (e.g. if the check is crashing) - disable consistency check for --metadata (e.g. if the check is crashing)
- make "wiped", etc statistic variables long long
- option: --inode - option: --inode
- option: --data - option: --data
- metadata cloning: skip more non-needed inodes - metadata cloning: skip more non-needed inodes

26
ntfsprogs/ntfsclone.c
View File

@ -105,12 +105,12 @@ int fd_in;
int fd_out; int fd_out;
FILE *msg_out = NULL; FILE *msg_out = NULL;
int nr_used_mft_records = 0;
int wipe = 0; int wipe = 0;
int wiped_unused_mft_data = 0; unsigned int nr_used_mft_records = 0;
int wiped_unused_mft = 0; unsigned int wiped_unused_mft_data = 0;
int wiped_resident_data = 0; unsigned int wiped_unused_mft = 0;
int wiped_timestamp_data = 0; unsigned int wiped_resident_data = 0;
unsigned int wiped_timestamp_data = 0;
#define IMAGE_MAGIC "\0ntfsclone-image" #define IMAGE_MAGIC "\0ntfsclone-image"
#define IMAGE_MAGIC_SIZE 16 #define IMAGE_MAGIC_SIZE 16
@ -1406,7 +1406,7 @@ int main(int argc, char **argv)
ntfs_walk_clusters_ctx image; ntfs_walk_clusters_ctx image;
s64 device_size; /* input device size in bytes */ s64 device_size; /* input device size in bytes */
s64 ntfs_size; s64 ntfs_size;
int wiped_total = 0; unsigned int wiped_total = 0;
/* print to stderr, stdout can be an NTFS image ... */ /* print to stderr, stdout can be an NTFS image ... */
Eprintf("%s v%s\n", EXEC_NAME, VERSION); Eprintf("%s v%s\n", EXEC_NAME, VERSION);
@ -1491,21 +1491,21 @@ int main(int argc, char **argv)
walk_clusters(vol, &backup_clusters); walk_clusters(vol, &backup_clusters);
Printf("Num of MFT records = %8lld\n", Printf("Num of MFT records = %10lld\n",
(long long)vol->mft_na->initialized_size >> (long long)vol->mft_na->initialized_size >>
vol->mft_record_size_bits); vol->mft_record_size_bits);
Printf("Num of used MFT records = %8d\n", nr_used_mft_records); Printf("Num of used MFT records = %10u\n", nr_used_mft_records);
Printf("Wiped unused MFT data = %8d\n", wiped_unused_mft_data); Printf("Wiped unused MFT data = %10u\n", wiped_unused_mft_data);
Printf("Wiped deleted MFT data = %8d\n", wiped_unused_mft); Printf("Wiped deleted MFT data = %10u\n", wiped_unused_mft);
Printf("Wiped resident user data = %8d\n", wiped_resident_data); Printf("Wiped resident user data = %10u\n", wiped_resident_data);
Printf("Wiped timestamp data = %8d\n", wiped_timestamp_data); Printf("Wiped timestamp data = %10u\n", wiped_timestamp_data);
wiped_total += wiped_unused_mft_data; wiped_total += wiped_unused_mft_data;
wiped_total += wiped_unused_mft; wiped_total += wiped_unused_mft;
wiped_total += wiped_resident_data; wiped_total += wiped_resident_data;
wiped_total += wiped_timestamp_data; wiped_total += wiped_timestamp_data;
Printf("Wiped totally = %8d\n", wiped_total); Printf("Wiped totally = %10u\n", wiped_total);
fsync_clone(fd_out); fsync_clone(fd_out);
exit(0); exit(0);