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

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c, 1.220, 1.221 dir.c, 1.63, 1.64

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv30036/libntfs

Modified Files:
	attrib.c dir.c 
Log Message:
a bit of cleanups


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- attrib.c	3 Aug 2006 04:30:41 -0000	1.220
+++ attrib.c	14 Aug 2006 03:52:56 -0000	1.221
@@ -4991,7 +4991,7 @@ put_err_out:
  *	EOPNOTSUPP	- The desired resize is not implemented yet.
  */
 int ntfs_attr_truncate(ntfs_attr *na, const s64 newsize)
-{ 
+{
 	int ret;
 
 	if (!na || newsize < 0 ||

Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- dir.c	28 Jul 2006 23:15:35 -0000	1.63
+++ dir.c	14 Aug 2006 03:52:56 -0000	1.64
@@ -549,7 +549,8 @@ ntfs_inode *ntfs_pathname_to_inode(ntfs_
 
 		len = ntfs_mbstoucs(p, &unicode, MAX_PATH);
 		if (len < 0) {
-			ntfs_log_debug("Couldn't convert name to Unicode: %s.\n", p);
+			ntfs_log_debug("Couldn't convert name to Unicode: "
+					"%s.\n", p);
 			err = EILSEQ;
 			goto close;
 		}

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.394,1.395

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv29720

Modified Files:
	ChangeLog 
Log Message:
fix endianness in ntfsinfo preparation fix to index code

btw, Szaka, you really should consider installing some cross-compiler for BE systems and qemu to test your changes.


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- ChangeLog	13 Aug 2006 19:48:08 -0000	1.394
+++ ChangeLog	14 Aug 2006 03:52:09 -0000	1.395
@@ -38,6 +38,7 @@ xx/xx/2006 - x.xx.x - .
 	- ntfsinfo: dump the FILE_ATTR_DIRECTORY flag.  (Szaka)
 	- ntfsinfo: dump padding between the Update Sequence Array and the
 	  first attribute in verbose mode.  (Szaka)
+	- ntfsinfo: Fix endianness.  (Yura)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.145,1.146

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv29720/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
fix endianness in ntfsinfo preparation fix to index code

btw, Szaka, you really should consider installing some cross-compiler for BE systems and qemu to test your changes.


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- ntfsinfo.c	13 Aug 2006 19:09:22 -0000	1.145
+++ ntfsinfo.c	14 Aug 2006 03:52:09 -0000	1.146
@@ -6,7 +6,7 @@
  * Copyright (c) 2002-2005 Richard Russon
  * Copyright (c) 2003-2006 Szabolcs Szakacsits
  * Copyright (c) 2004-2005 Yuval Fledel
- * Copyright (c) 2004-2005 Yura Pakhuchiy
+ * Copyright (c) 2004-2006 Yura Pakhuchiy
  * Copyright (c)      2005 Cristian Klein
  *
  * This utility will dump a file's attributes.
@@ -113,7 +113,7 @@ static void version(void)
 	printf("    2003-2006 Szabolcs Szakacsits\n");
 	printf("    2003      Leonard Norrgård\n");
 	printf("    2004-2005 Yuval Fledel\n");
-	printf("    2004-2005 Yura Pakhuchiy\n");
+	printf("    2004-2006 Yura Pakhuchiy\n");
 	printf("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
 }
 
@@ -678,7 +678,8 @@ static void ntfs_dump_attr_list(ATTR_REC
 			printf("unnamed\n");
 		printf("\t\tPadding:\t");
 		ntfs_dump_bytes((u8 *)entry, entry->name_offset + 
-				2 * entry->name_length, entry->length);
+				sizeof(ntfschar) * entry->name_length,
+				le16_to_cpu(entry->length));
 		printf("\n");
 	}
 	free(value);
@@ -831,7 +832,10 @@ static void ntfs_dump_acl(const char *pr
 
 	printf("%sRevision\t %u\n", prefix, acl->revision);
 
-	/* don't recalc le16_to_cpu every iteration (minor speedup on big-endians */
+	/* 
+	 * Do not recalculate le16_to_cpu every iteration (minor speedup on
+	 * big-endian machines.
+	 */
 	ace_count = le16_to_cpu(acl->ace_count);
 
 	/* initialize 'ace' to the first ace (if any) */
@@ -859,7 +863,7 @@ static void ntfs_dump_acl(const char *pr
 		}
 
 		printf("%sACE:\t\t type:%s  flags:0x%x  access:0x%x\n", prefix,
-			ace_type, (unsigned int)le16_to_cpu(ace->flags),
+			ace_type, (unsigned int)ace->flags,
 			(unsigned int)le32_to_cpu(ace->mask));
 		/* get a SID string */
 		sid = ntfs_sid_to_mbs(&ace->sid, NULL, 0);
@@ -867,7 +871,8 @@ static void ntfs_dump_acl(const char *pr
 		free(sid);
 
 		/* proceed to next ACE */
-		ace = (ACCESS_ALLOWED_ACE *)(((char *)ace) + le32_to_cpu(ace->size));
+		ace = (ACCESS_ALLOWED_ACE *)(((char *)ace) +
+				le32_to_cpu(ace->size));
 	}
 }
 
@@ -880,7 +885,8 @@ static void ntfs_dump_security_descripto
 	printf("%s\tRevision:\t\t %u\n", indent, sec_desc->revision);
 
 	/* TODO: parse the flags */
-	printf("%s\tControl:\t\t 0x%04x\n", indent, sec_desc->control);
+	printf("%s\tControl:\t\t 0x%04x\n", indent,
+			le16_to_cpu(sec_desc->control));
 
 	if (~sec_desc->control & SE_SELF_RELATIVE) {
 		
@@ -1153,12 +1159,13 @@ static const char *get_attribute_type_na
 static void ntfs_dump_attribute_header(ATTR_RECORD *a, ntfs_volume *vol)
 {
 	printf("Dumping attribute %s (%#02x)\n", 
-	       get_attribute_type_name(a->type), a->type);
+	       get_attribute_type_name(a->type), le32_to_cpu(a->type));
 
 	ntfs_log_verbose("\tAttribute length:\t %u\n", le32_to_cpu(a->length));
 	printf("\tResident: \t\t %s\n", a->non_resident ? "No" : "Yes");
 	ntfs_log_verbose("\tName length:\t\t %u\n", a->name_length);
-	ntfs_log_verbose("\tName offset:\t\t %u\n", le16_to_cpu(a->name_offset));
+	ntfs_log_verbose("\tName offset:\t\t %u\n",
+			le16_to_cpu(a->name_offset));
 
 	/* Dump the attribute (stream) name */
 	if (a->name_length) {
@@ -1573,7 +1580,7 @@ static void ntfs_dump_usa_lsn(const char
 	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)));
+	       le16_to_cpup((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));
 }
@@ -1654,7 +1661,8 @@ static void ntfs_dump_attr_index_allocat
 			int entries;
 			
 			entries = ntfs_dump_index_block(tmp_alloc, type,
-							ir->index_block_size);
+							le32_to_cpu(
+							ir->index_block_size));
 	       		if (entries != -1) {
 				total_entries += entries;
 				total_indx_blocks++;
@@ -1662,7 +1670,8 @@ static void ntfs_dump_attr_index_allocat
 			}
 		}
 		tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc + 
