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

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.81,1.82

[Yura P. <yu...@li...>]

Hi Szaka,

On Thu, 2006-04-27 at 14:05 -0700, Szabolcs Szakacsits wrote:
> Changes by: szaka
> 
> Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12208/ntfsprogs
> 
> Modified Files:
> 	ntfsmount.c 
> Log Message:
> Workaround for libfuse not being able to find fusermount when mount(8) used
> 
> 
> Index: ntfsmount.c
> ===================================================================
> RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
> retrieving revision 1.81
> retrieving revision 1.82
> diff -u -p -r1.81 -r1.82
> --- ntfsmount.c	5 Apr 2006 12:43:07 -0000	1.81
> +++ ntfsmount.c	27 Apr 2006 21:05:38 -0000	1.82
> @@ -1802,6 +1802,11 @@ int main(int argc, char *argv[])
>  		ntfs_fuse_destroy();
>  		return 4;
>  	}
> +
> +	/* Libfuse can't always find fusermount, so let's help it. */
> +	if (setenv("PATH", ":/bin:/usr/bin:/usr/local/bin", 0) == -1)
> +		ntfs_log_perror("WARNING: Failed to set $PATH\n");
> +
>  	/* Create filesystem. */
>  #if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
>  	if ((fuse_opt_add_arg(&margs, "") == -1 ||

I'm against such workarounds in ntfsmount, if this is FUSE problem then
it should be fixed there. But, I guess this is user settings problem and
they should fix their PATH variable in /etc/profile or something.

-- 
Best regards,
        Yura

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.81,1.82

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

Changes by: szaka

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

Modified Files:
	ntfsmount.c 
Log Message:
Workaround for libfuse not being able to find fusermount when mount(8) used


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- ntfsmount.c	5 Apr 2006 12:43:07 -0000	1.81
+++ ntfsmount.c	27 Apr 2006 21:05:38 -0000	1.82
@@ -1802,6 +1802,11 @@ int main(int argc, char *argv[])
 		ntfs_fuse_destroy();
 		return 4;
 	}
+
+	/* Libfuse can't always find fusermount, so let's help it. */
+	if (setenv("PATH", ":/bin:/usr/bin:/usr/local/bin", 0) == -1)
+		ntfs_log_perror("WARNING: Failed to set $PATH\n");
+
 	/* Create filesystem. */
 #if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
 	if ((fuse_opt_add_arg(&margs, "") == -1 ||

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.381,1.382

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
Workaround for libfuse not being able to find fusermount when mount(8) used


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -r1.381 -r1.382
--- ChangeLog	23 Apr 2006 10:06:39 -0000	1.381
+++ ChangeLog	27 Apr 2006 21:05:38 -0000	1.382
@@ -47,6 +47,8 @@ xx/xx/2006 - 1.13.1-WIP
 	  attribute completely and index entry (filename) completely and all in
 	  correct order.  Essential for hunting bugs in directory operations
 	  code...  (Anton)
+	- ntfsmount: workaround for libfuse not being able to find fusermount
+	  when user uses mount(8).
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.124,1.125

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

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
ntfs_dump_attr_standard_information(): don't dump some fields multiply times


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- ntfsinfo.c	23 Apr 2006 10:06:40 -0000	1.124
+++ ntfsinfo.c	23 Apr 2006 11:01:07 -0000	1.125
@@ -542,8 +542,6 @@ static void ntfs_dump_attr_standard_info
 	standard_attr = (STANDARD_INFORMATION*)((char *)attr +
 		le16_to_cpu(attr->value_offset));
 
-	/* let's start with mandatory? fields */
-
 	/* time conversion stuff */
 	if (!opts.notime) {
 		char *ntfs_time_str = NULL;
@@ -564,17 +562,9 @@ static void ntfs_dump_attr_standard_info
 	}
 	ntfs_dump_flags("\t", attr->type, standard_attr->file_attributes);
 
-	printf("\tMax Number of Versions:\t %u \n",
-		(unsigned int)le32_to_cpu(standard_attr->maximum_versions));
-	printf("\tVersion Number:\t\t %u \n",
-		(unsigned int)le32_to_cpu(standard_attr->version_number));
-	printf("\tClass ID:\t\t %u \n",
-		(unsigned int)le32_to_cpu(standard_attr->class_id));
-
 	value_length = le32_to_cpu(attr->value_length);
 	if (value_length == 48) {
-/*		printf("\t$STANDARD_INFORMATION fields owner_id, security_id, quota \n"
-			"\t & usn are missing. This volume has not been upgraded\n"); */
+		/* Only 12 reserved bytes here */
 	} else if (value_length == 72) {
 		printf("\tMaximum versions:\t %u \n", (unsigned int)
 				le32_to_cpu(standard_attr->maximum_versions));

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.123,1.124

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

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
Dump USA, USN and LSN for index records


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- ntfsinfo.c	19 Apr 2006 22:03:59 -0000	1.123
+++ ntfsinfo.c	23 Apr 2006 10:06:40 -0000	1.124
@@ -1366,7 +1366,6 @@ static int ntfs_dump_index_entries(INDEX
 			numb_entries++;
 			continue;
 		}
-		ntfs_log_verbose("\n");
 		ntfs_log_verbose("\t\tEntry length:\t\t %u\n",
 				le16_to_cpu(entry->length));
 		ntfs_log_verbose("\t\tKey length:\t\t %u\n",
@@ -1400,6 +1399,7 @@ static int ntfs_dump_index_entries(INDEX
 		entry = (INDEX_ENTRY *)((u8 *)entry +
 						le16_to_cpu(entry->length));
 		numb_entries++;
+		ntfs_log_verbose("\n");
 	}
 	ntfs_log_verbose("\tEnd of index block reached\n");
 	return numb_entries;
@@ -1515,11 +1515,23 @@ static void ntfs_dump_attr_index_root(AT
 
 	entry = (INDEX_ENTRY *)((u8 *)index_root +
 			le32_to_cpu(index_root->index.entries_offset) + 0x10);
-	ntfs_log_verbose("\tDumping index block:");
+	ntfs_log_verbose("\tDumping index block:\n");
 	printf("\tIndex entries total:\t %d\n",
 			ntfs_dump_index_entries(entry, type));
 }
 
+static void ntfs_dump_usa_lsn(const char *indent, MFT_RECORD *mrec)
+{
+	printf("%sUpd. Seq. Array Offset:\t %hu\n", indent, 
+	       le16_to_cpu(mrec->usa_ofs));
+	printf("%sUpd. Seq. Array Count: \t %hu\n", indent,
+	       le16_to_cpu(mrec->usa_count));
+	printf("%sUpd. Seq. Number:\t %hu\n", indent,
+	       *(u16 *)((u8 *)mrec + le16_to_cpu(mrec->usa_ofs)));
+	printf("%sLogFile Seq. Number:\t 0x%llx\n", indent,
+	       (long long int)sle64_to_cpu(mrec->lsn));
+}
+
 /**
  * ntfs_dump_attr_index_allocation()
  *
@@ -1565,7 +1577,7 @@ static void ntfs_dump_attr_index_allocat
 
 	bit = 0;
 	while ((u8 *)tmp_alloc < (u8 *)allocation + data_size) {
-		if (*byte & (1 << bit)) {					   
+		if (*byte & (1 << bit)) {
 			if (ntfs_mst_post_read_fixup((NTFS_RECORD *) tmp_alloc,
 						index_root->index_block_size)) {
 				ntfs_log_perror("Damaged INDX record");
@@ -1573,13 +1585,18 @@ static void ntfs_dump_attr_index_allocat
 			}
 			entry = (INDEX_ENTRY *)((u8 *)tmp_alloc + le32_to_cpu(
 				tmp_alloc->index.entries_offset) + 0x18);
-			ntfs_log_verbose("\tDumping index block "
-					"(VCN %lld, used %u/%u):", le64_to_cpu(
+			ntfs_log_verbose("\tDumping index block (VCN %lld, "
+					"used %u/%u):\n", le64_to_cpu(
 					tmp_alloc->index_block_vcn),
 					(unsigned int)le32_to_cpu(tmp_alloc->
 					index.index_length), (unsigned int)
 					le32_to_cpu(tmp_alloc->index.
 					allocated_size));
+			if (opts.verbose) {
+				ntfs_dump_usa_lsn("\t\t", 
+						  (MFT_RECORD *)tmp_alloc);
+				printf("\n");
+			}
 			total_entries += ntfs_dump_index_entries(entry, type);
 			total_indx_blocks++;
 		}
@@ -1803,22 +1820,15 @@ static void ntfs_dump_inode_general_info
 
 	printf("Dumping Inode #%llu\n",(long long)inode->mft_no);
 
-	printf("Update Sequence Offset:\t\t %hu\n",
-		le16_to_cpu(inode->mrec->usa_ofs));
-	printf("Update Sequence Array Count:\t %hu\n",
-		le16_to_cpu(inode->mrec->usa_count));
-	printf("Update Sequence Number:\t\t %hu\n",
-		*(u16*)((u8*)inode->mrec + le16_to_cpu(inode->mrec->usa_ofs)));
-	printf("$LogFile Sequence Number:\t 0x%llx\n",
-		(signed long long int)sle64_to_cpu(inode->mrec->lsn));
-	printf("MFT Record Sequence Number:\t %hu\n",
+	ntfs_dump_usa_lsn("", inode->mrec);
+	printf("MFT Record Seq. Number:\t %hu\n",
 		(short unsigned int)le16_to_cpu(inode->mrec->sequence_number));
-	printf("Number of hard links:\t\t %hu\n",
+	printf("Number of Hard Links:\t %hu\n",
 		le16_to_cpu(inode->mrec->link_count));
-	printf("First attribute offset:\t\t %hu\n",
+	printf("Attribute Offset:\t %hu\n",
 		le16_to_cpu(inode->mrec->attrs_offset));
 
-	printf("MFT record Flags:\t\t ");
+	printf("MFT Record Flags:\t ");
 	if (inode_flags) {
 		if (MFT_RECORD_IN_USE & inode_flags) {
 			printf("IN_USE ");
@@ -1844,16 +1854,16 @@ static void ntfs_dump_inode_general_info
 	}
 	printf("\n");
 
-	printf("Size - Used:\t\t\t %u bytes\n",
+	printf("Bytes Used:\t\t %u bytes\n",
 		(unsigned int)le32_to_cpu(inode->mrec->bytes_in_use));
-	printf("Size - Allocated:\t\t %u bytes\n",
+	printf("Bytes Allocated:\t %u bytes\n",
 		(unsigned int)le32_to_cpu(inode->mrec->bytes_allocated));
 
 	if (inode->mrec->base_mft_record) {
-		printf("base MFT record:\t\t %llu\n",
+		printf("Base MFT Record:\t %llu\n",
 			MREF_LE(inode->mrec->base_mft_record));
 	}
-	printf("Next Attribute Instance:\t %hu\n",
+	printf("Next Attribute Instance: %hu\n",
 		le16_to_cpu(inode->mrec->next_attr_instance));
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.380,1.381

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
Dump USA, USN and LSN for index records


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -p -r1.380 -r1.381
--- ChangeLog	19 Apr 2006 21:43:11 -0000	1.380
+++ ChangeLog	23 Apr 2006 10:06:39 -0000	1.381
@@ -30,8 +30,9 @@ xx/xx/2006 - 1.13.1-WIP
 	- 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)
+	  header (--verbose) for all attribute types. Dump USA, USN and LSN
+	  for index records. Removed a lot of redundant code, made some
+	  formatting and stylistic corrections.  (Szaka)
 	- libntfs: add ntfs_str2ucs(), ntfs_freeucs(), ntfs_mft_usn_dec()
 	  and ntfs_inode_badclus_bad() functions, and convert all copy-pastes
 	  to use them.  (Szaka)

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs layout.h,1.55,1.56

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

Changes by: antona

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

Modified Files:
	layout.h 
Log Message:
Update a comment for a field.


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- layout.h	14 Mar 2006 21:20:20 -0000	1.55
+++ layout.h	21 Apr 2006 16:12:48 -0000	1.56
@@ -2536,7 +2536,11 @@ typedef struct {
 	u32 state;		/* Always 0? */
 	u32 version;		/* Efs version.  Always 2? */
 	u32 crypto_api_version;	/* Always 0? */
-/* 16*/	u8 unknown4[16];	/* MD5 hash of decrypted FEK? */
+/* 16*/	u8 unknown4[16];	/* MD5 hash of decrypted FEK?  This field is
+				   created with a call to UuidCreate() so is
+				   unlikely to be an MD5 hash and is more
+				   likely to be GUID of this encrytped file
+				   or something like that. */
 /* 32*/	u8 unknown5[16];	/* MD5 hash of DDFs? */
 /* 48*/	u8 unknown6[16];	/* MD5 hash of DRFs? */
 /* 64*/	u32 offset_to_ddf_array;/* Offset in bytes to the array of data

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsdecrypt.c,1.29,1.30 ntfsinfo.c,1.122,1.123

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

Changes by: antona

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

Modified Files:
	ntfsdecrypt.c ntfsinfo.c 
Log Message:
Fix compile warnings that have sneaked in.


Index: ntfsdecrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ntfsdecrypt.c	5 Apr 2006 12:43:07 -0000	1.29
+++ ntfsdecrypt.c	19 Apr 2006 22:03:58 -0000	1.30
@@ -108,7 +108,7 @@ typedef struct {
 
 /* DESX-MS128 implementation for libgcrypt. */
 static gcry_module_t ntfs_desx_module;
-static int ntfs_desx_algorithm_id = -1;
+static unsigned ntfs_desx_algorithm_id = -1;
 
 typedef struct {
 	u64 in_whitening, out_whitening;

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- ntfsinfo.c	19 Apr 2006 21:43:11 -0000	1.122
+++ ntfsinfo.c	19 Apr 2006 22:03:59 -0000	1.123
@@ -431,7 +431,7 @@ static void ntfs_dump_volume(ntfs_volume
  * @type:	dump flags for this attribute type
  * @flags:	flags for dumping
  */
-static void ntfs_dump_flags(char *indent, ATTR_TYPES type, u32 flags)
+static void ntfs_dump_flags(const char *indent, ATTR_TYPES type, u32 flags)
 {
 	printf("%sFile attributes:\t", indent);
 	if (flags & FILE_ATTR_READONLY) {
@@ -506,7 +506,7 @@ static void ntfs_dump_flags(char *indent
 /**
  * ntfs_dump_namespace
  */
-static void ntfs_dump_namespace(char *indent, u8 file_name_type)
+static void ntfs_dump_namespace(const char *indent, u8 file_name_type)
 {
 	const char *mbs_file_type;
 
@@ -665,7 +665,8 @@ static void ntfs_dump_attr_list(ATTR_REC
 /**
  * ntfs_dump_filename()
  */
-static void ntfs_dump_filename(char *indent, FILE_NAME_ATTR *file_name_attr)
+static void ntfs_dump_filename(const char *indent,
+		FILE_NAME_ATTR *file_name_attr)
 {
 	printf("%sParent directory:\t %lld\n", indent,
 		(long long)MREF_LE(file_name_attr->parent_directory));

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.121,1.122 mkntfs.c,1.141,1.142

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

Changes by: antona

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

Modified Files:
	ntfsinfo.c mkntfs.c 
Log Message:
- Improve ntfsinfo to dump standard info completely and filename
  attribute completely and index entry (filename) completely and all in
  correct order.  Essential for hunting bugs in directory operations
  code...  (Anton)



Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- ntfsinfo.c	5 Apr 2006 12:43:07 -0000	1.121
+++ ntfsinfo.c	19 Apr 2006 21:43:11 -0000	1.122
@@ -42,7 +42,6 @@
  *
  *	Still need to do:
  *	    $REPARSE_POINT/$SYMBOLIC_LINK
- *	    $PROPERTY_SET
  *	    $LOGGED_UTILITY_STREAM
  */
 
@@ -432,9 +431,9 @@ static void ntfs_dump_volume(ntfs_volume
  * @type:	dump flags for this attribute type
  * @flags:	flags for dumping
  */
-static void ntfs_dump_flags(ATTR_TYPES type, u32 flags)
+static void ntfs_dump_flags(char *indent, ATTR_TYPES type, u32 flags)
 {
-	printf("\tFile attributes:\t");
+	printf("%sFile attributes:\t", indent);
 	if (flags & FILE_ATTR_READONLY) {
 		printf(" READONLY");
 		flags &= ~FILE_ATTR_READONLY;
@@ -507,7 +506,7 @@ static void ntfs_dump_flags(ATTR_TYPES t
 /**
  * ntfs_dump_namespace
  */
-static void ntfs_dump_namespace(u8 file_name_type)
+static void ntfs_dump_namespace(char *indent, u8 file_name_type)
 {
 	const char *mbs_file_type;
 
@@ -528,7 +527,7 @@ static void ntfs_dump_namespace(u8 file_
 	default:
 		mbs_file_type = "(unknown)";
 	}
-	printf("\tNamespace:\t\t %s\n", mbs_file_type);
+	printf("%sNamespace:\t\t %s\n", indent, mbs_file_type);
 }
 
 /* *************** functions for dumping attributes ******************** */
@@ -563,7 +562,7 @@ static void ntfs_dump_attr_standard_info
 		ntfs_time_str = ntfsinfo_time_to_str(standard_attr->last_access_time);
 		printf("\tLast Accessed Time:\t %s",ntfs_time_str);
 	}
-	ntfs_dump_flags(attr->type, standard_attr->file_attributes);
+	ntfs_dump_flags("\t", attr->type, standard_attr->file_attributes);
 
 	printf("\tMax Number of Versions:\t %u \n",
 		(unsigned int)le32_to_cpu(standard_attr->maximum_versions));
@@ -577,10 +576,21 @@ static void ntfs_dump_attr_standard_info
 /*		printf("\t$STANDARD_INFORMATION fields owner_id, security_id, quota \n"
 			"\t & usn are missing. This volume has not been upgraded\n"); */
 	} else if (value_length == 72) {
+		printf("\tMaximum versions:\t %u \n", (unsigned int)
+				le32_to_cpu(standard_attr->maximum_versions));
+		printf("\tVersion number:\t\t %u \n", (unsigned int)
+				le32_to_cpu(standard_attr->version_number));
+		printf("\tClass ID:\t\t %u \n",
+			(unsigned int)le32_to_cpu(standard_attr->class_id));
 		printf("\tUser ID:\t\t %u \n",
 			(unsigned int)le32_to_cpu(standard_attr->owner_id));
 		printf("\tSecurity ID:\t\t %u \n",
 			(unsigned int)le32_to_cpu(standard_attr->security_id));
+		printf("\tQuota charged:\t\t %llu \n", (unsigned long long)
+				le64_to_cpu(standard_attr->quota_charged));
+		printf("\tUpdate Sequence Number:\t %llu \n",
+				(unsigned long long)
+				le64_to_cpu(standard_attr->usn));
 	} else {
 		printf("\tSize of STANDARD_INFORMATION is %u. It should be "
 			"either 72 or 48, something is wrong...\n",
@@ -653,18 +663,54 @@ static void ntfs_dump_attr_list(ATTR_REC
 }
 
 /**
- * ntfs_dump_attr_file_name()
+ * ntfs_dump_filename()
  */
-static void ntfs_dump_attr_file_name(ATTR_RECORD *attr)
+static void ntfs_dump_filename(char *indent, FILE_NAME_ATTR *file_name_attr)
 {
-	FILE_NAME_ATTR *file_name_attr = NULL;
+	printf("%sParent directory:\t %lld\n", indent,
+		(long long)MREF_LE(file_name_attr->parent_directory));
+	/* time stuff */
+	if (!opts.notime) {
+		char *ntfs_time_str;
 
-	file_name_attr = (FILE_NAME_ATTR*)((char *)attr +
-		le16_to_cpu(attr->value_offset));
+		ntfs_time_str = ntfsinfo_time_to_str(
+				file_name_attr->creation_time);
+		printf("%sFile Creation Time:\t %s", indent, ntfs_time_str);
+
+		ntfs_time_str = ntfsinfo_time_to_str(
+				file_name_attr->last_data_change_time);
+		printf("%sFile Altered Time:\t %s", indent, ntfs_time_str);
 
-	/* let's start with the obvious - file name */
+		ntfs_time_str = ntfsinfo_time_to_str(
+				file_name_attr->last_mft_change_time);
+		printf("%sMFT Changed Time:\t %s", indent, ntfs_time_str);
 
-	if (file_name_attr->file_name_length>0) {
+		ntfs_time_str = ntfsinfo_time_to_str(
+				file_name_attr->last_access_time);
+		printf("%sLast Accessed Time:\t %s", indent, ntfs_time_str);
+	}
+	/* other basic stuff about the file */
+	printf("%sAllocated Size:\t\t %lld\n", indent, (long long)
+			sle64_to_cpu(file_name_attr->allocated_size));
+	printf("%sData Size:\t\t %lld\n", indent,
+			(long long)sle64_to_cpu(file_name_attr->data_size));
+	printf("%sFilename Length:\t %d\n", indent,
+			(unsigned)file_name_attr->file_name_length);
+	ntfs_dump_flags(indent, AT_FILE_NAME, file_name_attr->file_attributes);
+	if (file_name_attr->file_attributes & FILE_ATTR_REPARSE_POINT &&
+			file_name_attr->reserved)
+		printf("%sReparse point tag:\t 0x%x\n", indent, (unsigned)
+				le32_to_cpu(file_name_attr->reparse_point_tag));
+	else if (file_name_attr->reparse_point_tag) {
+		printf("%sEA Length:\t\t %d\n", indent, (unsigned)
+				le16_to_cpu(file_name_attr->packed_ea_size));
+		if (file_name_attr->reserved)
+			printf("%sReserved:\t\t %d\n", indent, (unsigned)
+					le16_to_cpu(file_name_attr->reserved));
+	}
+	/* The filename. */
+	ntfs_dump_namespace(indent, file_name_attr->file_name_type);
+	if (file_name_attr->file_name_length > 0) {
 		/* but first we need to convert the little endian unicode string
 		   into a printable format */
 		char *mbs_file_name = NULL;
@@ -674,47 +720,24 @@ static void ntfs_dump_attr_file_name(ATT
 			file_name_attr->file_name_length,&mbs_file_name,0);
 
 		if (mbs_file_name_size>0) {
-			printf("\tFile Name:\t\t '%s'\n", mbs_file_name);
+			printf("%sFilename:\t\t '%s'\n", indent, mbs_file_name);
 			free(mbs_file_name);
 		} else {
 			/* an error occurred, errno holds the reason - notify the user */
 			ntfs_log_perror("ntfsinfo error: could not parse file name");
 		}
-		/* any way, error or not, print the length */
-		printf("\tFile Name Length:\t %d\n", file_name_attr->file_name_length);
 	} else {
-		printf("\tFile Name:\t\t unnamed?!?\n");
+		printf("%sFile Name:\t\t unnamed?!?\n", indent);
 	}
+}
 
-	ntfs_dump_namespace(file_name_attr->file_name_type);
-
-	/* other basic stuff about the file */
-	printf("\tAllocated File Size:\t %lld\n",
-		(long long)sle64_to_cpu(file_name_attr->allocated_size));
-	printf("\tReal File Size:\t\t %lld\n",
-		(long long)sle64_to_cpu(file_name_attr->data_size));
-	printf("\tParent directory:\t %lld\n",
-		(long long)MREF_LE(file_name_attr->parent_directory));
-	ntfs_dump_flags(attr->type, file_name_attr->file_attributes);
-
-	/* time stuff stuff */
-	if (!opts.notime) {
-		char *ntfs_time_str;
-
-		ntfs_time_str = ntfsinfo_time_to_str(file_name_attr->creation_time);
-		printf("\tFile Creation Time:\t %s",ntfs_time_str);
-
-		ntfs_time_str = ntfsinfo_time_to_str(
-			file_name_attr->last_data_change_time);
-		printf("\tFile Altered Time:\t %s",ntfs_time_str);
-
-		ntfs_time_str = ntfsinfo_time_to_str(
-			file_name_attr->last_mft_change_time);
-		printf("\tMFT Changed Time:\t %s",ntfs_time_str);
-
-		ntfs_time_str = ntfsinfo_time_to_str(file_name_attr->last_access_time);
-		printf("\tLast Accessed Time:\t %s",ntfs_time_str);
-	}
+/**
+ * ntfs_dump_attr_file_name()
+ */
+static void ntfs_dump_attr_file_name(ATTR_RECORD *attr)
+{
+	ntfs_dump_filename("\t", (FILE_NAME_ATTR*)((u8*)attr +
+			le16_to_cpu(attr->value_offset)));
 }
 
 /**
@@ -1053,11 +1076,9 @@ static void ntfs_dump_sds(ATTR_RECORD *a
 	       le64_to_cpu(sd->offset) + 
 			le32_to_cpu(sd->length) < (u64)data_size) {
 		ntfs_dump_sds_entry(sd);
-		sd = (SECURITY_DESCRIPTOR_HEADER *)((char *)sd +
-				(cpu_to_le32(sd->length + 0x0F) &
-				 ~cpu_to_le32(0x0F)));
+		sd = (SECURITY_DESCRIPTOR_HEADER *)((char*)sd +
+				((le32_to_cpu(sd->length) + 15) & ~15));
 	}
-	
 	free(sds);
 }
 
@@ -1335,8 +1356,6 @@ static void ntfs_dump_index_data(INDEX_E
 static int ntfs_dump_index_entries(INDEX_ENTRY *entry, INDEX_ATTR_TYPE type)
 {
 	int numb_entries = 1;
-	char *name = NULL;
-
 	while (1) {
 		if (!opts.verbose) {
 			if (entry->flags & INDEX_ENTRY_END)
@@ -1362,41 +1381,10 @@ static int ntfs_dump_index_entries(INDEX
 			break;
 
 		switch (type) {
-		case(INDEX_ATTR_DIRECTORY_I30):
+		case INDEX_ATTR_DIRECTORY_I30:
 			ntfs_log_verbose("\t\tFILE record number:\t %llu\n",
 					MREF_LE(entry->indexed_file));
-			printf("\t");
-			ntfs_dump_flags(AT_FILE_NAME, entry->key.
-				file_name.file_attributes);
-			printf("\t");
-			ntfs_dump_namespace(entry->key.
-				file_name.file_name_type);
-			ntfs_ucstombs(entry->key.file_name.file_name,
-				entry->key.file_name.file_name_length,
-				&name, 0);
-			ntfs_log_verbose("\t\tName:\t\t\t %s\n", name);
-			free(name);
-			name = NULL;
-			ntfs_log_verbose("\t\tParent directory:\t %lld\n",
-				 MREF_LE(entry->
-				 key.file_name.parent_directory));
-			ntfs_log_verbose("\t\tCreation time:\t\t %s",
-				ntfsinfo_time_to_str(
-					entry->key.file_name.creation_time));
-			ntfs_log_verbose("\t\tData change time:\t %s",
-				ntfsinfo_time_to_str(
-					entry->key.file_name.last_data_change_time));
-			ntfs_log_verbose("\t\tMFT change time:\t %s",
-				ntfsinfo_time_to_str(
-					entry->key.file_name.last_mft_change_time));
-			ntfs_log_verbose("\t\tAccess time:\t\t %s",
-				ntfsinfo_time_to_str(
-					entry->key.file_name.last_access_time));
-			ntfs_log_verbose("\t\tData size:\t\t %lld\n",
-				sle64_to_cpu(entry->key.file_name.data_size));
-			ntfs_log_verbose("\t\tAllocated size:\t\t %lld\n",
-				sle64_to_cpu(
-				entry->key.file_name.allocated_size));
+			ntfs_dump_filename("\t\t", &entry->key.file_name);
 			break;
 		default:
 			ntfs_log_verbose("\t\tData offset:\t\t %u\n",
@@ -1705,12 +1693,19 @@ static void ntfs_dump_attr_ea(ATTR_RECOR
 			else
 				printf("Unknown (0x%02x)\n", ea->flags);
 		} else
-			printf("\n");
+			printf("NONE\n");
 		printf("\tName length:\t %d\n", ea->name_length);
 		printf("\tValue length:\t %d\n",
 				le16_to_cpu(ea->value_length));
 		printf("\tName:\t\t '%s'\n", ea->name);
-		printf("\tValue:\t\t '%s'\n", ea->value + ea->name_length + 1);
+		printf("\tValue:\t\t ");
+		if (ea->name_length == 11 &&
+				!strncmp((const char*)"SETFILEBITS",
+				(const char*)ea->name, 11))
+			printf("0%o\n", le32_to_cpu(*(le32*)(ea->value +
+					ea->name_length + 1)));
+		else
+			printf("'%s'\n", ea->value + ea->name_length + 1);
 		if (ea->next_entry_offset)
 			ea = (EA_ATTR*)((u8*)ea +
 					le32_to_cpu(ea->next_entry_offset));

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- mkntfs.c	5 Apr 2006 12:43:07 -0000	1.141
+++ mkntfs.c	19 Apr 2006 21:43:11 -0000	1.142
@@ -2715,8 +2715,8 @@ static int insert_index_entry_in_res_dir
 	 * reach the last entry.
 	 */
 	if (type == AT_FILE_NAME) {
-		 while (((u8*)idx_entry < (u8*)idx_end) &&
-				 !(idx_entry->flags & INDEX_ENTRY_END)) {
+		while (((u8*)idx_entry < (u8*)idx_end) &&
+				!(idx_entry->flags & INDEX_ENTRY_END)) {
 			i = ntfs_file_values_compare(&idx->key.file_name,
 					&idx_entry->key.file_name, 1,
 					IGNORE_CASE, g_vol->upcase,

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.379,1.380

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

Changes by: antona

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

Modified Files:
	ChangeLog 
Log Message:
- Improve ntfsinfo to dump standard info completely and filename
  attribute completely and index entry (filename) completely and all in
  correct order.  Essential for hunting bugs in directory operations
  code...  (Anton)



Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -p -r1.379 -r1.380
--- ChangeLog	18 Apr 2006 21:40:32 -0000	1.379
+++ ChangeLog	19 Apr 2006 21:43:11 -0000	1.380
@@ -42,6 +42,10 @@ xx/xx/2006 - 1.13.1-WIP
 	  default.  (Szaka)
 	- configure.ac: set PKG_CONFIG_PATH during build time so we should
 	  find .pc files in the most typical pkgconfig directories.  (Szaka)
+	- Improve ntfsinfo to dump standard info completely and filename
+	  attribute completely and index entry (filename) completely and all in
+	  correct order.  Essential for hunting bugs in directory operations
+	  code...  (Anton)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.117,1.118

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Warn about bad sectors if pure disk I/O fails with EIO. This is regularly 
reported with faulty disks.


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- ntfsresize.c	18 Apr 2006 21:37:24 -0000	1.117
+++ ntfsresize.c	18 Apr 2006 22:03:09 -0000	1.118
@@ -1420,13 +1420,21 @@ static void copy_clusters(ntfs_resize_t 
 
 		lseek_to_cluster(vol, src + i);
 
-		if (read_all(vol->dev, buff, vol->cluster_size) == -1)
-			perr_exit("read_all");
+		if (read_all(vol->dev, buff, vol->cluster_size) == -1) {
+			perr_printf("Failed to read from the disk");
+			if (errno == EIO)
+				printf("%s", bad_sectors_warning_msg);
+			exit(1);
+		}
 
 		lseek_to_cluster(vol, dest + i);
 
-		if (write_all(vol->dev, buff, vol->cluster_size) == -1)
-			perr_exit("write_all");
+		if (write_all(vol->dev, buff, vol->cluster_size) == -1) {
+			perr_printf("Failed to write to the disk");
+			if (errno == EIO)
+				printf("%s", bad_sectors_warning_msg);
+			exit(1);
+		}
 
 		resize->relocations++;
 		progress_update(&resize->progress, resize->relocations);

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.378,1.379 configure.ac,1.105,1.106

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

Changes by: szaka

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Set PKG_CONFIG_PATH during build time so we should find .pc files in the 
most typical pkgconfig directories


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -p -r1.378 -r1.379
--- ChangeLog	11 Apr 2006 22:48:14 -0000	1.378
+++ ChangeLog	18 Apr 2006 21:40:32 -0000	1.379
@@ -40,6 +40,8 @@ xx/xx/2006 - 1.13.1-WIP
 	- ntfscmp: support bad cluster list, compare full attribute headers
 	  for non-resident attributes, added manual, build and install by 
 	  default.  (Szaka)
+	- configure.ac: set PKG_CONFIG_PATH during build time so we should
+	  find .pc files in the most typical pkgconfig directories.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- configure.ac	11 Apr 2006 21:50:39 -0000	1.105
+++ configure.ac	18 Apr 2006 21:40:32 -0000	1.106
@@ -180,16 +180,16 @@ AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 
+# Libraries often install their metadata .pc files in directories not searched
+# by pkg-config. Let's workaround this. 
+export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:$prefix/lib/pkgconfig:/opt/gnome/share/pkgconfig:/usr/local/share/pkgconfig
+
 # Enable large file support.
 AC_SYS_LARGEFILE
 
 # Autodetect whether to build Gnome VFS or not.
 compile_gnome_vfs=false
 if test "$enable_gnome_vfs" != "no"; then
-	# Make compilation work on SuSE 9.0.
-	if test -d "/opt/gnome"; then
-		export PKG_CONFIG_PATH="/opt/gnome/lib/pkgconfig"
-	fi
 	PKG_CHECK_MODULES(LIBNTFS_GNOMEVFS, [glib-2.0 gthread-2.0 gnome-vfs-module-2.0],
 	[ compile_gnome_vfs=true ],
 	[

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.116,1.117

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Print more info on relocations in verbose mode


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- ntfsresize.c	5 Apr 2006 12:43:07 -0000	1.116
+++ ntfsresize.c	18 Apr 2006 21:37:24 -0000	1.117
@@ -1538,11 +1538,13 @@ static void relocate_run(ntfs_resize_t *
 			  resize->mref, lcn_length);
 
 	/* FIXME: check $MFTMirr DATA isn't multi-run (or support it) */
-	ntfs_log_verbose("Relocate inode %7llu:0x%x:%08lld:0x%08llx --> "
-			 "0x%08llx\n", (unsigned long long)resize->mref,
-			(unsigned int)le32_to_cpu(resize->ctx->attr->type),
-			(long long)lcn_length, (unsigned long long)lcn,
-			(unsigned long long)relocate_rl->lcn);
+	ntfs_log_verbose("Relocate record %7llu:0x%x:%08lld:0x%08llx:0x%08llx "
+			 "--> 0x%08llx\n", (unsigned long long)resize->mref,
+			 (unsigned int)le32_to_cpu(resize->ctx->attr->type),
+			 (long long)lcn_length,
+			 (unsigned long long)(*rl + run)->vcn,
+			 (unsigned long long)lcn,
+			 (unsigned long long)relocate_rl->lcn);
 
 	relocate_clusters(resize, relocate_rl, lcn);
 	rl_insert_at_run(rl, run, relocate_rl);
@@ -1694,7 +1696,7 @@ static void relocate_inode(ntfs_resize_t
 //		if (vol->dev->d_ops->sync(vol->dev) == -1)
 //			perr_exit("Failed to sync device");
 		if (write_mft_record(resize->vol, mref, resize->mrec))
-			perr_exit("Couldn't update inode %llu", mref);
+			perr_exit("Couldn't update record %llu", mref);
 	}
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.377,1.378

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
Update with ntfscmp changes


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -p -r1.377 -r1.378
--- ChangeLog	6 Apr 2006 17:00:33 -0000	1.377
+++ ChangeLog	11 Apr 2006 22:48:14 -0000	1.378
@@ -37,6 +37,9 @@ xx/xx/2006 - 1.13.1-WIP
 	  to use them.  (Szaka)
 	- Fix all incorrect getopt_long() return value usages.  (Szaka)
 	- Fix VCN size in the index.c.  (Anton, Yura)
+	- ntfscmp: support bad cluster list, compare full attribute headers
+	  for non-resident attributes, added manual, build and install by 
+	  default.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.57,1.58

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

Changes by: szaka

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

Modified Files:
	Makefile.am 
Log Message:
Build and install ntfscmp by default


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- Makefile.am	11 Apr 2006 21:50:39 -0000	1.57
+++ Makefile.am	11 Apr 2006 22:47:22 -0000	1.58
@@ -11,11 +11,11 @@ endif
 # Workaround to make REALLYSTATIC work with automake 1.5.
 LINK=$(STATIC_LINK) $(LIBTOOL_LINK)
 
-bin_PROGRAMS		= ntfsfix ntfsinfo ntfscluster ntfsls ntfscat
+bin_PROGRAMS		= ntfsfix ntfsinfo ntfscluster ntfsls ntfscat ntfscmp
 sbin_PROGRAMS		= mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone \
 			  ntfscp
 EXTRA_PROGRAMS		= ntfsdump_logfile ntfswipe ntfstruncate ntfsmove \
-			  ntfsmftalloc ntfscmp
+			  ntfsmftalloc
 
 man_MANS		= mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \
 			  ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \
@@ -95,6 +95,10 @@ ntfsmount_LDFLAGS	= $(AM_LFLAGS)
 ntfsmount_CFLAGS	= $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=25
 endif
 
+ntfscmp_SOURCES		= ntfscmp.c utils.c utils.h
+ntfscmp_LDADD		= $(AM_LIBS)
+ntfscmp_LDFLAGS		= $(AM_LFLAGS)
+
 # We don't distribute these
 
 if ENABLE_RICH
@@ -107,10 +111,6 @@ ntfstruncate_SOURCES	= attrdef.c ntfstru
 ntfstruncate_LDADD	= $(AM_LIBS)
 ntfstruncate_LDFLAGS	= $(AM_LFLAGS)
 
-ntfscmp_SOURCES		= ntfscmp.c utils.c utils.h
-ntfscmp_LDADD		= $(AM_LIBS)
-ntfscmp_LDFLAGS		= $(AM_LFLAGS)
-
 ntfsmftalloc_SOURCES	= ntfsmftalloc.c utils.c utils.h
 ntfsmftalloc_LDADD	= $(AM_LIBS)
 ntfsmftalloc_LDFLAGS	= $(AM_LFLAGS)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscmp.8.in,1.1,1.2

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

Changes by: szaka

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

Modified Files:
	ntfscmp.8.in 
Log Message:
Fix typos


Index: ntfscmp.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.8.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ntfscmp.8.in	11 Apr 2006 21:52:01 -0000	1.1
+++ ntfscmp.8.in	11 Apr 2006 22:46:09 -0000	1.2
@@ -14,9 +14,9 @@ ntfscmp \- compare two NTFS filesystems 
 The
 .B ntfscmp
 program makes a comparison between two NTFS filesystems from all aspects and 
-reports all varianses it finds.
+reports all variances it finds.
 The filesystems can be on block devices or images files. Ntfscmp can be used
-for volume verification however its primarily purpose was to be an efficient
+for volume verification however its primary purpose was to be an efficient
 development tool, used to quickly locate, identify and check the correctness
 of the metadata changes made to NTFS. 
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsprogs.8.in,1.19,1.20

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

Changes by: szaka

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

Modified Files:
	ntfsprogs.8.in 
Log Message:
Update ntfsprogs manual


Index: ntfsprogs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsprogs.8.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntfsprogs.8.in	6 Feb 2006 01:05:01 -0000	1.19
+++ ntfsprogs.8.in	11 Apr 2006 22:14:38 -0000	1.20
@@ -1,11 +1,11 @@
 .\" Copyright (c) 2002\-2005 Richard Russon.
 .\" Copyright (c) 2002\-2003 Anton Altaparmakov.
-.\" Copyright (c) 2005 Szabolcs Szakacsits.
+.\" Copyright (c) 2005\-2006 Szabolcs Szakacsits.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSPROGS 8 "November 2005" "ntfsprogs @VERSION@"
+.TH NTFSPROGS 8 "April 2006" "ntfsprogs @VERSION@"
 .SH NAME
-ntfsprogs \- several tools for doing neat things with NTFS partitions
+ntfsprogs \- tools for doing neat things with NTFS
 .SH OVERVIEW
 .B ntfsprogs
 is a suite of NTFS utilities based around a shared library.  The tools are
@@ -13,42 +13,44 @@ available for free and come with full so
 .SH TOOLS
 .PP
 .BR mkntfs (8)
-\- Format a partition using NTFS.
+\- Create an NTFS filesystem.
 .PP
 .BR ntfscat (8)
-\- Dump a file's contents to the standard output.
+\- Dump a file's content to the standard output.
 .PP
 .BR ntfsclone (8)
-\- Efficiently clone, create, restore or rescue an image of an NTFS partition.
+\- Efficiently clone, backup, restore or rescue NTFS.
 .PP
 .BR ntfscluster (8)
-\- Locate the owner of any given sector or cluster on an NTFS partition.
+\- Locate the files which use the given sectors or clusters.
+.PP
+.BR ntfscmp (8)
+\- Compare two NTFS filesystems and tell the differences.
 .PP
 .BR ntfscp (8)
-\- Overwrite file on an NTFS partition.
+\- Overwrite a file on an NTFS.
 .PP
 .BR ntfsfix (8)
 \- Check and fix some common errors, clear the LogFile and make Windows
 perform a thorough check next time it boots.
 .PP
 .BR ntfsinfo (8)
-\- Show some information about an NTFS partition or one of the files
-or directories within it.
+\- Show information about NTFS or one of the files or directories within it.
 .PP
 .BR ntfslabel (8)
-\- Show, or set, an NTFS partition's volume label.
+\- Show, or set, an NTFS filesystem's volume label.
 .PP
 .BR ntfsls (8)
-\- List information about files in a directory residing on an NTFS partition.
+\- List information about files in a directory residing on an NTFS.
 .PP
 .BR ntfsmount (8)
-\- NTFS module for FUSE.
+\- Read-write NTFS userspace driver.
 .PP
 .BR ntfsresize (8)
-\- Resize an NTFS partition without losing data.
+\- Resize NTFS without losing data.
 .PP
 .BR ntfsundelete (8)
-\- Recover deleted files from an NTFS partition.
+\- Recover deleted files from NTFS.
 .SH AUTHORS
 .PP
 The tools were written by Anton Altaparmakov, Carmelo Kintana, Cristian Klein,

[Linux-NTFS-cvs] CVS: ntfsprogs TODO.ntfsprogs,1.26,1.27

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

Changes by: szaka

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

Modified Files:
	TODO.ntfsprogs 
Log Message:
Update ntfscmp TODO list


Index: TODO.ntfsprogs
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/TODO.ntfsprogs,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- TODO.ntfsprogs	5 Apr 2006 02:56:52 -0000	1.26
+++ TODO.ntfsprogs	11 Apr 2006 21:52:32 -0000	1.27
@@ -50,12 +50,14 @@ Thanks,
 * ntfscmp *
 ***********
 
-- more exact details about the differences 
-- unnamed resident attributes with same type are ignored
+- compare mft record headers
+- exit status is 0 if inputs are the same, 1 if different, other if trouble
+- optionally ignore less interesting fields (e.g. attribute instance)
 - new option: --metadata mode
+- unnamed resident attributes with same type are ignored
 - code cleanup, remove many cross-util duplicates
-- write manual
-- performance: perhaps special handling for sparse, compressed, encrypted
+- handle deleted records
+- performance: special handling for sparse files
 
 
 **********

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscmp.8.in,NONE,1.1

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

Changes by: szaka

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

Added Files:
	ntfscmp.8.in 
Log Message:
Add ntfscmp manual


--- NEW FILE ---
.\" Copyright (c) 2005\-2006 Szabolcs Szakacsits.
.\" This file may be copied under the terms of the GNU Public License.
.\"
.TH NTFSCMP 8 "April 2006" "ntfsprogs @VERSION@"
.SH NAME
ntfscmp \- compare two NTFS filesystems and tell the differences
.SH SYNOPSIS
.B ntfscmp
[\fIOPTIONS\fR]
.I DEVICE1
.I DEVICE2
.br
.SH DESCRIPTION
The
.B ntfscmp
program makes a comparison between two NTFS filesystems from all aspects and 
reports all varianses it finds.
The filesystems can be on block devices or images files. Ntfscmp can be used
for volume verification however its primarily purpose was to be an efficient
development tool, used to quickly locate, identify and check the correctness
of the metadata changes made to NTFS. 

If one is interested only in the NTFS metadata changes then it could be useful
to compare the metadata images created by 
using the --metadata option of
.BR ntfsclone (8)
to eliminate the usually uninteresting timestamp changes.

The terse output of
.B ntfscmp
is intentional because the provided information is enough in each case
to determine the exact differences. This can be achieved, for instance,
if one compares the verbose outputs of
.BR ntfsinfo (8)
for each reported inodes by the 
.BR diff (1)
utility.
.SH OPTIONS
Below is a summary of the options that
.B ntfscmp
accepts.
.TP
\fB\-P\fR, \fB\-\-no\-progress\-bar\fR
Don't show progress bars.
.TP
\fB\-v\fR, \fB\-\-verbose\fR
More informational output.
.TP
\fB\-h\fR, \fB\-\-help\fR
Display help and exit.
.SH EXIT CODES
The exit code is 0 on success, non\-zero otherwise.
.SH KNOWN ISSUES
No problem is known. If you would find otherwise then please send
your report to the development team:
.nh
linux\-ntfs\-d...@li...
.hy
.SH AUTHOR
.B ntfscmp
was written by Szabolcs Szakacsits (sz...@si...).
.SH AVAILABILITY
.B ntfscmp
is part of the
.B ntfsprogs
package and is available from:
.br
.nh
http://www.linux\-ntfs.org/content/view/19/37
.hy
.sp
The manual pages are available online at:
.br
.nh
http://man.linux-ntfs.org/
.hy
.SH SEE ALSO
.BR ntfsinfo (8),
.BR ntfscat (8),
.BR diff (1),
.BR ntfsclone (8),
.BR ntfsprogs (8)

[Linux-NTFS-cvs] CVS: ntfsprogs configure.ac,1.104,1.105

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

Changes by: szaka

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

Modified Files:
	configure.ac 
Log Message:
Add ntfscmp manual


Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- configure.ac	14 Mar 2006 19:07:35 -0000	1.104
+++ configure.ac	11 Apr 2006 21:50:39 -0000	1.105
@@ -375,6 +375,7 @@ AC_CONFIG_FILES([
 	ntfsprogs/ntfscat.8
 	ntfsprogs/ntfsclone.8
 	ntfsprogs/ntfscluster.8
+	ntfsprogs/ntfscmp.8
 	ntfsprogs/ntfscp.8
 	ntfsprogs/ntfsfix.8
 	ntfsprogs/ntfsinfo.8

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.56,1.57

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

Changes by: szaka

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

Modified Files:
	Makefile.am 
Log Message:
Add ntfscmp manual


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- Makefile.am	1 Feb 2006 17:37:35 -0000	1.56
+++ Makefile.am	11 Apr 2006 21:50:39 -0000	1.57
@@ -20,7 +20,7 @@ EXTRA_PROGRAMS		= ntfsdump_logfile ntfsw
 man_MANS		= mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \
 			  ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \
 			  ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8 \
-			  ntfsmount.8
+			  ntfsmount.8 ntfscmp.8
 EXTRA_MANS		=
 
 CLEANFILES		= $(EXTRA_PROGRAMS)

[Linux-NTFS-cvs] hi

[Sivaramakrishnan K <shi...@ya...>]

  
				
---------------------------------
 Jiyo cricket on Yahoo! India cricket
Yahoo! Messenger Mobile Stay in touch with your buddies all the time.

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.376,1.377

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
fix VCN size in index.c


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -p -r1.376 -r1.377
--- ChangeLog	5 Apr 2006 12:43:06 -0000	1.376
+++ ChangeLog	6 Apr 2006 17:00:33 -0000	1.377
@@ -36,6 +36,7 @@ xx/xx/2006 - 1.13.1-WIP
 	  and ntfs_inode_badclus_bad() functions, and convert all copy-pastes
 	  to use them.  (Szaka)
 	- Fix all incorrect getopt_long() return value usages.  (Szaka)
+	- Fix VCN size in the index.c.  (Anton, Yura)
 
 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.11,1.12

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	index.h 
Log Message:
fix VCN size in index.c


Index: index.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/index.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- index.h	27 Mar 2006 21:14:56 -0000	1.11
+++ index.h	6 Apr 2006 17:00:39 -0000	1.12
@@ -32,20 +32,22 @@
 
 /**
  * struct ntfs_index_context -
- * @ni:		inode containing the @entry described by this context
- * @name:	name of the index described by this context
- * @name_len:	length of the index name
- * @entry:	index entry (points into @ir or @ia)
- * @data:	index entry data (points into @entry)
- * @data_len:	length in bytes of @data
- * @is_in_root:	TRUE if @entry is in @ir and FALSE if it is in @ia
- * @ir:		index root if @is_in_root and NULL otherwise
- * @actx:	attribute search context if @is_in_root and NULL otherwise
- * @ia:		index block if @is_in_root is FALSE and NULL otherwise
- * @ia_na:	opened INDEX_ALLOCATION attribute
- * @ia_vcn:	VCN from which @ia where read from
- * @ia_dirty:	TRUE if index block was changed
- * @block_size:	index block size
+ * @ni:			inode containing the @entry described by this context
+ * @name:		name of the index described by this context
+ * @name_len:		length of the index name
+ * @entry:		index entry (points into @ir or @ia)
+ * @data:		index entry data (points into @entry)
+ * @data_len:		length in bytes of @data
+ * @is_in_root:		TRUE if @entry is in @ir or FALSE if it is in @ia
+ * @ir:			index root if @is_in_root or NULL otherwise
+ * @actx:		attribute search context if in root or NULL otherwise
+ * @ia:			index block if @is_in_root is FALSE or NULL otherwise
+ * @ia_na:		opened INDEX_ALLOCATION attribute
+ * @ia_vcn:		VCN from which @ia where read from
+ * @ia_dirty:		TRUE if index block was changed
+ * @block_size:		index block size
+ * @vcn_size:		VCN size for this index block
+ * @vcn_size_bits:	use instead of @vcn_size to speedup multiplication
  *
  * @ni is the inode this context belongs to.
  *
@@ -87,6 +89,8 @@ typedef struct {
 	VCN ia_vcn;
 	BOOL ia_dirty;
 	u32 block_size;
+	u32 vcn_size;
+	u8 vcn_size_bits;
 } ntfs_index_context;
 
 extern ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *ni,

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

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	index.c 
Log Message:
fix VCN size in index.c


Index: index.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- index.c	27 Mar 2006 21:14:56 -0000	1.26
+++ index.c	6 Apr 2006 17:00:40 -0000	1.27
@@ -90,8 +90,7 @@ void ntfs_index_ctx_put(ntfs_index_conte
 			if (ictx->ia_dirty) {
 				if (ntfs_attr_mst_pwrite(ictx->ia_na,
 						ictx->ia_vcn <<
-						ictx->ni->vol->
-						cluster_size_bits,
+						ictx->vcn_size_bits,
 						1, ictx->block_size,
 						ictx->ia) != 1)
 					ntfs_log_error("Failed to write out "
@@ -122,8 +121,7 @@ void ntfs_index_ctx_reinit(ntfs_index_co
 			if (ictx->ia_dirty) {
 				if (ntfs_attr_mst_pwrite(ictx->ia_na,
 						ictx->ia_vcn <<
-						ictx->ni->vol->
-						cluster_size_bits,
+						ictx->vcn_size_bits,
 						1, ictx->block_size,
 						ictx->ia) != 1)
 					ntfs_log_error("Failed to write out "
@@ -218,6 +216,14 @@ int ntfs_index_lookup(const void *key, c
 	index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length);
 	/* Save index block size for future use. */
 	ictx->block_size = le32_to_cpu(ir->index_block_size);
+	/* Determine the size of a vcn in the directory index. */
+	if (vol->cluster_size <= ictx->block_size) {
+		ictx->vcn_size = vol->cluster_size;
+		ictx->vcn_size_bits = vol->cluster_size_bits;
+	} else {
+		ictx->vcn_size = vol->sector_size;
+		ictx->vcn_size_bits = vol->sector_size_bits;
+	}
 	/* Get collation rule type and validate it. */
 	cr = ir->collation_rule;
 	if (!ntfs_is_collation_rule_supported(cr)) {
@@ -326,7 +332,7 @@ done:
 descend_into_child_node:
 	ntfs_log_debug("Descend into node with VCN %lld.\n", vcn);
 	/* Read index allocation block. */
-	if (ntfs_attr_mst_pread(na, vcn << vol->cluster_size_bits, 1,
+	if (ntfs_attr_mst_pread(na, vcn << ictx->vcn_size_bits, 1,
 				ictx->block_size, ia) != 1) {
 		ntfs_log_error("Failed to read index allocation.\n");
 		goto err_out;