[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",