linux-ntfs-cvs — List for CVS checkins and comments.

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.371,1.372

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18765

Modified Files:
	ChangeLog 
Log Message:
ntfsinfo: dump either a minimal (default) or the entire attribute
header (--verbose) for all attributes types. Also removed a lot of
redundant code and made some formatting corrections.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -p -r1.371 -r1.372
--- ChangeLog	27 Mar 2006 22:46:13 -0000	1.371
+++ ChangeLog	29 Mar 2006 22:29:26 -0000	1.372
@@ -29,6 +29,9 @@ xx/xx/2006 - 1.13.1-WIP
 	  fixup code.  (Anton)
 	- Change ntfsinfo to dump the key data as well as the keys themselves
 	  when dumping the $ObjId/$O index.  (Anton)
+	- ntfsinfo: dump either a minimal (default) or the entire attribute
+	  header (--verbose) for all attributes types. Also removed a lot of
+	  redundant code and made some formatting corrections.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsfix.c,1.30,1.31 ntfsinfo.c,1.115,1.116 utils.c,1.62,1.63

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3745

Modified Files:
	ntfsfix.c ntfsinfo.c utils.c 
Log Message:
Update my copyright for the files changed in the last commits.


Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ntfsfix.c	27 Mar 2006 22:43:09 -0000	1.30
+++ ntfsfix.c	27 Mar 2006 22:49:50 -0000	1.31
@@ -1,7 +1,7 @@
 /**
  * ntfsfix - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000-2005 Anton Altaparmakov.
+ * Copyright (c) 2000-2006 Anton Altaparmakov.
  * Copyright (c) 2002-2005 Szabolcs Szakacsits.
  *
  * This utility fixes some common NTFS problems, resets the NTFS journal file

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- ntfsinfo.c	27 Mar 2006 22:46:13 -0000	1.115
+++ ntfsinfo.c	27 Mar 2006 22:49:50 -0000	1.116
@@ -2,7 +2,7 @@
  * ntfsinfo - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2002-2004 Matthew J. Fanto
- * Copyright (c) 2002-2005 Anton Altaparmakov
+ * Copyright (c) 2002-2006 Anton Altaparmakov
  * Copyright (c) 2002-2005 Richard Russon
  * Copyright (c) 2003-2006 Szabolcs Szakacsits
  * Copyright (c) 2004-2005 Yuval Fledel

Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- utils.c	27 Mar 2006 22:39:39 -0000	1.62
+++ utils.c	27 Mar 2006 22:49:52 -0000	1.63
@@ -2,7 +2,7 @@
  * utils.c - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2002-2005 Richard Russon
- * Copyright (c) 2003-2005 Anton Altaparmakov
+ * Copyright (c) 2003-2006 Anton Altaparmakov
  * Copyright (c) 2003 Lode Leroy
  *
  * A set of shared functions for ntfs utilities

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.114,1.115

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1829/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
Change ntfsinfo to dump the key data as well as the keys themselves
when dumping the $ObjId/$O index.  (Anton)


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- ntfsinfo.c	27 Mar 2006 21:14:56 -0000	1.114
+++ ntfsinfo.c	27 Mar 2006 22:46:13 -0000	1.115
@@ -1225,9 +1225,32 @@ static void ntfs_dump_index_key(INDEX_EN
 		ntfs_log_verbose("\t\tKey security id:\t %u\n",
 				 le32_to_cpu(entry->key.sdh.security_id));
 		break;
-	case INDEX_ATTR_OBJID_O:
+	case INDEX_ATTR_OBJID_O: {
+		OBJ_ID_INDEX_DATA *object_id_data;
+
 		ntfs_guid_to_mbs(&entry->key.object_id, printable_GUID);
 		ntfs_log_verbose("\t\tKey GUID:\t\t %s\n", printable_GUID);
+		ntfs_log_verbose("\t\tKey Data:\n");
+		object_id_data = (OBJ_ID_INDEX_DATA*)((u8*)entry +
+				le16_to_cpu(entry->data_offset));
+		ntfs_log_verbose("\t\tMFT Number:\t\t 0x%llx\n",
+				(unsigned long long)
+				MREF_LE(object_id_data->mft_reference));
+		ntfs_log_verbose("\t\tMFT Sequence Number:\t 0x%x\n",
+				(unsigned)
+				MSEQNO_LE(object_id_data->mft_reference));
+		ntfs_guid_to_mbs(&object_id_data->birth_volume_id,
+				printable_GUID);
+		ntfs_log_verbose("\t\tBirth volume id GUID:\t %s\n",
+				printable_GUID);
+		ntfs_guid_to_mbs(&object_id_data->birth_object_id,
+				printable_GUID);
+		ntfs_log_verbose("\t\tBirth object id GUID:\t %s\n",
+				printable_GUID);
+		ntfs_guid_to_mbs(&object_id_data->domain_id, printable_GUID);
+		ntfs_log_verbose("\t\tDomain id GUID:\t\t %s\n",
+				printable_GUID);
+		}
 		break;
 	case INDEX_ATTR_REPARSE_R:
 		ntfs_log_verbose("\t\tKey reparse tag:\t 0x%08x\n",

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.370,1.371

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1829

Modified Files:
	ChangeLog 
Log Message:
Change ntfsinfo to dump the key data as well as the keys themselves
when dumping the $ObjId/$O index.  (Anton)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -p -r1.370 -r1.371
--- ChangeLog	27 Mar 2006 22:43:09 -0000	1.370
+++ ChangeLog	27 Mar 2006 22:46:13 -0000	1.371
@@ -27,6 +27,8 @@ xx/xx/2006 - 1.13.1-WIP
 	  $MFTMirr.  Ported from kernel driver 2.1.27 release and aplied both
 	  to libntfs/volume.c mount related code and to ntfsprogs/ntfsfix.c's
 	  fixup code.  (Anton)
+	- Change ntfsinfo to dump the key data as well as the keys themselves
+	  when dumping the $ObjId/$O index.  (Anton)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.369,1.370

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv322

Modified Files:
	ChangeLog 
Log Message:
Fix comparison of $MFT and $MFTMirr to not bail out when there are
unused, invalid mft records which are the same in both $MFT and
$MFTMirr.  Ported from kernel driver 2.1.27 release and aplied both
to libntfs/volume.c mount related code and to ntfsprogs/ntfsfix.c's
fixup code.  (Anton)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -p -r1.369 -r1.370
--- ChangeLog	27 Mar 2006 22:39:38 -0000	1.369
+++ ChangeLog	27 Mar 2006 22:43:09 -0000	1.370
@@ -22,6 +22,11 @@ xx/xx/2006 - 1.13.1-WIP
 	  numbers in hex (and octal if anyone is crazy enough to use that) in
 	  addition to decimal numbers on the command line options to most if
 	  not all utilities.  (Anton)
+	- Fix comparison of $MFT and $MFTMirr to not bail out when there are
+	  unused, invalid mft records which are the same in both $MFT and
+	  $MFTMirr.  Ported from kernel driver 2.1.27 release and aplied both
+	  to libntfs/volume.c mount related code and to ntfsprogs/ntfsfix.c's
+	  fixup code.  (Anton)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsfix.c,1.29,1.30

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv322/ntfsprogs

Modified Files:
	ntfsfix.c 
Log Message:
Fix comparison of $MFT and $MFTMirr to not bail out when there are
unused, invalid mft records which are the same in both $MFT and
$MFTMirr.  Ported from kernel driver 2.1.27 release and aplied both
to libntfs/volume.c mount related code and to ntfsprogs/ntfsfix.c's
fixup code.  (Anton)


Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ntfsfix.c	12 Feb 2006 02:00:45 -0000	1.29
+++ ntfsfix.c	27 Mar 2006 22:43:09 -0000	1.30
@@ -380,10 +380,12 @@ static int fix_mftmirr(ntfs_volume *vol)
 	ntfs_log_info("Comparing $MFTMirr to $MFT... ");
 	done = FALSE;
 	for (i = 0; i < vol->mftmirr_size; ++i) {
+		MFT_RECORD *mrec, *mrec2;
 		const char *ESTR[12] = { "$MFT", "$MFTMirr", "$LogFile",
 			"$Volume", "$AttrDef", "root directory", "$Bitmap",
 			"$Boot", "$BadClus", "$Secure", "$UpCase", "$Extend" };
 		const char *s;
+		BOOL use_mirr;
 
 		if (i < 12)
 			s = ESTR[i];
@@ -392,46 +394,68 @@ static int fix_mftmirr(ntfs_volume *vol)
 		else
 			s = "mft record";
 
-		if (ntfs_is_baad_recordp(m + i * vol->mft_record_size)) {
-			ntfs_log_info("FAILED");
-			ntfs_log_error("$MFT error: Incomplete multi sector "
-					"transfer detected in %s.\nCannot "
-					"handle this yet. )-:\n", s);
-			goto error_exit;
-		}
-		if (!ntfs_is_mft_recordp(m + i * vol->mft_record_size)) {
-			ntfs_log_info("FAILED");
-			ntfs_log_error("$MFT error: Invalid mft record for "
-					"%s.\nCannot handle this yet. )-:\n",
-					s);
-			goto error_exit;
+		use_mirr = FALSE;
+		mrec = (MFT_RECORD*)(m + i * vol->mft_record_size);
+		if (mrec->flags & MFT_RECORD_IN_USE) {
+			if (ntfs_is_baad_recordp(mrec)) {
+				ntfs_log_info(FAILED);
+				ntfs_log_error("$MFT error: Incomplete multi "
+						"sector transfer detected in "
+						"%s.\nCannot handle this yet. "
+						")-:\n", s);
+				goto error_exit;
+			}
+			if (!ntfs_is_mft_recordp(mrec)) {
+				ntfs_log_info(FAILED);
+				ntfs_log_error("$MFT error: Invalid mft "
+						"record for %s.\nCannot "
+						"handle this yet. )-:\n", s);
+				goto error_exit;
+			}
 		}
-		if (ntfs_is_baad_recordp(m2 + i * vol->mft_record_size)) {
-			ntfs_log_info("FAILED");
-			ntfs_log_error("$MFTMirr error: Incomplete multi "
-					"sector transfer detected in %s.\n", s);
-			goto error_exit;
+		mrec2 = (MFT_RECORD*)(m2 + i * vol->mft_record_size);
+		if (mrec2->flags & MFT_RECORD_IN_USE) {
+			if (ntfs_is_baad_recordp(mrec2)) {
+				ntfs_log_info(FAILED);
+				ntfs_log_error("$MFTMirr error: Incomplete "
+						"multi sector transfer "
+						"detected in %s.\n", s);
+				goto error_exit;
+			}
+			if (!ntfs_is_mft_recordp(mrec2)) {
+				ntfs_log_info(FAILED);
+				ntfs_log_error("$MFTMirr error: Invalid mft "
+						"record for %s.\n", s);
+				goto error_exit;
+			}
+			/* $MFT is corrupt but $MFTMirr is ok, use $MFTMirr. */
+			if (!(mrec->flags & MFT_RECORD_IN_USE) &&
+					!ntfs_is_mft_recordp(mrec))
+				use_mirr = TRUE;
 		}