-						 ir->index_block_size);
+						le32_to_cpu(
+						ir->index_block_size));
 		bit++;
 		if (bit > 7) {
 			bit = 0;

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c, 1.143, 1.144

[Yura P. <pak...@gm...>]

On Sun, 13 Aug 2006 at 21:02 +0200, Szakacsits Szabolcs wrote:
> Changes by: szaka
> 
> Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
> In directory delta357.server4you.de:/tmp/cvs-serv8559
> 
> Modified Files:
> 	ntfsinfo.c 
> Log Message:
> ntfs_dump_flags(): dump FILE_ATTR_DIRECTORY
> 
> 
> Index: ntfsinfo.c
> ===================================================================
> RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
> retrieving revision 1.143
> retrieving revision 1.144
> diff -u -p -r1.143 -r1.144
> --- ntfsinfo.c	13 Aug 2006 18:59:56 -0000	1.143
> +++ ntfsinfo.c	13 Aug 2006 19:02:30 -0000	1.144
> @@ -463,6 +463,10 @@ static void ntfs_dump_flags(const char *
>  		printf(" SYSTEM");
>  		flags &= ~FILE_ATTR_SYSTEM;
>  	}
> +	if (flags & FILE_ATTR_DIRECTORY) {
> +		printf(" DIRECTORY");
> +		flags &= ~FILE_ATTR_DIRECTORY;
> +	}
>  	if (flags & FILE_ATTR_ARCHIVE) {
>  		printf(" ARCHIVE");
>  		flags &= ~FILE_ATTR_ARCHIVE;

Wrong. Please read comments more careful:

        FILE_ATTR_DIRECTORY             = const_cpu_to_le32(0x00000010),
        /* FILE_ATTR_DIRECTORY is not considered valid in NT. It is reserved
           for the DOS SUBDIRECTORY flag. */

It should be unknown flag in case we will encounter it.

-- 
Best regards,
        Yura

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.393,1.394

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv12926

Modified Files:
	ChangeLog 
Log Message:
fixes & improvements to ntfsclone, ntfscmp, ntfsinfo during ntfs-3g development


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- ChangeLog	2 Aug 2006 03:55:41 -0000	1.393
+++ ChangeLog	13 Aug 2006 19:48:08 -0000	1.394
@@ -9,7 +9,35 @@ xx/xx/2006 - x.xx.x - .
 	- Add new API ntfs_attr_exist() that checks whether attribute with
 	  selected type and name already present in inode.  (Szaka)
 	- Extend ntfs_index_{add_filename,rm} to support almost all cases of
-	  index operations.  (Szaka, Yura)
+	  index operations.  (Szaka)
+	- Support index operations when index root is in the base mft record.
+	  (Yura)
+	- calloc/malloc -> ntfs_{calloc,malloc} conversions.  (Szaka)
+	- ntfsclone: don't create image files with executable bit set.  (Szaka)
+	- ntfsclone: metadata cloning: write out extent records.  (Szaka) 
+	- ntfsclone: fix sometimes missing error messages and be more
+	  detailed.  (Szaka)
+	- ntfsclone: fix crash in wipe_index_allocation_timestamps(): don't 
+	  dump empty index allocation attribute.  (Szaka)
+	- ntfscmp: fine grained AT_INDEX_ALLOCATION comparison.  (Szaka)
+	- ntfsinfo: rename 'Flags:' fields to be unique.  (Szaka)
+	- ntfsinfo: add ntfs_dump_index_header(); dump full index attribute
+	  INDEX_HEADER.  (Szaka)
+	- ntfsinfo: add ntfs_dump_index_block() and use it.  (Szaka)
+	- ntfsinfo: fix output indenting.  (Szaka)
+	- ntfsinfo: make stdout line buffered.  (Szaka)
+	- ntfsinfo: fix segfaults when SDS has absolute security descriptor.  
+	  (Szaka)
+	- ntfsinfo: redirect stderr to /dev/null if --debug isn't used in
+	  debug mode.  (Szaka)
+	- ntfsinfo: fix segfaults on corrupt index blocks.  (Szaka)
+	- ntfsinfo: dump number of entries per block in index allocation 
+	  attributes.  (Szaka)
+	- ntfsinfo: dump ATTR_LIST_ENTRY padding in verbose mode. (Szaka)
+	- ntfsinfo: dump all VCN's in the same numeral system.  (Szaka)
+	- ntfsinfo: dump the FILE_ATTR_DIRECTORY flag.  (Szaka)
+	- ntfsinfo: dump padding between the Update Sequence Array and the
+	  first attribute in verbose mode.  (Szaka)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.144,1.145

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv9203

Modified Files:
	ntfsinfo.c 
Log Message:
Dump all VCN's in the same numeral system


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- ntfsinfo.c	13 Aug 2006 19:02:30 -0000	1.144
+++ ntfsinfo.c	13 Aug 2006 19:09:22 -0000	1.145
@@ -1415,7 +1415,7 @@ static int ntfs_dump_index_entries(INDEX
 			le16_to_cpu(entry->flags));
 
 		if (entry->flags & INDEX_ENTRY_NODE)
-			ntfs_log_verbose("\t\tSubnode VCN:\t\t 0x%llx\n",
+			ntfs_log_verbose("\t\tSubnode VCN:\t\t %lld\n",
 					 ntfs_ie_get_vcn(entry));
 		if (entry->flags & INDEX_ENTRY_END)
 			break;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.143,1.144

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv8559

Modified Files:
	ntfsinfo.c 
Log Message:
ntfs_dump_flags(): dump FILE_ATTR_DIRECTORY


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- ntfsinfo.c	13 Aug 2006 18:59:56 -0000	1.143
+++ ntfsinfo.c	13 Aug 2006 19:02:30 -0000	1.144
@@ -463,6 +463,10 @@ static void ntfs_dump_flags(const char *
 		printf(" SYSTEM");
 		flags &= ~FILE_ATTR_SYSTEM;
 	}
+	if (flags & FILE_ATTR_DIRECTORY) {
+		printf(" DIRECTORY");
+		flags &= ~FILE_ATTR_DIRECTORY;
+	}
 	if (flags & FILE_ATTR_ARCHIVE) {
 		printf(" ARCHIVE");
 		flags &= ~FILE_ATTR_ARCHIVE;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.142,1.143

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv8434

Modified Files:
	ntfsinfo.c 
Log Message:
convert all malloc() to ntfs_malloc()


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- ntfsinfo.c	13 Aug 2006 18:58:21 -0000	1.142
+++ ntfsinfo.c	13 Aug 2006 18:59:56 -0000	1.143
@@ -78,6 +78,7 @@
 #include "dir.h"
 #include "ntfstime.h"
 #include "version.h"
+#include "support.h"
 
 static const char *EXEC_NAME = "ntfsinfo";
 
@@ -630,11 +631,10 @@ static void ntfs_dump_attr_list(ATTR_REC
 		ntfs_log_perror("ntfs_get_attribute_value_length failed");
 		return;
 	}
-	value = malloc(l);
-	if (!value) {
-		ntfs_log_perror("malloc failed");
+	value = ntfs_malloc(l);
+	if (!value)
 		return;
-	}
+	
 	l = ntfs_get_attribute_value(vol, attr, value);
 	if (!l) {
 		ntfs_log_perror("ntfs_get_attribute_value failed");
@@ -949,9 +949,8 @@ static void ntfs_dump_attr_security_desc
 			s64 data_size, bytes_read;
 
 			data_size = sle64_to_cpu(attr->data_size);
-			sec_desc_attr = malloc(data_size);
+			sec_desc_attr = ntfs_malloc(data_size);
 			if (!sec_desc_attr) {
-				ntfs_log_perror("malloc failed");
 				free(rl);
 				return;
 			}
@@ -1737,9 +1736,8 @@ static void ntfs_dump_attr_ea(ATTR_RECOR
 		if (rl) {
 			s64 bytes_read;
 
-			buf = malloc(data_size);
+			buf = ntfs_malloc(data_size);
 			if (!buf) {
-				ntfs_log_perror("malloc failed");
 				free(rl);
 				return;
 			}

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

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv8280

Modified Files:
	ntfsinfo.c 
Log Message:
dump padding between the Update Sequence Array and the first attribute


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- ntfsinfo.c	13 Aug 2006 18:57:37 -0000	1.141
+++ ntfsinfo.c	13 Aug 2006 18:58:21 -0000	1.142
@@ -1925,6 +1925,12 @@ static void ntfs_dump_inode_general_info
 	}
 	printf("Next Attribute Instance: %hu\n",
 		le16_to_cpu(mrec->next_attr_instance));
+	
+	printf("MFT Padding:\t");
+	ntfs_dump_bytes((u8 *)mrec, le16_to_cpu(mrec->usa_ofs) + 
+			2 * le16_to_cpu(mrec->usa_count),
+			le16_to_cpu(mrec->attrs_offset));
+	printf("\n");
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.140,1.141

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv8186

Modified Files:
	ntfsinfo.c 
Log Message:
use MFT_RECORD *mrec during dumps


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- ntfsinfo.c	13 Aug 2006 18:56:25 -0000	1.140
+++ ntfsinfo.c	13 Aug 2006 18:57:37 -0000	1.141
@@ -1875,17 +1875,18 @@ static void ntfs_dump_attr_unknown(ATTR_
  */
 static void ntfs_dump_inode_general_info(ntfs_inode *inode)
 {
-	u16 inode_flags = inode->mrec->flags;
+	MFT_RECORD *mrec = inode->mrec;
+	u16 inode_flags  = mrec->flags;
 
 	printf("Dumping Inode #%llu\n",(long long)inode->mft_no);
 
-	ntfs_dump_usa_lsn("", inode->mrec);
+	ntfs_dump_usa_lsn("", mrec);
 	printf("MFT Record Seq. Numb.:\t %hu\n",
-		(short unsigned int)le16_to_cpu(inode->mrec->sequence_number));
+		(short unsigned int)le16_to_cpu(mrec->sequence_number));
 	printf("Number of Hard Links:\t %hu\n",
-		le16_to_cpu(inode->mrec->link_count));
+		le16_to_cpu(mrec->link_count));
 	printf("Attribute Offset:\t %hu\n",
-		le16_to_cpu(inode->mrec->attrs_offset));
+		le16_to_cpu(mrec->attrs_offset));
 
 	printf("MFT Record Flags:\t ");
 	if (inode_flags) {
@@ -1914,16 +1915,16 @@ static void ntfs_dump_inode_general_info
 	printf("\n");
 
 	printf("Bytes Used:\t\t %u bytes\n",
-		(unsigned int)le32_to_cpu(inode->mrec->bytes_in_use));
+		(unsigned int)le32_to_cpu(mrec->bytes_in_use));
 	printf("Bytes Allocated:\t %u bytes\n",
-		(unsigned int)le32_to_cpu(inode->mrec->bytes_allocated));
+		(unsigned int)le32_to_cpu(mrec->bytes_allocated));
 
-	if (inode->mrec->base_mft_record) {
+	if (mrec->base_mft_record) {
 		printf("Base MFT Record:\t %llu\n",
-			MREF_LE(inode->mrec->base_mft_record));
+			MREF_LE(mrec->base_mft_record));
 	}
 	printf("Next Attribute Instance: %hu\n",
-		le16_to_cpu(inode->mrec->next_attr_instance));
+		le16_to_cpu(mrec->next_attr_instance));
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.139,1.140

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv8030

Modified Files:
	ntfsinfo.c 
Log Message:
fix missing bracket in the former patch 


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- ntfsinfo.c	13 Aug 2006 18:51:55 -0000	1.139
+++ ntfsinfo.c	13 Aug 2006 18:56:25 -0000	1.140
@@ -1413,7 +1413,7 @@ static int ntfs_dump_index_entries(INDEX
 
 		if (entry->flags & INDEX_ENTRY_NODE)
 			ntfs_log_verbose("\t\tSubnode VCN:\t\t 0x%llx\n",
-					 ntfs_ie_get_vcn(entry);
+					 ntfs_ie_get_vcn(entry));
 		if (entry->flags & INDEX_ENTRY_END)
 			break;
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.138,1.139

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv7690

Modified Files:
	ntfsinfo.c 
Log Message:
ntfs_dump_index_entries(): cleanup subnode VCN calculation


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- ntfsinfo.c	13 Aug 2006 18:48:31 -0000	1.138
+++ ntfsinfo.c	13 Aug 2006 18:51:55 -0000	1.139
@@ -1413,8 +1413,7 @@ static int ntfs_dump_index_entries(INDEX
 
 		if (entry->flags & INDEX_ENTRY_NODE)
 			ntfs_log_verbose("\t\tSubnode VCN:\t\t 0x%llx\n",
-				sle64_to_cpu(*(VCN*)((u8*)entry +
-				le16_to_cpu(entry->length) - sizeof(VCN))));
+					 ntfs_ie_get_vcn(entry);
 		if (entry->flags & INDEX_ENTRY_END)
 			break;
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.137,1.138

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv7336

Modified Files:
	ntfsinfo.c 
Log Message:
add ntfs_dump_bytes(); ntfs_dump_attr_list(): dump ATTR_LIST_ENTRY paddings


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- ntfsinfo.c	13 Aug 2006 18:46:22 -0000	1.137
+++ ntfsinfo.c	13 Aug 2006 18:48:31 -0000	1.138
@@ -603,6 +603,15 @@ static void ntfs_dump_attr_standard_info
 			(unsigned int)value_length);
 	}
 }
+	
+static void ntfs_dump_bytes(u8 *buf, int start, int stop)
+{
+	int i;
+
+	for (i = start; i < stop; i++) {
+		printf("%02x ", buf[i]);
+	}
+}
 
 /**
  * ntfs_dump_attr_list()
@@ -663,6 +672,10 @@ static void ntfs_dump_attr_list(ATTR_REC
 				ntfs_log_perror("ntfs_ucstombs failed");
 		} else
 			printf("unnamed\n");
+		printf("\t\tPadding:\t");
+		ntfs_dump_bytes((u8 *)entry, entry->name_offset + 
+				2 * entry->name_length, entry->length);
+		printf("\n");
 	}
 	free(value);
 	printf("\tEnd of attribute list reached.\n");

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.136,1.137

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv7192

Modified Files:
	ntfsinfo.c 
Log Message:
ntfs_dump_attr_index_allocation(): dump number of entries per block too


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- ntfsinfo.c	13 Aug 2006 18:45:57 -0000	1.136
+++ ntfsinfo.c	13 Aug 2006 18:46:22 -0000	1.137
@@ -1643,6 +1643,7 @@ static void ntfs_dump_attr_index_allocat
 	       		if (entries != -1) {
 				total_entries += entries;
 				total_indx_blocks++;
+				printf("\tIndex entries:\t\t %d\n", entries);
 			}
 		}
 		tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc + 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.135,1.136

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv7129

Modified Files:
	ntfsinfo.c 
Log Message:
ntfs_dump_attr_index_allocation(): don't return if an INDX is corrupt


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- ntfsinfo.c	13 Aug 2006 18:44:46 -0000	1.135
+++ ntfsinfo.c	13 Aug 2006 18:45:57 -0000	1.136
@@ -1640,11 +1640,10 @@ static void ntfs_dump_attr_index_allocat
 			
 			entries = ntfs_dump_index_block(tmp_alloc, type,
 							ir->index_block_size);
-	       		if (entries == -1)
-				goto out_allocation;
-			
-			total_entries += entries;
-			total_indx_blocks++;
+	       		if (entries != -1) {
+				total_entries += entries;
+				total_indx_blocks++;
+			}
 		}
 		tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc + 
 						 ir->index_block_size);
@@ -1654,9 +1653,10 @@ static void ntfs_dump_attr_index_allocat
 			byte++;
 		}
 	}
+
 	printf("\tIndex entries total:\t %d\n", total_entries);
 	printf("\tINDX blocks total:\t %d\n", total_indx_blocks);
-out_allocation:
+	
 	free(allocation);
 out_bitmap:
 	free(bitmap);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.134,1.135

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv7003

Modified Files:
	ntfsinfo.c 
Log Message:
redirect stderr to /dev/null if --debug isn't used in debug mode


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- ntfsinfo.c	13 Aug 2006 18:43:12 -0000	1.134
+++ ntfsinfo.c	13 Aug 2006 18:44:46 -0000	1.135
@@ -85,12 +85,12 @@ static struct options {
 	const char *device;	/* Device/File to work with */
 	const char *filename;	/* Resolve this filename to mft number */
 	s64	 inode;		/* Info for this inode */
+	int	 debug;		/* Debug output */
 	int	 quiet;		/* Less output */
 	int	 verbose;	/* Extra output */
 	int	 force;		/* Override common sense */
 	int	 notime;	/* Don't report timestamps at all */
 	int	 mft;		/* Dump information about the volume as well */
-	u8	 padding[4];	/* Unused: padding to 64 bit. */
 } opts;
 
 /**
@@ -135,7 +135,11 @@ static void usage(void)
 		"    -q, --quiet      Less output\n"
 		"    -v, --verbose    More output\n"
 		"    -V, --version    Display version information\n"
-		"    -h, --help       Display this help\n\n",
+		"    -h, --help       Display this help\n"
+#ifdef DEBUG
+                "    -d, --debug            Show debug information\n"
+#endif
+	        "\n",
 		EXEC_NAME);
 	printf("%s%s\n", ntfs_bugs, ntfs_home);
 }
@@ -151,8 +155,11 @@ static void usage(void)
  */
 static int parse_options(int argc, char *argv[])
 {
-	static const char *sopt = "-:fhi:F:mqtTvV";
+	static const char *sopt = "-:dfhi:F:mqtTvV";
 	static const struct option lopt[] = {
+#ifdef DEBUG
+                { "debug",      no_argument,            NULL, 'd' },
+#endif
 		{ "force",	 no_argument,		NULL, 'f' },
 		{ "help",	 no_argument,		NULL, 'h' },
 		{ "inode",	 required_argument,	NULL, 'i' },
@@ -177,8 +184,6 @@ static int parse_options(int argc, char 
 	opts.filename = NULL;
 
 	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
-		ntfs_log_trace("optind=%d; c='%c' optarg=\"%s\".\n", optind, c,
-				optarg);
 		switch (c) {
 		case 1:
 			if (!opts.device)
@@ -186,6 +191,9 @@ static int parse_options(int argc, char 
 			else
 				err++;
 			break;
+		case 'd':
+			opts.debug++;
+			break;
 		case 'i':
 			if ((opts.inode != -1) ||
 			    (!utils_parse_size(optarg, &opts.inode, FALSE))) {
@@ -293,6 +301,14 @@ static int parse_options(int argc, char 
 
 	}
 
+#ifdef DEBUG
+	if (!opts.debug)
+		if (!freopen("/dev/null", "w", stderr)) {
+			ntfs_log_perror("Failed to freopen stderr to /dev/null");
+			exit(1);
+		}
+#endif
+
 	if (ver)
 		version();
 	if (help || err)
@@ -1983,8 +1999,6 @@ static void ntfs_dump_file_attributes(nt
 	/* close all data-structures we used */
 	ntfs_attr_put_search_ctx(ctx);
 	ntfs_inode_close(inode);
-
-	/* happily exit */
 }
 
 /**
@@ -2003,14 +2017,18 @@ int main(int argc, char **argv)
 	
 	ntfs_log_set_handler(ntfs_log_handler_outerr);
 
-	if (!parse_options(argc, argv))
-		return 1;
+	if (!parse_options(argc, argv)) {
+		printf("Failed to parse command line options\n");
+		exit(1);
+	}
 
 	utils_set_locale();
 
 	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
-	if (!vol)
-		return 1;
+	if (!vol) {
+		printf("Failed to open '%s': %s\n", opts.device, strerror(errno));
+		exit(1);
+	}
 
 	/*
 	 * if opts.mft is not 0, then we will print out information about

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.133,1.134

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv6828

Modified Files:
	ntfsinfo.c 
Log Message:
fix segfaults when SDS has absolute security descriptor


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- ntfsinfo.c	13 Aug 2006 18:41:13 -0000	1.133
+++ ntfsinfo.c	13 Aug 2006 18:43:12 -0000	1.134
@@ -847,8 +847,20 @@ static void ntfs_dump_security_descripto
 	printf("%s\tRevision:\t\t %u\n", indent, sec_desc->revision);
 
 	/* TODO: parse the flags */
-	printf("%s\tControl:\t\t 0x%0x\n", indent, sec_desc->control);
+	printf("%s\tControl:\t\t 0x%04x\n", indent, sec_desc->control);
 
+	if (~sec_desc->control & SE_SELF_RELATIVE) {
+		
+		SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)sec_desc;
+		
+		printf("%s\tOwner SID pointer:\t %p\n", indent, sd->owner);
+		printf("%s\tGroup SID pointer:\t %p\n", indent, sd->group);
+		printf("%s\tSACL pointer:\t\t %p\n", indent, sd->sacl);
+		printf("%s\tDACL pointer:\t\t %p\n", indent, sd->dacl);
+		
+		return;
+	}
+	
 	if (sec_desc->owner) {
 		sid = ntfs_sid_to_mbs((SID *)((char *)sec_desc +
 			le32_to_cpu(sec_desc->owner)), NULL, 0);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.132,1.133

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv6643

Modified Files:
	ntfsinfo.c 
Log Message:
make stdout line buffered


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- ntfsinfo.c	13 Aug 2006 18:40:35 -0000	1.132
+++ ntfsinfo.c	13 Aug 2006 18:41:13 -0000	1.133
@@ -1987,6 +1987,8 @@ int main(int argc, char **argv)
 {
 	ntfs_volume *vol;
 
+	setlinebuf(stdout);
+	
 	ntfs_log_set_handler(ntfs_log_handler_outerr);
 
 	if (!parse_options(argc, argv))

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.131,1.132

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv6519

Modified Files:
	ntfsinfo.c 
Log Message:
fix output indenting


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- ntfsinfo.c	13 Aug 2006 18:39:35 -0000	1.131
+++ ntfsinfo.c	13 Aug 2006 18:40:35 -0000	1.132
@@ -1525,9 +1525,9 @@ static void ntfs_dump_attr_index_root(AT
 
 static void ntfs_dump_usa_lsn(const char *indent, MFT_RECORD *mrec)
 {
-	printf("%sUpd. Seq. Array Offset:\t %hu\n", indent, 
+	printf("%sUpd. Seq. Array Off.:\t %hu\n", indent, 
 	       le16_to_cpu(mrec->usa_ofs));
-	printf("%sUpd. Seq. Array Count: \t %hu\n", indent,
+	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)));
@@ -1839,7 +1839,7 @@ static void ntfs_dump_inode_general_info
 	printf("Dumping Inode #%llu\n",(long long)inode->mft_no);
 
 	ntfs_dump_usa_lsn("", inode->mrec);
-	printf("MFT Record Seq. Number:\t %hu\n",
+	printf("MFT Record Seq. Numb.:\t %hu\n",
 		(short unsigned int)le16_to_cpu(inode->mrec->sequence_number));
 	printf("Number of Hard Links:\t %hu\n",
 		le16_to_cpu(inode->mrec->link_count));

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.130,1.131

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv6370

Modified Files:
	ntfsinfo.c 
Log Message:
add ntfs_dump_index_block() and use it


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- ntfsinfo.c	13 Aug 2006 18:35:05 -0000	1.130
+++ ntfsinfo.c	13 Aug 2006 18:39:35 -0000	1.131
@@ -1518,7 +1518,7 @@ 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:\n");
+	ntfs_log_verbose("\tDumping index root:\n");
 	printf("\tIndex entries total:\t %d\n",
 			ntfs_dump_index_entries(entry, type));
 }
@@ -1535,6 +1535,34 @@ static void ntfs_dump_usa_lsn(const char
 	       (long long int)sle64_to_cpu(mrec->lsn));
 }
 
+
+static s32 ntfs_dump_index_block(INDEX_BLOCK *ib, INDEX_ATTR_TYPE type,
+				 u32 ib_size)
+{
+	INDEX_ENTRY *entry;
+	
+	if (ntfs_mst_post_read_fixup((NTFS_RECORD *)ib, ib_size)) {
+		ntfs_log_perror("Damaged INDX record");
+		return -1;
+	}
+	ntfs_log_verbose("\tDumping index block:\n");
+	if (opts.verbose)
+		ntfs_dump_usa_lsn("\t\t", (MFT_RECORD *)ib);
+
+	ntfs_log_verbose("\t\tNode VCN:\t\t %lld\n",
+			 le64_to_cpu(ib->index_block_vcn));
+	
+	entry = (INDEX_ENTRY *)((u8 *)ib + 
+				le32_to_cpu(ib->index.entries_offset) + 0x18);
+	
+	if (opts.verbose) {
+		ntfs_dump_index_header("\t\t", &ib->index);
+		printf("\n");
+	}
+	
+	return ntfs_dump_index_entries(entry, type);
+}
+
 /**
  * ntfs_dump_attr_index_allocation()
  *
@@ -1543,8 +1571,7 @@ static void ntfs_dump_usa_lsn(const char
 static void ntfs_dump_attr_index_allocation(ATTR_RECORD *attr, ntfs_inode *ni)
 {
 	INDEX_ALLOCATION *allocation, *tmp_alloc;
-	INDEX_ENTRY *entry;
-	INDEX_ROOT *index_root;
+	INDEX_ROOT *ir;
 	INDEX_ATTR_TYPE type;
 	int total_entries = 0;
 	int total_indx_blocks = 0;
@@ -1554,13 +1581,13 @@ static void ntfs_dump_attr_index_allocat
 	u32 name_len;
 	s64 data_size;
 
-	index_root = ntfs_index_root_get(ni, attr);
-	if (!index_root) {
+	ir = ntfs_index_root_get(ni, attr);
+	if (!ir) {
 		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, ir);
 	
 	name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
 	name_len = attr->name_length;
@@ -1581,26 +1608,18 @@ static void ntfs_dump_attr_index_allocat
 	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)) {
-				ntfs_log_perror("Damaged INDX record");
+			int entries;
+			
+			entries = ntfs_dump_index_block(tmp_alloc, type,
+							ir->index_block_size);
+	       		if (entries == -1)
 				goto out_allocation;
-			}
-			entry = (INDEX_ENTRY *)((u8 *)tmp_alloc + le32_to_cpu(
-				tmp_alloc->index.entries_offset) + 0x18);
-			ntfs_log_verbose("\tDumping index block (VCN %lld):\n",
-				      le64_to_cpu(tmp_alloc->index_block_vcn));
-			if (opts.verbose) {
-				ntfs_dump_index_header("\t\t", &tmp_alloc->index);
-				ntfs_dump_usa_lsn("\t\t", 
-						  (MFT_RECORD *)tmp_alloc);
-				printf("\n");
-			}
-			total_entries += ntfs_dump_index_entries(entry, type);
+			
+			total_entries += entries;
 			total_indx_blocks++;
 		}
 		tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc + 
-						 index_root->index_block_size);
+						 ir->index_block_size);
 		bit++;
 		if (bit > 7) {
 			bit = 0;
@@ -1614,7 +1633,7 @@ out_allocation:
 out_bitmap:
 	free(bitmap);
 out_index_root:
-	free(index_root);
+	free(ir);
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.129,1.130

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv5828

Modified Files:
	ntfsinfo.c 
Log Message:
add ntfs_dump_index_header(); dump full ia INDEX_HEADER


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- ntfsinfo.c	13 Aug 2006 18:23:01 -0000	1.129
+++ ntfsinfo.c	13 Aug 2006 18:35:05 -0000	1.130
@@ -1471,6 +1471,19 @@ static void ntfs_dump_index_attr_type(IN
 	printf("\n");
 }
 
+static void ntfs_dump_index_header(const char *indent, INDEX_HEADER *idx)
+{
+	printf("%sEntries Offset:\t\t %u\n", indent,
+		(unsigned int)le32_to_cpu(idx->entries_offset));
+	printf("%sIndex Size:\t\t %u\n", indent,
+		(unsigned int)le32_to_cpu(idx->index_length));
+	printf("%sAllocated Size:\t\t %u\n", indent,
+		(unsigned int)le32_to_cpu(idx->allocated_size));
+	printf("%sIndex header flags:\t 0x%02x\n", indent, idx->flags);
+	
+	/* FIXME: there are 3 reserved bytes here */
+}
+
 /**
  * ntfs_dump_attr_index_root()
  *
@@ -1501,14 +1514,7 @@ static void ntfs_dump_attr_index_root(AT
 	printf("\tClusters Per Block:\t %u\n",
 		index_root->clusters_per_index_block);
 
-	/* index header starts here */
-	printf("\tAllocated Size:\t\t %u\n",
-		(unsigned int)le32_to_cpu(index_root->index.allocated_size));
-	printf("\tUsed Size:\t\t %u\n",
-		(unsigned int)le32_to_cpu(index_root->index.index_length));
-
-	/* the flags are 8bit long, no need for byte-order handling */
-	printf("\tIndex header flags:\t 0x%02x\n",index_root->index.flags);
+	ntfs_dump_index_header("\t", &index_root->index);
 
 	entry = (INDEX_ENTRY *)((u8 *)index_root +
 			le32_to_cpu(index_root->index.entries_offset) + 0x10);
@@ -1582,15 +1588,10 @@ 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 0x%llx, "
-					"used %u/%u, flags 0x%02x):\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),
-					tmp_alloc->index.flags);
+			ntfs_log_verbose("\tDumping index block (VCN %lld):\n",
+				      le64_to_cpu(tmp_alloc->index_block_vcn));
 			if (opts.verbose) {
+				ntfs_dump_index_header("\t\t", &tmp_alloc->index);
 				ntfs_dump_usa_lsn("\t\t", 
 						  (MFT_RECORD *)tmp_alloc);
 				printf("\n");

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.128,1.129

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv4922

Modified Files:
	ntfsinfo.c 
Log Message:
rename 'Flags:' fields to be unique


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- ntfsinfo.c	13 Jul 2006 02:35:32 -0000	1.128
+++ ntfsinfo.c	13 Aug 2006 18:23:01 -0000	1.129
@@ -847,7 +847,7 @@ static void ntfs_dump_security_descripto
 	printf("%s\tRevision:\t\t %u\n", indent, sec_desc->revision);
 
 	/* TODO: parse the flags */
-	printf("%s\tFlags:\t\t\t 0x%0x\n", indent, sec_desc->control);
+	printf("%s\tControl:\t\t 0x%0x\n", indent, sec_desc->control);
 
 	if (sec_desc->owner) {
 		sid = ntfs_sid_to_mbs((SID *)((char *)sec_desc +
@@ -988,7 +988,7 @@ static void ntfs_dump_attr_volume_inform
 
 	printf("\tVolume Version:\t\t %d.%d\n", vol_information->major_ver,
 		vol_information->minor_ver);
-	printf("\tFlags:\t\t\t ");
+	printf("\tVolume Flags:\t\t ");
 	if (vol_information->flags & VOLUME_IS_DIRTY)
 		printf("DIRTY ");
 	if (vol_information->flags & VOLUME_RESIZE_LOG_FILE)
@@ -1129,7 +1129,7 @@ static void ntfs_dump_attribute_header(A
 	}
 
 	/* TODO: parse the flags */
-	printf("\tFlags:\t\t\t 0x%04hx\n",le16_to_cpu(a->flags));
+	printf("\tAttribute flags:\t 0x%04hx\n",le16_to_cpu(a->flags));
 	printf("\tAttribute instance:\t %u\n", le16_to_cpu(a->instance));
 
 	/* Resident attribute */
@@ -1367,7 +1367,7 @@ static int ntfs_dump_index_entries(INDEX
 				le16_to_cpu(entry->length));
 		ntfs_log_verbose("\t\tKey length:\t\t %u\n",
 				le16_to_cpu(entry->key_length));
-		ntfs_log_verbose("\t\tFlags:\t\t\t 0x%02x\n",
+		ntfs_log_verbose("\t\tIndex entry flags:\t 0x%02x\n",
 			le16_to_cpu(entry->flags));
 
 		if (entry->flags & INDEX_ENTRY_NODE)
@@ -1508,7 +1508,7 @@ static void ntfs_dump_attr_index_root(AT
 		(unsigned int)le32_to_cpu(index_root->index.index_length));
 
 	/* the flags are 8bit long, no need for byte-order handling */
-	printf("\tFlags:\t\t\t 0x%02x\n",index_root->index.flags);
+	printf("\tIndex header flags:\t 0x%02x\n",index_root->index.flags);
 
 	entry = (INDEX_ENTRY *)((u8 *)index_root +
 			le32_to_cpu(index_root->index.entries_offset) + 0x10);
@@ -1702,7 +1702,7 @@ static void ntfs_dump_attr_ea(ATTR_RECOR
 		ea = (EA_ATTR*)((u8*)attr + le16_to_cpu(attr->value_offset));
 	}
 	while (1) {
-		printf("\n\tFlags:\t\t ");
+		printf("\n\tEA flags:\t\t ");
 		if (ea->flags) {
 			if (ea->flags == NEED_EA)
 				printf("NEED_EA\n");

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c, 1.118, 1.119 utils.c, 1.64, 1.65

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv24690

Modified Files:
	ntfsresize.c utils.c 
Log Message:
convert all malloc,calloc to ntfs_{malloc,calloc}


Index: ntfsresize.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- ntfsresize.c	18 Apr 2006 22:03:09 -0000	1.118
+++ ntfsresize.c	13 Aug 2006 16:06:57 -0000	1.119
@@ -1203,8 +1203,9 @@ static void replace_attribute_runlist(nt
 		a->length += l;
 	}
 
-	if (!(mp = calloc(1, mp_size)))
-		perr_exit("Couldn't get memory");
+	mp = ntfs_calloc(mp_size);
+	if (!mp)
+		perr_exit("ntfsc_calloc couldn't get memory");
 
 	if (ntfs_mapping_pairs_build(vol, mp, mp_size, rl, 0, NULL))
 		perr_exit("ntfs_mapping_pairs_build");
@@ -1468,8 +1469,9 @@ static void rl_split_run(runlist **rl, i
 	size_head = run * sizeof(runlist_element);
 	size_tail = (items - run - 1) * sizeof(runlist_element);
 
-	if (!(rl_new = (runlist *)malloc(new_size)))
-		perr_exit("malloc");
+	rl_new = ntfs_malloc(new_size);
+	if (!rl_new)
+		perr_exit("ntfs_malloc");
 
 	rle_new = rl_new + run;
 	rle = *rl + run;
@@ -1719,9 +1721,9 @@ static void relocate_inodes(ntfs_resize_
 	progress_init(&resize->progress, 0, resize->relocations, resize->progress.flags);
 	resize->relocations = 0;
 
-	resize->mrec = (MFT_RECORD *)malloc(resize->vol->mft_record_size);
+	resize->mrec = ntfs_malloc(resize->vol->mft_record_size);
 	if (!resize->mrec)
-		perr_exit("malloc failed");
+		perr_exit("ntfs_malloc failed");
 
 	nr_mft_records = resize->vol->mft_na->initialized_size >>
 			resize->vol->mft_record_size_bits;
@@ -2119,7 +2121,8 @@ static int setup_lcn_bitmap(struct bitma
 	/* Determine lcn bitmap byte size and allocate it. */
 	bm->size = rounded_up_division(nr_clusters, 8);
 
-	if (!(bm->bm = (unsigned char *)calloc(1, bm->size)))
+	bm->bm = ntfs_calloc(bm->size);
+	if (!bm->bm)
 		return -1;
 
 	bitmap_file_data_fixup(nr_clusters, bm);

Index: utils.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- utils.c	17 Jul 2006 11:49:52 -0000	1.64
+++ utils.c	13 Aug 2006 16:06:57 -0000	1.65
@@ -421,7 +421,7 @@ int utils_inode_get_name(ntfs_inode *ino
 	FILE_NAME_ATTR *attr;
 	int name_space;
 	MFT_REF parent = FILE_root;
-	char *names[max_path + 1];// XXX malloc? and make max bigger?
+	char *names[max_path + 1];// XXX ntfs_malloc? and make max bigger?
 	int i, len, offset = 0;
 
 	if (!inode || !buffer) {
@@ -465,7 +465,7 @@ int utils_inode_get_name(ntfs_inode *ino
 			    &names[i], 0) < 0) {
 				char *temp;
 				ntfs_log_error("Couldn't translate filename to current locale.\n");
-				temp = malloc(30);
+				temp = ntfs_malloc(30);
 				if (!temp)
 					return 0;
 				snprintf(temp, 30, "<MFT%llu>", (unsigned
@@ -965,10 +965,9 @@ int mft_next_record(struct mft_search_ct
 
 			ctx->inode->mft_no = ctx->mft_num;
 			ctx->inode->vol    = ctx->vol;
-			ctx->inode->mrec   = malloc(ctx->vol->mft_record_size);
+			ctx->inode->mrec   = ntfs_malloc(ctx->vol->mft_record_size);
 			if (!ctx->inode->mrec) {
 				free(ctx->inode); // == ntfs_inode_close
-				ntfs_log_error("Out of memory.  Aborting.\n");
 				return -1;
 			}
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscmp.c,1.17,1.18

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv23217

Modified Files:
	ntfscmp.c 
Log Message:
fine grained AT_INDEX_ALLOCATION comparison


Index: ntfscmp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ntfscmp.c	5 Apr 2006 12:43:07 -0000	1.17
+++ ntfscmp.c	13 Aug 2006 15:50:12 -0000	1.18
@@ -18,7 +18,9 @@
 #include <getopt.h>
 
 #include "utils.h"
+#include "mst.h"
 #include "version.h"
+#include "support.h"
 
 static const char *EXEC_NAME = "ntfscmp";
 
@@ -464,6 +466,118 @@ static void print_ctx(ntfs_attr_search_c
 	free_name(&name);
 }
 
+static void print_differ(ntfs_attr *na)
+{
+	print_na(na);
+	printf("content:   DIFFER\n");
+}
+
+static int cmp_buffer(u8 *buf1, u8 *buf2, long long int size, ntfs_attr *na)
+{
+	if (memcmp(buf1, buf2, size)) {
+		print_differ(na);
+		return -1;
+	}
+	return 0;
+}
+
+struct cmp_ia {
+	INDEX_ALLOCATION *ia;
+	INDEX_ALLOCATION *tmp_ia;
+	u8 *bitmap;
+	u8 *byte;
+	s64 bm_size;
+};
+
+static int setup_cmp_ia(ntfs_attr *na, struct cmp_ia *cia)
+{
+	cia->bitmap = ntfs_attr_readall(na->ni, AT_BITMAP, na->name,
+					na->name_len, &cia->bm_size);
+	if (!cia->bitmap) {
+		perr_println("Failed to readall BITMAP");
+		return -1;
+	}
+	cia->byte = cia->bitmap; 
+
+	cia->tmp_ia = cia->ia = ntfs_malloc(na->data_size);
+	if (!cia->tmp_ia)
+		goto free_bm;
+
+	if (ntfs_attr_pread(na, 0, na->data_size, cia->ia) != na->data_size) {
+		perr_println("Failed to pread INDEX_ALLOCATION");
+		goto free_ia;
+	}
+	
+	return 0;
+free_ia:
+	free(cia->ia);
+free_bm:
+	free(cia->bitmap);
+	return -1;
+}
+
+static void cmp_index_allocation(ntfs_attr *na1, ntfs_attr *na2)
+{
+	struct cmp_ia cia1, cia2;
+	int bit, ret1, ret2;
+	u32 ib_size;
+	
+	if (setup_cmp_ia(na1, &cia1))
+		return;
+	if (setup_cmp_ia(na2, &cia2))
+		return;
+	/* 
+	 *  FIXME: ia can be the same even if the bitmap sizes are different.
+	 */
+	if (cia1.bm_size != cia1.bm_size)
+		goto out;
+	
+	if (cmp_buffer(cia1.bitmap, cia2.bitmap, cia1.bm_size, na1))
+		goto out;
+	
+	if (cmp_buffer((u8 *)cia1.ia, (u8 *)cia2.ia, 0x18, na1))
+		goto out;
+
+	ib_size = cia1.ia->index.allocated_size + 0x18;
+	
+	bit = 0;
+	while ((u8 *)cia1.tmp_ia < (u8 *)cia1.ia + na1->data_size) {
+		if (*cia1.byte & (1 << bit)) {					   
+			ret1 = ntfs_mst_post_read_fixup((NTFS_RECORD *)cia1.tmp_ia,
+							ib_size);
+			ret2 = ntfs_mst_post_read_fixup((NTFS_RECORD *)cia2.tmp_ia,
+							ib_size);
+			if (ret1 != ret2) {
+				print_differ(na1);
+				goto out;
+			}
+			
+			if (ret1 == -1)
+				continue;
+		
+			if (cmp_buffer(((u8 *)cia1.tmp_ia) + 0x18, 
+				       ((u8 *)cia2.tmp_ia) + 0x18,
+				       cia1.ia->index.index_length, na1))
+				goto out;
+		}
+		
+		cia1.tmp_ia = (INDEX_ALLOCATION *)((u8 *)cia1.tmp_ia + ib_size);
+		cia2.tmp_ia = (INDEX_ALLOCATION *)((u8 *)cia2.tmp_ia + ib_size);
+		
+		bit++;
+		if (bit > 7) {
+			bit = 0;
+			cia1.byte++;
+		}
+	}
+out:
+	free(cia1.ia);
+	free(cia2.ia);
+	free(cia1.bitmap);
+	free(cia2.bitmap);
+	return;
+}
+
 static void cmp_attribute_data(ntfs_attr *na1, ntfs_attr *na2)
 {
 	s64 pos;
@@ -502,15 +616,9 @@ static void cmp_attribute_data(ntfs_attr
 			printf("%lld  !=  %lld\n", pos + count1, na1->data_size);
 			exit(1);
 		}
-
-		if (memcmp(buf1, buf2, count1)) {
-			print_na(na1);
-			printf("content");
-			if (opt.verbose)
-				printf(" (len = %lld)", count1);
-			printf(":   DIFFER\n");
+		
+		if (cmp_buffer(buf1, buf2, count1, na1))
 			return;
-		}
 	}
 
 	err_printf("%s read overrun: ", __FUNCTION__);
@@ -575,7 +683,10 @@ static void cmp_attribute(ntfs_attr_sear
 		return;
 	}
 
-	cmp_attribute_data(na1, na2);
+	if (na1->type == AT_INDEX_ALLOCATION)
+		cmp_index_allocation(na1, na2);
+	else
+		cmp_attribute_data(na1, na2);
 
 close_attribs:
 	ntfs_attr_close(na1);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.85,1.86

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv19751

Modified Files:
	ntfsclone.c 
Log Message:
wipe_index_allocation_timestamps(): don't try to dump empty ia


Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- ntfsclone.c	13 Aug 2006 15:00:27 -0000	1.85
+++ ntfsclone.c	13 Aug 2006 15:15:08 -0000	1.86
@@ -767,6 +767,10 @@ static void wipe_index_allocation_timest
 		perr_printf("Failed to open $INDEX_ALLOCATION attribute");
 		goto out_bitmap;
 	}
+
+	if (!na->data_size)
+		goto out_na;
+
 	tmp_indexa = indexa = ntfs_malloc(na->data_size);
 	if (!tmp_indexa)
 		goto out_na;