-		if (memcmp((u8*)m + i * vol->mft_record_size, (u8*)m2 +
-				i * vol->mft_record_size,
-				ntfs_mft_record_get_data_size((MFT_RECORD*)(
-				(u8*)m + i * vol->mft_record_size)))) {
+		if (memcmp(mrec, mrec2, ntfs_mft_record_get_data_size(mrec))) {
 			if (!done) {
 				done = TRUE;
 				ntfs_log_info(FAILED);
-				ntfs_log_info("Correcting differences in $MFTMirr...");
 			}
-			br = ntfs_mft_record_write(vol, i, (MFT_RECORD*)(m +
-					i * vol->mft_record_size));
+			ntfs_log_info("Correcting differences in $MFT%s "
+					"record %d...", use_mirr ? "" : "Mirr",
+					i);
+			br = ntfs_mft_record_write(vol, i,
+					use_mirr ? mrec2 : mrec);
 			if (br) {
 				ntfs_log_info(FAILED);
-				ntfs_log_perror("Error correcting $MFTMirr");
+				ntfs_log_perror("Error correcting $MFT%s",
+						use_mirr ? "" : "Mirr");
 				goto error_exit;
 			}
+			ntfs_log_info(OK);
 		}
 	}
-	ntfs_log_info(OK);
-	ntfs_log_info("Processing of $MFT and $MFTMirr completed successfully.\n");
+	if (!done)
+		ntfs_log_info(OK);
+	ntfs_log_info("Processing of $MFT and $MFTMirr completed "
+			"successfully.\n");
 	ret = 0;
 error_exit:
 	free(m);

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.68,1.69

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv322/libntfs

Modified Files:
	volume.c 
Log Message:
Fix comparison of $MFT and $MFTMirr to not bail out when there are
unused, invalid mft records which are the same in both $MFT and
$MFTMirr.  Ported from kernel driver 2.1.27 release and aplied both
to libntfs/volume.c mount related code and to ntfsprogs/ntfsfix.c's
fixup code.  (Anton)


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- volume.c	3 Feb 2006 22:19:19 -0000	1.68
+++ volume.c	27 Mar 2006 22:43:09 -0000	1.69
@@ -816,6 +816,7 @@ ntfs_volume *ntfs_device_mount(struct nt
 	}
 	ntfs_log_debug("Comparing $MFTMirr to $MFT... ");
 	for (i = 0; i < vol->mftmirr_size; ++i) {
+		MFT_RECORD *mrec, *mrec2;
 		const char *ESTR[12] = { "$MFT", "$MFTMirr", "$LogFile",
 			"$Volume", "$AttrDef", "root directory", "$Bitmap",
 			"$Boot", "$BadClus", "$Secure", "$UpCase", "$Extend" };
@@ -828,33 +829,39 @@ ntfs_volume *ntfs_device_mount(struct nt
 		else
 			s = "mft record";
 
-		if (ntfs_is_baad_recordp(m + i * vol->mft_record_size)) {
-			ntfs_log_debug("FAILED\n");
-			ntfs_log_debug("$MFT error: Incomplete multi sector transfer "
-					"detected in %s.\n", s);
-			goto io_error_exit;
-		}
-		if (!ntfs_is_mft_recordp(m + i * vol->mft_record_size)) {
-			ntfs_log_debug("FAILED\n");
-			ntfs_log_debug("$MFT error: Invalid mft record for %s.\n", s);
-			goto io_error_exit;
-		}
-		if (ntfs_is_baad_recordp(m2 + i * vol->mft_record_size)) {
-			ntfs_log_debug("FAILED\n");
-			ntfs_log_debug("$MFTMirr error: Incomplete multi sector "
-					"transfer detected in %s.\n", s);
-			goto io_error_exit;
+		mrec = (MFT_RECORD*)(m + i * vol->mft_record_size);
+		if (mrec->flags & MFT_RECORD_IN_USE) {
+			if (ntfs_is_baad_recordp(mrec)) {
+				ntfs_log_debug("FAILED\n");
+				ntfs_log_debug("$MFT error: Incomplete multi "
+						"sector transfer detected in "
+						"%s.\n", s);
+				goto io_error_exit;
+			}
+			if (!ntfs_is_mft_recordp(mrec)) {
+				ntfs_log_debug("FAILED\n");
+				ntfs_log_debug("$MFT error: Invalid mft "
+						"record for %s.\n", s);
+				goto io_error_exit;
+			}
 		}
-		if (!ntfs_is_mft_recordp(m2 + i * vol->mft_record_size)) {
-			ntfs_log_debug("FAILED\n");
-			ntfs_log_debug("$MFTMirr error: Invalid mft record for "
-					"%s.\n", s);
-			goto io_error_exit;
+		mrec2 = (MFT_RECORD*)(m2 + i * vol->mft_record_size);
+		if (mrec2->flags & MFT_RECORD_IN_USE) {
+			if (ntfs_is_baad_recordp(mrec2)) {
+				ntfs_log_debug("FAILED\n");
+				ntfs_log_debug("$MFTMirr error: Incomplete "
+						"multi sector transfer "
+						"detected in %s.\n", s);
+				goto io_error_exit;
+			}
+			if (!ntfs_is_mft_recordp(mrec2)) {
+				ntfs_log_debug("FAILED\n");
+				ntfs_log_debug("$MFTMirr error: Invalid mft "
+						"record for %s.\n", s);
+				goto io_error_exit;
+			}
 		}
-		if (memcmp((u8*)m + i * vol->mft_record_size, (u8*)m2 +
-				i * vol->mft_record_size,
-				ntfs_mft_record_get_data_size((MFT_RECORD*)(
-				(u8*)m + i * vol->mft_record_size)))) {
+		if (memcmp(mrec, mrec2, ntfs_mft_record_get_data_size(mrec))) {
 			ntfs_log_debug(FAILED);
 			ntfs_log_debug("$MFTMirr does not match $MFT. Run "
 					"chkdsk.\n");

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs utils.c,1.61,1.62

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30711/ntfsprogs

Modified Files:
	utils.c 
Log Message:
Change utils_parse_size() to use a base of 0 instead of 10 when
calling strtoll().  This automagically allows specification of
numbers in hex (and octal if anyone is crazy enough to use that) in
addition to decimal numbers on the command line options to most if
not all utilities.  (Anton)


Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- utils.c	18 Dec 2005 16:27:21 -0000	1.61
+++ utils.c	27 Mar 2006 22:39:39 -0000	1.62
@@ -211,6 +211,7 @@ ntfs_volume * utils_mount_volume(const c
 }
 
 #endif
+
 /**
  * utils_parse_size - Convert a string representing a size
  * @value:  String to be parsed
@@ -246,7 +247,7 @@ int utils_parse_size(const char *value, 
 
 	ntfs_log_debug("Parsing size '%s'.\n", value);
 
-	result = strtoll(value, &suffix, 10);
+	result = strtoll(value, &suffix, 0);
 	if (result < 0 || errno == ERANGE) {
 		ntfs_log_error("Invalid size '%s'.\n", value);
 		return 0;

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.368,1.369

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30711

Modified Files:
	ChangeLog 
Log Message:
Change utils_parse_size() to use a base of 0 instead of 10 when
calling strtoll().  This automagically allows specification of
numbers in hex (and octal if anyone is crazy enough to use that) in
addition to decimal numbers on the command line options to most if
not all utilities.  (Anton)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -p -r1.368 -r1.369
--- ChangeLog	27 Mar 2006 21:40:26 -0000	1.368
+++ ChangeLog	27 Mar 2006 22:39:38 -0000	1.369
@@ -17,6 +17,11 @@ xx/xx/2006 - 1.13.1-WIP
 	  index allocation attributes as well. This further decreases the 
 	  compressed metadata image size by 10-25% and more importantly it
 	  eliminates non-interesting ntfscmp differences.  (Szaka)
+	- Change utils_parse_size() to use a base of 0 instead of 10 when
+	  calling strtoll().  This automagically allows specification of
+	  numbers in hex (and octal if anyone is crazy enough to use that) in
+	  addition to decimal numbers on the command line options to most if
+	  not all utilities.  (Anton)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.74,1.75

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32037/ntfsprogs

Modified Files:
	ntfsclone.c 
Log Message:
ntfsclone: the --metadata option will wipe the timestamps in the
index allocation attributes as well. This further decreases the
compressed metadata image size by 10-25% and more importantly it
eliminates non-interesting ntfscmp differences.


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- ntfsclone.c	6 Feb 2006 22:17:24 -0000	1.74
+++ ntfsclone.c	27 Mar 2006 21:40:27 -0000	1.75
@@ -1,7 +1,7 @@
 /**
  * ntfsclone - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2003-2005 Szabolcs Szakacsits
+ * Copyright (c) 2003-2006 Szabolcs Szakacsits
  * Copyright (c) 2004-2005 Anton Altaparmakov
  * Special image format support copyright (c) 2004 Per Olofsson
  *
@@ -62,10 +62,12 @@
 #include "bootsect.h"
 #include "device.h"
 #include "attrib.h"
+#include "mst.h"
 #include "volume.h"
 #include "mft.h"
 #include "bitmap.h"
 #include "inode.h"
+#include "index.h"
 #include "dir.h"
 #include "runlist.h"
 #include "ntfstime.h"
@@ -711,6 +713,107 @@ static void restore_image(void)
 	}
 }
 
+static void wipe_index_entry_timestams(INDEX_ENTRY *e)
+{
+	s64 timestamp = utc2ntfs(0);
+
+	while (!(e->flags & INDEX_ENTRY_END)) {
+
+		e->key.file_name.creation_time = timestamp;
+		e->key.file_name.last_data_change_time = timestamp;
+		e->key.file_name.last_mft_change_time = timestamp;
+		e->key.file_name.last_access_time = timestamp;
+		
+		wiped_timestamp_data += 32;
+		
+		e = (INDEX_ENTRY *)((u8 *)e + le16_to_cpu(e->length));
+	}
+}
+
+static void wipe_index_allocation_timestamps(ntfs_inode *ni, ATTR_RECORD *attr)
+{
+	INDEX_ALLOCATION *indexa, *tmp_indexa;
+	INDEX_ENTRY *entry;
+	INDEX_ROOT *indexr;
+	u8 *bitmap, *byte;
+	int bit;
+	ntfs_attr *na;
+	ntfschar *name;
+	u32 name_len;
+
+	indexr = ntfs_index_root_get(ni, attr);
+	if (!indexr) {
+		ntfs_log_perror("Failed to read $INDEX_ROOT attribute");
+		return;
+	}
+
+	if (indexr->type != AT_FILE_NAME)
+		goto out_indexr;
+
+	name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
+	name_len = attr->name_length;
+	
+	byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
+	if (!byte) {
+		ntfs_log_perror("Failed to read $BITMAP attribute");
+		goto out_indexr;
+	}
+
+	na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, name, name_len);
+	if (!na) {
+		ntfs_log_perror("Failed to open $INDEX_ALLOCATION attribute");
+		goto out_bitmap;
+	}
+	tmp_indexa = indexa = malloc(na->data_size);
+	if (!tmp_indexa) {
+		ntfs_log_perror("malloc failed");
+		goto out_na;
+	}
+	if (ntfs_attr_pread(na, 0, na->data_size, indexa) != na->data_size) {
+		ntfs_log_perror("Failed to read $INDEX_ALLOCATION attribute");
+		goto out_indexa;
+	}
+
+	bit = 0;
+	while ((u8 *)tmp_indexa < (u8 *)indexa + na->data_size) {
+		if (*byte & (1 << bit)) {					   
+			if (ntfs_mst_post_read_fixup((NTFS_RECORD *)tmp_indexa,
+						indexr->index_block_size)) {
+				ntfs_log_perror("Damaged INDX record");
+				goto out_indexa;
+			}
+			entry = (INDEX_ENTRY *)((u8 *)tmp_indexa + le32_to_cpu(
+				tmp_indexa->index.entries_offset) + 0x18);
+
+			wipe_index_entry_timestams(entry);
+
+			if (ntfs_mst_pre_write_fixup((NTFS_RECORD *)tmp_indexa,
+						indexr->index_block_size)) {
+				ntfs_log_perror("INDX write fixup failed");
+				goto out_indexa;
+			}
+		}
+		tmp_indexa = (INDEX_ALLOCATION *)((u8 *)tmp_indexa + 
+						 indexr->index_block_size);
+		bit++;
+		if (bit > 7) {
+			bit = 0;
+			byte++;
+		}
+	}
+	
+	if (ntfs_rl_pwrite(vol, na->rl, 0, na->data_size, indexa) != na->data_size)
+		ntfs_log_perror("ntfs_rl_pwrite failed");
+out_indexa:
+	free(indexa);
+out_na:
+	ntfs_attr_close(na);
+out_bitmap:
+	free(bitmap);
+out_indexr:
+	free(indexr);
+}
+
 static void wipe_index_root_timestamps(ATTR_RECORD *attr, s64 timestamp)
 {
 	INDEX_ENTRY *entry;
@@ -850,6 +953,9 @@ static void walk_runs(struct ntfs_walk_c
 		return;
 	}
 
+	if (wipe && walk->image->ctx->attr->type == AT_INDEX_ALLOCATION)
+		wipe_index_allocation_timestamps(walk->image->ni, a);
+
 	if (!(rl = ntfs_mapping_pairs_decompress(vol, a, NULL)))
 		perr_exit("ntfs_decompress_mapping_pairs");
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.367,1.368

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32037

Modified Files:
	ChangeLog 
Log Message:
ntfsclone: the --metadata option will wipe the timestamps in the
index allocation attributes as well. This further decreases the
compressed metadata image size by 10-25% and more importantly it
eliminates non-interesting ntfscmp differences.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -p -r1.367 -r1.368
--- ChangeLog	27 Mar 2006 21:14:56 -0000	1.367
+++ ChangeLog	27 Mar 2006 21:40:26 -0000	1.368
@@ -13,6 +13,10 @@ xx/xx/2006 - 1.13.1-WIP
 	  from an ntfs attribute.  (Szaka)
 	- libntfs: add ntfs_index_root_get() which reads the index root of 
 	  an attribute.  (Szaka)
+	- ntfsclone: the --metadata option will wipe the timestamps in the
+	  index allocation attributes as well. This further decreases the 
+	  compressed metadata image size by 10-25% and more importantly it
+	  eliminates non-interesting ntfscmp differences.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs index.c,1.25,1.26

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18414/libntfs

Modified Files:
	index.c 
Log Message:
libntfs: add ntfs_index_root_get() which reads the index root of an attribute


Index: index.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- index.c	19 Feb 2006 00:37:16 -0000	1.25
+++ index.c	27 Mar 2006 21:14:56 -0000	1.26
@@ -928,3 +928,49 @@ INDEX_ENTRY * ntfs_ie_remove_name(INDEX_
 
 #endif /* NTFS_RICH */
 
+/**
+ * ntfs_index_root_get - read the index root of an attribute
+ * @ni:		open ntfs inode in which the ntfs attribute resides
+ * @attr:	attribute for which we want its index root 
+ *
+ * This function will read the related index root an ntfs attribute.
+ *
+ * On success a buffer is allocated with the content of the index root
+ * and which needs to be freed when it's not needed anymore.
+ *
+ * On error NULL is returned with errno set to the error code.
+ */
+INDEX_ROOT *ntfs_index_root_get(ntfs_inode *ni, ATTR_RECORD *attr)
+{
+	ntfs_attr_search_ctx *ctx;
+	ntfschar *name;
+	INDEX_ROOT *root = NULL;
+
+	name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
+
+	ctx = ntfs_attr_get_search_ctx(ni, NULL);
+	if (!ctx) {
+		ntfs_log_perror("ntfs_get_search_ctx failed");
+		return NULL;
+	}
+	
+	if (ntfs_attr_lookup(AT_INDEX_ROOT, name, attr->name_length, 0, 0, NULL,
+			     0, ctx)) {
+		ntfs_log_perror("ntfs_attr_lookup failed");
+		goto out;
+	}
+	
+	root = malloc(sizeof(INDEX_ROOT));
+	if (!root) {
+		ntfs_log_perror("malloc failed");
+		goto out;
+	}
+	
+	*root = *((INDEX_ROOT *)((u8 *)ctx->attr +
+				le16_to_cpu(ctx->attr->value_offset)));
+out:	
+	ntfs_attr_put_search_ctx(ctx);
+	return root;
+}
+
+

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.366,1.367

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18414

Modified Files:
	ChangeLog 
Log Message:
libntfs: add ntfs_index_root_get() which reads the index root of an attribute


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -p -r1.366 -r1.367
--- ChangeLog	27 Mar 2006 20:01:36 -0000	1.366
+++ ChangeLog	27 Mar 2006 21:14:56 -0000	1.367
@@ -11,6 +11,8 @@ xx/xx/2006 - 1.13.1-WIP
 	  allocation entries.  (Szaka)
 	- libntfs: add ntfs_attr_readall() which reads the entire data 
 	  from an ntfs attribute.  (Szaka)
+	- libntfs: add ntfs_index_root_get() which reads the index root of 
+	  an attribute.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs index.h,1.10,1.11

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18414/include/ntfs

Modified Files:
	index.h 
Log Message:
libntfs: add ntfs_index_root_get() which reads the index root of an attribute


Index: index.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/index.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- index.h	31 Oct 2005 01:15:12 -0000	1.10
+++ index.h	27 Mar 2006 21:14:56 -0000	1.11
@@ -101,6 +101,8 @@ extern int ntfs_index_add_filename(ntfs_
 		MFT_REF mref);
 extern int ntfs_index_rm(ntfs_index_context *ictx);
 
+extern INDEX_ROOT *ntfs_index_root_get(ntfs_inode *ni, ATTR_RECORD *attr);
+
 /**
  * ntfs_index_entry_mark_dirty - mark an index entry dirty
  * @ictx:	ntfs index context describing the index entry

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.113,1.114

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18414/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
libntfs: add ntfs_index_root_get() which reads the index root of an attribute


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- ntfsinfo.c	27 Mar 2006 20:50:51 -0000	1.113
+++ ntfsinfo.c	27 Mar 2006 21:14:56 -0000	1.114
@@ -72,6 +72,7 @@
 #include "attrib.h"
 #include "layout.h"
 #include "inode.h"
+#include "index.h"
 #include "utils.h"
 #include "security.h"
 #include "mst.h"
@@ -1552,44 +1553,6 @@ static void ntfs_dump_attr_index_root(AT
 }
 
 /**
- * get_index_root()
- *
- * determine size, type and the collation rule of INDX record
- */
-static INDEX_ROOT *get_index_root(ntfs_inode *ni, ATTR_RECORD *attr)
-{
-	ntfs_attr_search_ctx *ctx;
-	ntfschar *name;
-	INDEX_ROOT *root = NULL;
-
-	name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
-
-	ctx = ntfs_attr_get_search_ctx(ni, NULL);
-	if (!ctx) {
-		ntfs_log_perror("ntfs_get_search_ctx failed");
-		return NULL;
-	}
-	
-	if (ntfs_attr_lookup(AT_INDEX_ROOT, name, attr->name_length, 0, 0, NULL,
-			     0, ctx)) {
-		ntfs_log_perror("ntfs_attr_lookup failed");
-		goto out;
-	}
-	
-	root = malloc(sizeof(INDEX_ROOT));
-	if (!root) {
-		ntfs_log_perror("malloc failed");
-		goto out;
-	}
-	
-	*root = *((INDEX_ROOT *)((u8 *)ctx->attr +
-				le16_to_cpu(ctx->attr->value_offset)));
-out:	
-	ntfs_attr_put_search_ctx(ctx);
-	return root;
-}
-
-/**
  * ntfs_dump_attr_index_allocation()
  *
  * dump context of the index_allocation attribute
@@ -1608,7 +1571,7 @@ static void ntfs_dump_index_allocation(A
 	u32 name_len;
 	s64 data_size;
 
-	index_root = get_index_root(ni, attr);
+	index_root = ntfs_index_root_get(ni, attr);
 	if (!index_root) {
 		ntfs_log_perror("Failed to read $INDEX_ROOT attribute");
 		return;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.112,1.113

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4688/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
make get_index_root() slightly sexier


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- ntfsinfo.c	27 Mar 2006 20:27:38 -0000	1.112
+++ ntfsinfo.c	27 Mar 2006 20:50:51 -0000	1.113
@@ -1556,31 +1556,37 @@ static void ntfs_dump_attr_index_root(AT
  *
  * determine size, type and the collation rule of INDX record
  */
-static int get_index_root(ntfs_inode *ni, ATTR_RECORD *attr, INDEX_ROOT *iroot)
+static INDEX_ROOT *get_index_root(ntfs_inode *ni, ATTR_RECORD *attr)
 {
 	ntfs_attr_search_ctx *ctx;
 	ntfschar *name;
-	INDEX_ROOT *root;
+	INDEX_ROOT *root = NULL;
 
 	name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
 
 	ctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!ctx) {
 		ntfs_log_perror("ntfs_get_search_ctx failed");
-		return -1;
+		return NULL;
 	}
-	if (ntfs_attr_lookup(AT_INDEX_ROOT, name, attr->name_length, 0,
-							0, NULL, 0, ctx)) {
+	
+	if (ntfs_attr_lookup(AT_INDEX_ROOT, name, attr->name_length, 0, 0, NULL,
+			     0, ctx)) {
 		ntfs_log_perror("ntfs_attr_lookup failed");
-		ntfs_attr_put_search_ctx(ctx);
-		return -1;
+		goto out;
 	}
-
-	root = (INDEX_ROOT*)((u8*)ctx->attr +
-				le16_to_cpu(ctx->attr->value_offset));
-	*iroot = *root;
+	
+	root = malloc(sizeof(INDEX_ROOT));
+	if (!root) {
+		ntfs_log_perror("malloc failed");
+		goto out;
+	}
+	
+	*root = *((INDEX_ROOT *)((u8 *)ctx->attr +
+				le16_to_cpu(ctx->attr->value_offset)));
+out:	
 	ntfs_attr_put_search_ctx(ctx);
-	return 0;
+	return root;
 }
 
 /**
@@ -1592,7 +1598,7 @@ static void ntfs_dump_index_allocation(A
 {
 	INDEX_ALLOCATION *allocation, *tmp_alloc;
 	INDEX_ENTRY *entry;
-	INDEX_ROOT index_root;
+	INDEX_ROOT *index_root;
 	INDEX_ATTR_TYPE type;
 	int total_entries = 0;
 	int total_indx_blocks = 0;
@@ -1602,10 +1608,13 @@ static void ntfs_dump_index_allocation(A
 	u32 name_len;
 	s64 data_size;
 
-	if (get_index_root(ni, attr, &index_root))
+	index_root = get_index_root(ni, attr);
+	if (!index_root) {
+		ntfs_log_perror("Failed to read $INDEX_ROOT attribute");
 		return;
+	}
 	
-	type = get_index_attr_type(ni, attr, &index_root);
+	type = get_index_attr_type(ni, attr, index_root);
 	
 	name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
 	name_len = attr->name_length;
@@ -1613,24 +1622,23 @@ static void ntfs_dump_index_allocation(A
 	byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
 	if (!byte) {
 		ntfs_log_perror("Failed to read $BITMAP attribute");
-		return;
+		goto out_index_root;
 	}
 
 	tmp_alloc = allocation = ntfs_attr_readall(ni, AT_INDEX_ALLOCATION, 
 						   name, name_len, &data_size);
 	if (!tmp_alloc) {
 		ntfs_log_perror("Failed to read $INDEX_ALLOCATION attribute");
-		free(bitmap);
-		return;
+		goto out_bitmap;
 	}
 
 	bit = 0;
 	while ((u8 *)tmp_alloc < (u8 *)allocation + data_size) {
 		if (*byte & (1 << bit)) {					   
 			if (ntfs_mst_post_read_fixup((NTFS_RECORD *) tmp_alloc,
-						index_root.index_block_size)) {
+						index_root->index_block_size)) {
 				ntfs_log_perror("Damaged INDX record");
-				goto free;
+				goto out_allocation;
 			}
 			entry = (INDEX_ENTRY *)((u8 *)tmp_alloc + le32_to_cpu(
 				tmp_alloc->index.entries_offset) + 0x18);
@@ -1645,7 +1653,7 @@ static void ntfs_dump_index_allocation(A
 			total_indx_blocks++;
 		}
 		tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc + 
-						 index_root.index_block_size);
+						 index_root->index_block_size);
 		bit++;
 		if (bit > 7) {
 			bit = 0;
@@ -1654,9 +1662,12 @@ static void ntfs_dump_index_allocation(A
 	}
 	printf("\tIndex entries total:\t %d\n", total_entries);
 	printf("\tINDX blocks total:\t %d\n", total_indx_blocks);
-free:
+out_allocation:
 	free(allocation);
+out_bitmap:
 	free(bitmap);
+out_index_root:
+	free(index_root);
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.111,1.112

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25976/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
cleanup get_index_root() named attribute usage


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- ntfsinfo.c	27 Mar 2006 20:14:22 -0000	1.111
+++ ntfsinfo.c	27 Mar 2006 20:27:38 -0000	1.112
@@ -1559,29 +1559,20 @@ static void ntfs_dump_attr_index_root(AT
 static int get_index_root(ntfs_inode *ni, ATTR_RECORD *attr, INDEX_ROOT *iroot)
 {
 	ntfs_attr_search_ctx *ctx;
-	ntfschar *name = 0;
+	ntfschar *name;
 	INDEX_ROOT *root;
 
-	if (attr->name_length) {
-		name = malloc(attr->name_length * sizeof(ntfschar));
-		if (!name) {
-			ntfs_log_perror("malloc failed");
-			return -1;
-		}
-		memcpy(name, (u8 *)attr + attr->name_offset,
-				attr->name_length * sizeof(ntfschar));
-	}
+	name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
+
 	ctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!ctx) {
 		ntfs_log_perror("ntfs_get_search_ctx failed");
-		free(name);
 		return -1;
 	}
 	if (ntfs_attr_lookup(AT_INDEX_ROOT, name, attr->name_length, 0,
 							0, NULL, 0, ctx)) {
 		ntfs_log_perror("ntfs_attr_lookup failed");
 		ntfs_attr_put_search_ctx(ctx);
-		free(name);
 		return -1;
 	}
 
@@ -1589,7 +1580,6 @@ static int get_index_root(ntfs_inode *ni
 				le16_to_cpu(ctx->attr->value_offset));
 	*iroot = *root;
 	ntfs_attr_put_search_ctx(ctx);
-	free(name);
 	return 0;
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.110,1.111

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19384/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
Use more meaningful error messages


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- ntfsinfo.c	27 Mar 2006 20:01:37 -0000	1.110
+++ ntfsinfo.c	27 Mar 2006 20:14:22 -0000	1.111
@@ -1095,7 +1095,7 @@ static void ntfs_dump_sds(ATTR_RECORD *a
 	
 	sd = sds = ntfs_attr_readall(ni, AT_DATA, name, name_len, &data_size);
 	if (!sd) {
-		ntfs_log_perror("ntfs_attr_readall failed");
+		ntfs_log_perror("Failed to read $SDS attribute");
 		return;
 	}
 	/*
@@ -1622,14 +1622,14 @@ static void ntfs_dump_index_allocation(A
 	
 	byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
 	if (!byte) {
-		ntfs_log_perror("ntfs_attr_readall failed");
+		ntfs_log_perror("Failed to read $BITMAP attribute");
 		return;
 	}
 
 	tmp_alloc = allocation = ntfs_attr_readall(ni, AT_INDEX_ALLOCATION, 
 						   name, name_len, &data_size);
 	if (!tmp_alloc) {
-		ntfs_log_perror("ntfs_attr_readall failed");
+		ntfs_log_perror("Failed to read $INDEX_ALLOCATION attribute");
 		free(bitmap);
 		return;
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsdecrypt.c,1.27,1.28

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16921/ntfsprogs

Modified Files:
	ntfsdecrypt.c 
Log Message:
cleanup: use ntfs_attr_readall()


Index: ntfsdecrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ntfsdecrypt.c	18 Dec 2005 16:27:21 -0000	1.27
+++ ntfsdecrypt.c	27 Mar 2006 20:10:39 -0000	1.28
@@ -1128,30 +1128,16 @@ static ntfs_fek *ntfs_df_array_fek_get(E
 static ntfs_fek *ntfs_inode_fek_get(ntfs_inode *inode,
 		ntfs_rsa_private_key rsa_key)
 {
-	ntfs_attr *na;
 	EFS_ATTR_HEADER *efs;
 	EFS_DF_ARRAY_HEADER *df_array;
 	ntfs_fek *fek = NULL;
 
 	/* Obtain the $EFS contents. */
-	na = ntfs_attr_open(inode, AT_LOGGED_UTILITY_STREAM, EFS, 4);
-	if (!na) {
-		ntfs_log_perror("Failed to open $EFS attribute");
-		return NULL;
-	}
-	efs = malloc(na->data_size);
+	efs = ntfs_attr_readall(inode, AT_LOGGED_UTILITY_STREAM, EFS, 4, NULL);
 	if (!efs) {
-		ntfs_log_perror("Failed to allocate internal buffer");
-		ntfs_attr_close(na);
-		return NULL;
-	}
-	if (ntfs_attr_pread(na, 0, na->data_size, efs) != na->data_size) {
 		ntfs_log_perror("Failed to read $EFS attribute");
-		free(efs);
-		ntfs_attr_close(na);
 		return NULL;
 	}
-	ntfs_attr_close(na);
 	/* Iterate through the DDFs & DRFs until we obtain a key. */
 	if (efs->offset_to_ddf_array) {
 		df_array = (EFS_DF_ARRAY_HEADER*)((u8*)efs +

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.109,1.110

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12641/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
libntfs: add ntfs_attr_readall() which reads the entire data from an attribute


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- ntfsinfo.c	27 Mar 2006 19:33:20 -0000	1.109
+++ ntfsinfo.c	27 Mar 2006 20:01:37 -0000	1.110
@@ -1069,37 +1069,6 @@ static void ntfs_dump_sds_entry(SECURITY
 	
 	ntfs_dump_security_descriptor(sd, "\t");
 }
-	
-static void *ntfs_attr_readall(ntfs_inode *ni, const ATTR_TYPES type, 
-			       ntfschar *name, u32 name_len, s64 *data_size)
-{
-	ntfs_attr *na;
-	void *data, *ret = NULL;
-	s64 size;
-	
-	na = ntfs_attr_open(ni, type, name, name_len);
-	if (!na) {
-		ntfs_log_perror("ntfs_attr_open failed");
-		return NULL;
-	}
-	data = malloc(na->data_size);
-	if (!data) {
-		ntfs_log_perror("malloc failed");
-		goto out;
-	}
-	size = ntfs_attr_pread(na, 0, na->data_size, data);
-	if (size != na->data_size) {
-		ntfs_log_perror("ntfs_attr_pread failed");
-		free(data);
-		goto out;
-	}
-	ret = data;
-	if (data_size)
-		*data_size = size;
-out:
-	ntfs_attr_close(na);
-	return ret;
-}
 
 static void ntfs_dump_sds(ATTR_RECORD *attr, ntfs_inode *ni)
 {
@@ -1125,8 +1094,10 @@ static void ntfs_dump_sds(ATTR_RECORD *a
 		return;
 	
 	sd = sds = ntfs_attr_readall(ni, AT_DATA, name, name_len, &data_size);
-	if (!sd)
+	if (!sd) {
+		ntfs_log_perror("ntfs_attr_readall failed");
 		return;
+	}
 	/*
 	 * FIXME: The right way is based on the indexes, so we couldn't
 	 * miss real entries. For now, dump until it makes sense.
@@ -1650,12 +1621,15 @@ static void ntfs_dump_index_allocation(A
 	name_len = attr->name_length;
 	
 	byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
-	if (!byte)
+	if (!byte) {
+		ntfs_log_perror("ntfs_attr_readall failed");
 		return;
+	}
 
 	tmp_alloc = allocation = ntfs_attr_readall(ni, AT_INDEX_ALLOCATION, 
 						   name, name_len, &data_size);
 	if (!tmp_alloc) {
+		ntfs_log_perror("ntfs_attr_readall failed");
 		free(bitmap);
 		return;
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.213,1.214

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12641/libntfs

Modified Files:
	attrib.c 
Log Message:
libntfs: add ntfs_attr_readall() which reads the entire data from an attribute


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- attrib.c	4 Mar 2006 13:56:35 -0000	1.213
+++ attrib.c	27 Mar 2006 20:01:36 -0000	1.214
@@ -4992,3 +4992,54 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 		ntfs_inode_update_time(na->ni);
 	return ret;
 }
+	
+/**
+ * ntfs_attr_readall - read the entire data from an ntfs attribute
+ * @ni:		open ntfs inode in which the ntfs attribute resides
+ * @type:	attribute type
+ * @name:	attribute name in little endian Unicode or AT_UNNAMED or NULL
+ * @name_len:	length of attribute @name in Unicode characters (if @name given)
+ * @data_size:	if non-NULL then store here the data size 
+ *
+ * This function will read the entire content of an ntfs attribute.
+ * If @name is AT_UNNAMED then look specifically for an unnamed attribute.
+ * If @name is NULL then the attribute could be either named or not. 
+ * In both those cases @name_len is not used at all.
+ *
+ * On success a buffer is allocated with the content of the attribute 
+ * and which needs to be freed when it's not needed anymore. If the
+ * @data_size parameter is non-NULL then the data size is set there.
+ *
+ * On error NULL is returned with errno set to the error code.
+ */
+void *ntfs_attr_readall(ntfs_inode *ni, const ATTR_TYPES type,
+			ntfschar *name, u32 name_len, s64 *data_size)
+{
+	ntfs_attr *na;
+	void *data, *ret = NULL;
+	s64 size;
+	
+	na = ntfs_attr_open(ni, type, name, name_len);
+	if (!na) {
+		ntfs_log_perror("ntfs_attr_open failed");
+		return NULL;
+	}
+	data = malloc(na->data_size);
+	if (!data) {
+		ntfs_log_perror("malloc failed");
+		goto out;
+	}
+	size = ntfs_attr_pread(na, 0, na->data_size, data);
+	if (size != na->data_size) {
+		ntfs_log_perror("ntfs_attr_pread failed");
+		free(data);
+		goto out;
+	}
+	ret = data;
+	if (data_size)
+		*data_size = size;
+out:
+	ntfs_attr_close(na);
+	return ret;
+}
+

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs attrib.h,1.28,1.29

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12641/include/ntfs

Modified Files:
	attrib.h 
Log Message:
libntfs: add ntfs_attr_readall() which reads the entire data from an attribute


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/attrib.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- attrib.h	20 Nov 2005 11:34:30 -0000	1.28
+++ attrib.h	27 Mar 2006 20:01:36 -0000	1.29
@@ -270,6 +270,9 @@ extern s64 ntfs_attr_pread(ntfs_attr *na
 extern s64 ntfs_attr_pwrite(ntfs_attr *na, const s64 pos, s64 count,
 		const void *b);
 
+extern void *ntfs_attr_readall(ntfs_inode *ni, const ATTR_TYPES type,
+			       ntfschar *name, u32 name_len, s64 *data_size);
+
 extern s64 ntfs_attr_mst_pread(ntfs_attr *na, const s64 pos,
 		const s64 bk_cnt, const u32 bk_size, void *dst);
 extern s64 ntfs_attr_mst_pwrite(ntfs_attr *na, const s64 pos,

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.365,1.366

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12641

Modified Files:
	ChangeLog 
Log Message:
libntfs: add ntfs_attr_readall() which reads the entire data from an attribute


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -p -r1.365 -r1.366
--- ChangeLog	26 Mar 2006 16:49:42 -0000	1.365
+++ ChangeLog	27 Mar 2006 20:01:36 -0000	1.366
@@ -7,8 +7,10 @@ xx/xx/2006 - 1.13.1-WIP
 	  in $Bitmap (useful to find potentially corrupted files). (Szaka)
 	- mkntfs: set the physical drive and the extended boot signature to
 	  0x80 in the Extended BPB which are needed to boot from disk. (Szaka)
-	- ntfsinfo: fix two freed memory usage when dumping $SDS and index
+	- ntfsinfo: fix two freed memory usages when dumping $SDS and index
 	  allocation entries.  (Szaka)
+	- libntfs: add ntfs_attr_readall() which reads the entire data 
+	  from an ntfs attribute.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.108,1.109

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30563/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
ntfs_attr_readall(): fix ntfs_attr leaks in error cases


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- ntfsinfo.c	26 Mar 2006 18:14:33 -0000	1.108
+++ ntfsinfo.c	27 Mar 2006 19:33:20 -0000	1.109
@@ -1074,7 +1074,7 @@ static void *ntfs_attr_readall(ntfs_inod
 			       ntfschar *name, u32 name_len, s64 *data_size)
 {
 	ntfs_attr *na;
-	void *data;
+	void *data, *ret = NULL;
 	s64 size;
 	
 	na = ntfs_attr_open(ni, type, name, name_len);
@@ -1085,18 +1085,20 @@ static void *ntfs_attr_readall(ntfs_inod
 	data = malloc(na->data_size);
 	if (!data) {
 		ntfs_log_perror("malloc failed");
-		return NULL;
+		goto out;
 	}
 	size = ntfs_attr_pread(na, 0, na->data_size, data);
 	if (size != na->data_size) {
 		ntfs_log_perror("ntfs_attr_pread failed");
 		free(data);
-		return NULL;
+		goto out;
 	}
-	ntfs_attr_close(na);
+	ret = data;
 	if (data_size)
 		*data_size = size;
-	return data;
+out:
+	ntfs_attr_close(na);
+	return ret;
 }
 
 static void ntfs_dump_sds(ATTR_RECORD *attr, ntfs_inode *ni)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.107,1.108

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18518/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
fix attr->name_length endianess conversions: name_length is u8, not u16


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- ntfsinfo.c	26 Mar 2006 16:49:42 -0000	1.107
+++ ntfsinfo.c	26 Mar 2006 18:14:33 -0000	1.108
@@ -1113,7 +1113,7 @@ static void ntfs_dump_sds(ATTR_RECORD *a
 	if (FILE_Secure != inode)
 		return;
 	
-	name_len = le16_to_cpu(attr->name_length);
+	name_len = attr->name_length;
 	if (!name_len)
 		return;
 	
@@ -1645,7 +1645,7 @@ static void ntfs_dump_index_allocation(A
 	type = get_index_attr_type(ni, attr, &index_root);
 	
 	name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
-	name_len = le16_to_cpu(attr->name_length);
+	name_len = attr->name_length;
 	
 	byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
 	if (!byte)