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

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.140,1.141 ntfscat.c,1.26,1.27 ntfsclone.c,1.78,1.79 ntfscluster.c,1.32,1.33 ntfscmp.c,1.16,1.17 ntfscp.c,1.35,1.36 ntfsdecrypt.c,1.28,1.29 ntfsfix.c,1.32,1.33 ntfsinfo.c,1.120,1.121 ntfslabel.c,1.20,1.21 ntfsls.c,1.36,1.37 ntfsmount.c,1.80,1.81 ntfsmove.c,1.21,1.22 ntfsresize.c,1.115,1.116 ntfsrm.c,1.71,1.72 ntfsundelete.c,1.55,1.56 ntfswipe.c,1.43,1.44

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

Changes by: szaka

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

Modified Files:
	mkntfs.c ntfscat.c ntfsclone.c ntfscluster.c ntfscmp.c 
	ntfscp.c ntfsdecrypt.c ntfsfix.c ntfsinfo.c ntfslabel.c 
	ntfsls.c ntfsmount.c ntfsmove.c ntfsresize.c ntfsrm.c 
	ntfsundelete.c ntfswipe.c 
Log Message:
Fix all incorrect getopt_long() return value usages.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- mkntfs.c	5 Apr 2006 02:49:25 -0000	1.140
+++ mkntfs.c	5 Apr 2006 12:43:07 -0000	1.141
@@ -372,7 +372,7 @@ static BOOL mkntfs_parse_options(int arg
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c = -1;
+	int c = -1;
 	int lic = 0;
 	int err = 0;
 	int ver = 0;
@@ -384,7 +384,7 @@ static BOOL mkntfs_parse_options(int arg
 
 	opterr = 0; /* We'll handle the errors, thank you. */
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:		/* A device, or a number of sectors */
 			if (!opts2->dev_name)

Index: ntfscat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ntfscat.c	29 Mar 2006 22:54:22 -0000	1.26
+++ ntfscat.c	5 Apr 2006 12:43:07 -0000	1.27
@@ -169,7 +169,7 @@ static int parse_options(int argc, char 
 		{ NULL,		    0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -183,7 +183,7 @@ static int parse_options(int argc, char 
 	opts.attr_name = NULL;
 	opts.attr_name_len = 0;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {

Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- ntfsclone.c	5 Apr 2006 02:50:44 -0000	1.78
+++ ntfsclone.c	5 Apr 2006 12:43:07 -0000	1.79
@@ -297,11 +297,11 @@ static void parse_options(int argc, char
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c;
+	int c;
 
 	memset(&opt, 0, sizeof(opt));
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (opt.volume)

Index: ntfscluster.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ntfscluster.c	29 Mar 2006 22:54:22 -0000	1.32
+++ ntfscluster.c	5 Apr 2006 12:43:07 -0000	1.33
@@ -127,7 +127,7 @@ static int parse_options(int argc, char 
 		{ NULL,		0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -140,7 +140,7 @@ static int parse_options(int argc, char 
 	opts.range_begin = -1;
 	opts.range_end   = -1;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {

Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ntfscmp.c	5 Apr 2006 02:56:52 -0000	1.16
+++ ntfscmp.c	5 Apr 2006 12:43:07 -0000	1.17
@@ -177,12 +177,12 @@ static void parse_options(int argc, char
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c;
+	int c;
 
 	memset(&opt, 0, sizeof(opt));
 	opt.show_progress = 1;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opt.vol1) {

Index: ntfscp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ntfscp.c	5 Apr 2006 02:45:56 -0000	1.35
+++ ntfscp.c	5 Apr 2006 12:43:07 -0000	1.36
@@ -134,7 +134,7 @@ static int parse_options(int argc, char 
 	};
 
 	char *s;
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -150,7 +150,7 @@ static int parse_options(int argc, char 
 
 	opterr = 0; /* We'll handle the errors, thank you. */
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char) -1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {

Index: ntfsdecrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntfsdecrypt.c	27 Mar 2006 20:10:39 -0000	1.28
+++ ntfsdecrypt.c	5 Apr 2006 12:43:07 -0000	1.29
@@ -195,7 +195,7 @@ static int parse_options(int argc, char 
 		{NULL, 0, NULL, 0}
 	};
 
-	char c = -1;
+	int c = -1;
 	int err = 0;
 	int ver = 0;
 	int help = 0;
@@ -204,7 +204,7 @@ static int parse_options(int argc, char 
 
 	opts.inode = -1;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device)

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ntfsfix.c	29 Mar 2006 22:54:22 -0000	1.32
+++ ntfsfix.c	5 Apr 2006 12:43:07 -0000	1.33
@@ -130,7 +130,7 @@ static void version(void)
  */
 static void parse_options(int argc, char **argv)
 {
-	char c;
+	int c;
 	static const char *sopt = "-hV";
 	static const struct option lopt[] = {
 		{ "help",	no_argument,	NULL, 'h' },
@@ -140,7 +140,7 @@ static void parse_options(int argc, char
 
 	memset(&opt, 0, sizeof(opt));
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opt.volume)

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- ntfsinfo.c	29 Mar 2006 22:54:22 -0000	1.120
+++ ntfsinfo.c	5 Apr 2006 12:43:07 -0000	1.121
@@ -166,7 +166,7 @@ static int parse_options(int argc, char 
 		{ NULL,		 0,			NULL,  0  }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -177,7 +177,7 @@ static int parse_options(int argc, char 
 	opts.inode = -1;
 	opts.filename = NULL;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	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) {

Index: ntfslabel.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ntfslabel.c	21 Nov 2005 21:25:15 -0000	1.20
+++ ntfslabel.c	5 Apr 2006 12:43:07 -0000	1.21
@@ -122,7 +122,7 @@ static int parse_options(int argc, char 
 		{ NULL, 0, NULL, 0 },
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;

Index: ntfsls.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ntfsls.c	21 Nov 2005 21:25:15 -0000	1.36
+++ ntfsls.c	5 Apr 2006 12:43:07 -0000	1.37
@@ -210,7 +210,7 @@ static int parse_options(int argc, char 
 		{ NULL, 0, NULL, 0 },
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -222,7 +222,7 @@ static int parse_options(int argc, char 
 	opts.device = NULL;
 	opts.path = "/";
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:
 			if (!opts.device)

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- ntfsmount.c	20 Feb 2006 00:32:01 -0000	1.80
+++ ntfsmount.c	5 Apr 2006 12:43:07 -0000	1.81
@@ -1675,7 +1675,7 @@ static char *realpath(const char *path, 
 static int parse_options(int argc, char *argv[])
 {
 	int err = 0, help = 0;
-	char c = -1;
+	int c = -1;
 
 	static const char *sopt = "-o:h?qv";
 	static const struct option lopt[] = {
@@ -1692,7 +1692,7 @@ static int parse_options(int argc, char 
 	opts.options = NULL;
 	opts.device = NULL;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {

Index: ntfsmove.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ntfsmove.c	28 Oct 2005 18:39:52 -0000	1.21
+++ ntfsmove.c	5 Apr 2006 12:43:07 -0000	1.22
@@ -121,7 +121,7 @@ static int parse_options(int argc, char 
 		{ NULL,		0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- ntfsresize.c	5 Apr 2006 02:53:42 -0000	1.115
+++ ntfsresize.c	5 Apr 2006 12:43:07 -0000	1.116
@@ -453,7 +453,7 @@ static int parse_options(int argc, char 
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c;
+	int c;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -461,7 +461,7 @@ static int parse_options(int argc, char 
 	memset(&opt, 0, sizeof(opt));
 	opt.show_progress = 1;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!err && !opt.volume)

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- ntfsrm.c	20 Nov 2005 14:15:33 -0000	1.71
+++ ntfsrm.c	5 Apr 2006 12:43:08 -0000	1.72
@@ -126,7 +126,7 @@ static int parse_options(int argc, char 
 		{ NULL,			0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;

Index: ntfsundelete.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- ntfsundelete.c	10 Nov 2005 03:20:27 -0000	1.55
+++ ntfsundelete.c	5 Apr 2006 12:43:08 -0000	1.56
@@ -450,7 +450,7 @@ static int parse_options(int argc, char 
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c = -1;
+	int c = -1;
 	char *end = NULL;
 	int err  = 0;
 	int ver  = 0;
@@ -463,7 +463,7 @@ static int parse_options(int argc, char 
 	opts.uinode   = -1;
 	opts.percent  = -1;
 	opts.fillbyte = -1;
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {

Index: ntfswipe.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- ntfswipe.c	28 Oct 2005 18:23:32 -0000	1.43
+++ ntfswipe.c	5 Apr 2006 12:43:08 -0000	1.44
@@ -209,7 +209,7 @@ static int parse_options(int argc, char 
 		{ NULL,		0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	char *end;
 	int err  = 0;
 	int ver  = 0;

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

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
Fix all incorrect getopt_long() return value usages.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -p -r1.375 -r1.376
--- ChangeLog	5 Apr 2006 02:53:40 -0000	1.375
+++ ChangeLog	5 Apr 2006 12:43:06 -0000	1.376
@@ -35,6 +35,7 @@ xx/xx/2006 - 1.13.1-WIP
 	- 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)
+	- Fix all incorrect getopt_long() return value usages.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.8.in,1.15,1.16

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

Changes by: szaka

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

Modified Files:
	ntfsinfo.8.in 
Log Message:
Fix bogus reference to ntfsundelete


Index: ntfsinfo.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.8.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ntfsinfo.8.in	6 Feb 2006 01:05:01 -0000	1.15
+++ ntfsinfo.8.in	5 Apr 2006 02:59:12 -0000	1.16
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSINFO 8 "November 2005" "ntfsprogs @VERSION@"
+.TH NTFSINFO 8 "April 2006" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsinfo \- dump a file's attributes
 .SH SYNOPSIS
@@ -61,8 +61,7 @@ Increase the amount of output that
 prints.
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-Show the version number, copyright and license for
-.BR ntfsundelete .
+Show the version number, copyright and license.
 .SH BUGS
 There are no known problems with
 .BR ntfsinfo .

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscmp.c,1.15,1.16

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

Changes by: szaka

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

Modified Files:
	ntfscmp.c 
Log Message:
Implement special $BadClus:$Bad handling


Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ntfscmp.c	5 Apr 2006 02:55:43 -0000	1.15
+++ ntfscmp.c	5 Apr 2006 02:56:52 -0000	1.16
@@ -567,6 +567,14 @@ static void cmp_attribute(ntfs_attr_sear
 		goto close_attribs;
 	}
 
+	if (ntfs_inode_badclus_bad(inumber(ctx1->ntfs_ino), ctx1->attr) == 1) {
+		/*
+		 * If difference exists then it's already reported at the
+		 * attribute header since the mapping pairs must differ.
+		 */
+		return;
+	}
+
 	cmp_attribute_data(na1, na2);
 
 close_attribs:
@@ -775,10 +783,6 @@ static int cmp_inodes(ntfs_volume *vol1,
 
 	for (inode = 0; inode < nr_mft_records; inode++) {
 
-		/* FIXME: needs special handling */
-		if (inode == 8)
-			continue;
-
 		ret1 = inode_open(vol1, (MFT_REF)inode, &ni1);
 		ret2 = inode_open(vol2, (MFT_REF)inode, &ni2);
 

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

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

Changes by: szaka

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

Modified Files:
	TODO.ntfsprogs 
Log Message:
Implement special $BadClus:$Bad handling


Index: TODO.ntfsprogs
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/TODO.ntfsprogs,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- TODO.ntfsprogs	9 Mar 2006 14:13:18 -0000	1.25
+++ TODO.ntfsprogs	5 Apr 2006 02:56:52 -0000	1.26
@@ -52,7 +52,6 @@ Thanks,
 
 - more exact details about the differences 
 - unnamed resident attributes with same type are ignored
-- special $BadClus:$Bad handling, now $BadClus is skipped
 - new option: --metadata mode
 - code cleanup, remove many cross-util duplicates
 - write manual

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscmp.c,1.14,1.15

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

Changes by: szaka

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

Modified Files:
	ntfscmp.c 
Log Message:
Compare the full attribute headers for non-resident attributes 


Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ntfscmp.c	19 Feb 2006 12:50:54 -0000	1.14
+++ ntfscmp.c	5 Apr 2006 02:55:43 -0000	1.15
@@ -522,20 +522,17 @@ static void cmp_attribute_data(ntfs_attr
 
 static int cmp_attribute_header(ATTR_RECORD *a1, ATTR_RECORD *a2)
 {
-	int header_size = offsetof(ATTR_RECORD, resident_end);
+	u32 header_size = offsetof(ATTR_RECORD, resident_end);
 
 	if (a1->non_resident != a2->non_resident)
 		return 1;
 
 	if (a1->non_resident) {
-
-		if (a1->compression_unit != a2->compression_unit)
-			return 1;
-
-		header_size = offsetof(ATTR_RECORD, non_resident_end);
-		if (a1->compression_unit)
-			header_size = offsetof(ATTR_RECORD, compressed_end);
-	} 
+		/*
+		 * FIXME: includes paddings which are not handled by ntfsinfo!
+		 */
+		header_size = a1->length;
+	}
 
 	return memcmp(a1, a2, header_size);
 }

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

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
libntfs: add and ntfs_inode_badclus_bad() and convert all copy-pastes
to use them


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- ntfsresize.c	5 Apr 2006 02:45:56 -0000	1.114
+++ ntfsresize.c	5 Apr 2006 02:53:42 -0000	1.115
@@ -638,29 +638,6 @@ static s64 nr_clusters_to_bitmap_byte_si
 	return bm_bsize;
 }
 
-static int is_badclus_bad(u64 mft_no, ATTR_RECORD *a)
-{
-	int len, ret = 0;
-	ntfschar *ustr;
-
-	if (mft_no != FILE_BadClus)
-	       	return 0;
-
-	if ((ustr = ntfs_str2ucs("$Bad", &len)) == NULL) {
-		perr_printf("Couldn't convert '$Bad' to Unicode");
-		return -1;
-	}
-
-	if (ustr && ntfs_names_are_equal(ustr, len,
-			(ntfschar *)((u8 *)a + le16_to_cpu(a->name_offset)),
-			a->name_length, 0, NULL, 0))
-		ret = 1;
-
-	ntfs_ucsfree(ustr);
-
-	return ret;
-}
-
 static void collect_resize_constraints(ntfs_resize_t *resize, runlist *rl)
 {
 	s64 inode, last_lcn;
@@ -675,9 +652,9 @@ static void collect_resize_constraints(n
 	flags = resize->ctx->attr->flags;
 	atype = resize->ctx->attr->type;
 
-	if ((ret = is_badclus_bad(inode, resize->ctx->attr)) != 0) {
+	if ((ret = ntfs_inode_badclus_bad(inode, resize->ctx->attr)) != 0) {
 		if (ret == -1)
-			exit(1);
+			perr_exit("Bad sector list check failed");
 		return;
 	}
 
@@ -1679,9 +1656,9 @@ static void relocate_attributes(ntfs_res
 		if (handle_mftdata(resize, do_mftdata) == 0)
 			continue;
 
-		ret = is_badclus_bad(resize->mref, resize->ctx->attr);
+		ret = ntfs_inode_badclus_bad(resize->mref, resize->ctx->attr);
 		if (ret == -1)
-			exit(1);
+			perr_exit("Bad sector list check failed");
 		else if (ret == 1)
 			continue;
 

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

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

Changes by: szaka

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

Modified Files:
	inode.c 
Log Message:
libntfs: add and ntfs_inode_badclus_bad() and convert all copy-pastes
to use them


Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- inode.c	9 Feb 2006 21:40:00 -0000	1.81
+++ inode.c	5 Apr 2006 02:53:42 -0000	1.82
@@ -1105,6 +1105,50 @@ void ntfs_inode_update_time(ntfs_inode *
 	}
 }
 
+/**
+ * ntfs_inode_badclus_bad - check for $Badclus:$Bad data attribute
+ * @mft_no:		mft record number where @attr is present
+ * @attr:		attribute record used to check for the $Bad attribute
+ *
+ * Check if the mft record given by @mft_no and @attr contains the bad sector
+ * list. Please note that mft record numbers describing $Badclus extent inodes
+ * will not match the current $Badclus:$Bad check.
+ * 
+ * On success return 1 if the file is $Badclus:$Bad, otherwise return 0.
+ * On error return -1 with errno set to the error code.
+ */
+int ntfs_inode_badclus_bad(u64 mft_no, ATTR_RECORD *attr)
+{
+	int len, ret = 0;
+	ntfschar *ustr;
+
+	if (!attr) {
+		ntfs_log_error("Invalid argument.\n");
+		errno = EINVAL;
+		return -1;
+	}
+	
+	if (mft_no != FILE_BadClus)
+	       	return 0;
+
+	if (attr->type != AT_DATA)
+	       	return 0;
+
+	if ((ustr = ntfs_str2ucs("$Bad", &len)) == NULL) {
+		ntfs_log_perror("Couldn't convert '$Bad' to Unicode");
+		return -1;
+	}
+
+	if (ustr && ntfs_names_are_equal(ustr, len,
+			(ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset)),
+			attr->name_length, 0, NULL, 0))
+		ret = 1;
+
+	ntfs_ucsfree(ustr);
+
+	return ret;
+}
+
 #ifdef NTFS_RICH
 
 #include "rich.h"

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs inode.h,1.24,1.25

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

Changes by: szaka

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

Modified Files:
	inode.h 
Log Message:
libntfs: add and ntfs_inode_badclus_bad() and convert all copy-pastes
to use them


Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/inode.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- inode.h	23 Feb 2006 22:54:55 -0000	1.24
+++ inode.h	5 Apr 2006 02:53:40 -0000	1.25
@@ -185,6 +185,8 @@ extern int ntfs_inode_add_attrlist(ntfs_
 
 extern int ntfs_inode_free_space(ntfs_inode *ni, int size);
 
+extern int ntfs_inode_badclus_bad(u64 mft_no, ATTR_RECORD *a);
+
 #ifdef NTFS_RICH
 
 int ntfs_inode_close2(ntfs_inode *ni);

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.374,1.375

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
libntfs: add and ntfs_inode_badclus_bad() and convert all copy-pastes
to use them


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -p -r1.374 -r1.375
--- ChangeLog	5 Apr 2006 02:49:24 -0000	1.374
+++ ChangeLog	5 Apr 2006 02:53:40 -0000	1.375
@@ -32,8 +32,9 @@ xx/xx/2006 - 1.13.1-WIP
 	- 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)
-	- libntfs: add ntfs_str2ucs(), ntfs_freeucs() and ntfs_mft_usn_dec()
-	  functions, and convert all copy-pastes to use them.  (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)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.77,1.78

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

Changes by: szaka

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

Modified Files:
	ntfsclone.c 
Log Message:
Fix ntfsclone idempotency


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- ntfsclone.c	5 Apr 2006 02:49:25 -0000	1.77
+++ ntfsclone.c	5 Apr 2006 02:50:44 -0000	1.78
@@ -787,6 +787,9 @@ static void wipe_index_allocation_timest
 
 			wipe_index_entry_timestams(entry);
 
+			if (ntfs_mft_usn_dec((MFT_RECORD *)tmp_indexa))
+				perr_exit("ntfs_mft_usn_dec");
+
 			if (ntfs_mst_pre_write_fixup((NTFS_RECORD *)tmp_indexa,
 						indexr->index_block_size)) {
 				ntfs_log_perror("INDX write fixup failed");

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.139,1.140 ntfsclone.c,1.76,1.77

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

Changes by: szaka

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

Modified Files:
	mkntfs.c ntfsclone.c 
Log Message:
libntfs: add ntfs_mft_usn_dec() and convert all copy-pastes to use them


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- mkntfs.c	5 Apr 2006 02:48:02 -0000	1.139
+++ mkntfs.c	5 Apr 2006 02:49:25 -0000	1.140
@@ -5101,7 +5101,6 @@ static int mkntfs_redirect(struct mkntfs
 	pos = g_mftmirr_lcn * g_vol->cluster_size;
 	lw = 1;
 	for (i = 0; i < g_rl_mftmirr[0].length * g_vol->cluster_size / g_vol->mft_record_size; i++) {
-		u16 usn, *usnp;
 		m = (MFT_RECORD*)(g_buf + i * g_vol->mft_record_size);
 		/*
 		 * Decrement the usn by one, so it becomes the same as the one
@@ -5109,11 +5108,10 @@ static int mkntfs_redirect(struct mkntfs
 		 * $MFTMirr to have the exact same byte by byte content as
 		 * $MFT, rather than just equivalent meaning content.
 		 */
-		usnp = (u16*)((char*)m + le16_to_cpu(m->usa_ofs));
-		usn = le16_to_cpup(usnp);
-		if (usn-- <= 1)
-			usn = 0xfffe;
-		*usnp = cpu_to_le16(usn);
+		if (ntfs_mft_usn_dec(m)) {
+			ntfs_log_error("ntfs_mft_usn_dec");
+			goto done;
+		}
 		if (!opts.no_action)
 			lw = ntfs_mst_pwrite(g_vol->dev, pos, 1, g_vol->mft_record_size, g_buf + i * g_vol->mft_record_size);
 		if (lw != 1) {

Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- ntfsclone.c	5 Apr 2006 02:45:56 -0000	1.76
+++ ntfsclone.c	5 Apr 2006 02:49:25 -0000	1.77
@@ -1125,13 +1125,8 @@ static void wipe_unused_mft(ntfs_inode *
 
 static void mft_record_write_with_same_usn(ntfs_volume *volume, ntfs_inode *ni)
 {
-	u16 usn, *usnp;
-	
-	usnp = (u16 *)((char *)ni->mrec + le16_to_cpu(ni->mrec->usa_ofs));
-	usn = le16_to_cpup(usnp);
-	if (usn-- <= 1)
-		usn = 0xfffe;
-	*usnp = cpu_to_le16(usn);
+	if (ntfs_mft_usn_dec(ni->mrec))
+		perr_exit("ntfs_mft_usn_dec");
 	
 	if (ntfs_mft_record_write(volume, ni->mft_no, ni->mrec))
 		perr_exit("ntfs_mft_record_write");

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs mft.h,1.7,1.8

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

Changes by: szaka

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

Modified Files:
	mft.h 
Log Message:
libntfs: add ntfs_mft_usn_dec() and convert all copy-pastes to use them


Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/mft.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mft.h	21 Oct 2005 18:05:13 -0000	1.7
+++ mft.h	5 Apr 2006 02:49:24 -0000	1.8
@@ -111,6 +111,8 @@ extern ntfs_inode *ntfs_mft_record_alloc
 
 extern int ntfs_mft_record_free(ntfs_volume *vol, ntfs_inode *ni);
 
+extern int ntfs_mft_usn_dec(MFT_RECORD *mrec);
+
 #ifdef NTFS_RICH
 
 #include "bitmap.h"

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.373,1.374

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
libntfs: add ntfs_mft_usn_dec() and convert all copy-pastes to use them


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -p -r1.373 -r1.374
--- ChangeLog	5 Apr 2006 02:45:55 -0000	1.373
+++ ChangeLog	5 Apr 2006 02:49:24 -0000	1.374
@@ -32,8 +32,8 @@ xx/xx/2006 - 1.13.1-WIP
 	- 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)
-	- libntfs: add ntfs_str2ucs and ntfs_freeucs function, and convert 
-	  copy-pastes to use them.  (Szaka)
+	- libntfs: add ntfs_str2ucs(), ntfs_freeucs() and ntfs_mft_usn_dec()
+	  functions, and convert all copy-pastes to use them.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs mft.c,1.44,1.45

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

Changes by: szaka

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

Modified Files:
	mft.c 
Log Message:
libntfs: add ntfs_mft_usn_dec() and convert all copy-pastes to use them


Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- mft.c	18 Dec 2005 16:27:21 -0000	1.44
+++ mft.c	5 Apr 2006 02:49:25 -0000	1.45
@@ -1935,3 +1935,26 @@ int ntfs_mft_add_index(struct ntfs_dir *
 
 #endif /* NTFS_RICH */
 
+/**
+ * ntfs_mft_usn_dec - Decrement USN by one
+ * @mrec:	pointer to an mft record
+ *
+ * On success return 0 and on error return -1 with errno set.
+ */
+int ntfs_mft_usn_dec(MFT_RECORD *mrec)
+{
+	u16 usn, *usnp;
+
+	if (!mrec) {
+		errno = EINVAL;
+		return -1;
+	}
+	usnp = (u16 *)((char *)mrec + le16_to_cpu(mrec->usa_ofs));
+	usn = le16_to_cpup(usnp);
+	if (usn-- <= 1)
+		usn = 0xfffe;
+	*usnp = cpu_to_le16(usn);
+
+	return 0;
+}
+

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

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Quota attributum instantiation order change for better FORMAT conformance


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- mkntfs.c	5 Apr 2006 02:45:56 -0000	1.138
+++ mkntfs.c	5 Apr 2006 02:48:02 -0000	1.139
@@ -4868,12 +4868,12 @@ static BOOL mkntfs_create_root_structure
 				0, 0, "$Quota", FILE_NAME_WIN32_AND_DOS);
 		/* FIXME: This should be IGNORE_CASE */
 		if (!err)
-			err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED,
-				COLLATION_NTOFS_SID, g_vol->indx_record_size);
-		/* FIXME: This should be IGNORE_CASE */
-		if (!err)
 			err = add_attr_index_root(m, "$Q", 2, 0, AT_UNUSED,
 				COLLATION_NTOFS_ULONG, g_vol->indx_record_size);
+		/* FIXME: This should be IGNORE_CASE */
+		if (!err)
+			err = add_attr_index_root(m, "$O", 2, 0, AT_UNUSED,
+				COLLATION_NTOFS_SID, g_vol->indx_record_size);
 		if (!err)
 			err = initialize_quota(m);
 		if (err < 0) {

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.137,1.138 ntfsclone.c,1.75,1.76 ntfscp.c,1.34,1.35 ntfsresize.c,1.113,1.114 ntfstruncate.c,1.32,1.33

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

Changes by: szaka

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

Modified Files:
	mkntfs.c ntfsclone.c ntfscp.c ntfsresize.c ntfstruncate.c 
Log Message:
libntfs: add ntfs_str2ucs and ntfs_freeucs function, and convert
copy-pastes to use them


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- mkntfs.c	14 Mar 2006 21:20:21 -0000	1.137
+++ mkntfs.c	5 Apr 2006 02:45:56 -0000	1.138
@@ -1515,15 +1515,11 @@ static int insert_positioned_attr_in_mft
 		attr_lookup();
 	else
 	*/
-	if (name) {
-		uname_len = ntfs_mbstoucs(name, &uname, 0);
-		if (uname_len < 0)
-			return -errno;
-		if (uname_len > 0xff) {
-			free(uname);
-			return -ENAMETOOLONG;
-		}
-	}
+
+	uname = ntfs_str2ucs(name, &uname_len);
+	if (!uname)
+		return -errno;
+
 	/* Check if the attribute is already there. */
 	ctx = ntfs_attr_get_search_ctx(NULL, m);
 	if (!ctx) {
@@ -1674,7 +1670,7 @@ static int insert_positioned_attr_in_mft
 err_out:
 	if (ctx)
 		ntfs_attr_put_search_ctx(ctx);
-	free(uname);
+	ntfs_ucsfree(uname);
 	return err;
 }
 
@@ -1701,17 +1697,11 @@ static int insert_non_resident_attr_in_m
 		attr_lookup();
 	else
 	*/
-	if (name) {
-		uname_len = ntfs_mbstoucs(name, &uname, 0);
-		if (uname_len < 0)
-			return -errno;
-		if (uname_len > 0xff) {
-			free(uname);
-			return -ENAMETOOLONG;
-		}
-	} else {
-		uname = AT_UNNAMED;
-	}
+
+	uname = ntfs_str2ucs(name, &uname_len);
+	if (!uname)
+		return -errno;
+
 	/* Check if the attribute is already there. */
 	ctx = ntfs_attr_get_search_ctx(NULL, m);
 	if (!ctx) {
@@ -1866,8 +1856,7 @@ static int insert_non_resident_attr_in_m
 err_out:
 	if (ctx)
 		ntfs_attr_put_search_ctx(ctx);
-	if (uname && (uname != AT_UNNAMED))
-		free(uname);
+	ntfs_ucsfree(uname);
 	free(rl);
 	return err;
 }
@@ -1893,17 +1882,11 @@ static int insert_resident_attr_in_mft_r
 		mkntfs_attr_lookup();
 	else
 	*/
-	if (name) {
-		uname_len = ntfs_mbstoucs(name, &uname, 0);
-		if (uname_len < 0)
-			return -errno;
-		if (uname_len > 0xff) {
-			free(uname);
-			return -ENAMETOOLONG;
-		}
-	} else {
-		uname = AT_UNNAMED;
-	}
+
+	uname = ntfs_str2ucs(name, &uname_len);
+	if (!uname)
+		return -errno;
+
 	/* Check if the attribute is already there. */
 	ctx = ntfs_attr_get_search_ctx(NULL, m);
 	if (!ctx) {
@@ -1978,8 +1961,7 @@ static int insert_resident_attr_in_mft_r
 err_out:
 	if (ctx)
 		ntfs_attr_put_search_ctx(ctx);
-	if (uname && (uname != AT_UNNAMED))
-		free(uname);
+	ntfs_ucsfree(uname);
 	return err;
 }
 
@@ -2426,33 +2408,26 @@ static int upgrade_to_large_index(MFT_RE
 	char *re_start, *re_end;
 	int i, err, index_block_size;
 
-	if (name) {
-		uname_len = ntfs_mbstoucs(name, &uname, 0);
-		if (uname_len < 0)
-			return -errno;
-		if (uname_len > 0xff) {
-			free(uname);
-			return -ENAMETOOLONG;
-		}
-	} else {
-		uname = NULL;
-	}
+	uname = ntfs_str2ucs(name, &uname_len);
+	if (!uname)
+		return -errno;
+
 	/* Find the index root attribute. */
 	ctx = ntfs_attr_get_search_ctx(NULL, m);
 	if (!ctx) {
 		ntfs_log_error("Failed to allocate attribute search context.\n");
-		free(uname);
+		ntfs_ucsfree(uname);
 		return -ENOMEM;
 	}
 	if (ic == IGNORE_CASE) {
 		ntfs_log_error("FIXME: Hit unimplemented code path #4.\n");
 		err = -EOPNOTSUPP;
-		free(uname);
+		ntfs_ucsfree(uname);
 		goto err_out;
 	}
 	err = mkntfs_attr_lookup(AT_INDEX_ROOT, uname, uname_len, ic, 0, NULL, 0,
 			ctx);
-	free(uname);
+	ntfs_ucsfree(uname);
 	if (err) {
 		err = -ENOTDIR;
 		goto err_out;

Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- ntfsclone.c	27 Mar 2006 21:40:27 -0000	1.75
+++ ntfsclone.c	5 Apr 2006 02:45:56 -0000	1.76
@@ -1539,21 +1539,6 @@ static ntfs_attr_search_ctx *attr_get_se
 	return ret;
 }
 
-static int str2unicode(const char *aname, ntfschar **ustr, int *len)
-{
-	if (aname && ((*len = ntfs_mbstoucs(aname, ustr, 0)) == -1)) {
-		perr_printf("Unable to convert '%s' to Unicode", aname);
-		return -1;
-	}
-
-	if (!*ustr || !*len) {
-		*ustr = AT_UNNAMED;
-		*len = 0;
-	}
-
-	return 0;
-}
-
 /**
  * lookup_data_attr
  *
@@ -1562,22 +1547,22 @@ static int str2unicode(const char *aname
 static ntfs_attr_search_ctx *lookup_data_attr(ntfs_inode *ni, const char *aname)
 {
 	ntfs_attr_search_ctx *ctx;
-	ntfschar *ustr = NULL;
+	ntfschar *ustr;
 	int len = 0;
 
 	if ((ctx = attr_get_search_ctx(ni)) == NULL)
 		return NULL;
 
-	if (str2unicode(aname, &ustr, &len) == -1)
+	if ((ustr = ntfs_str2ucs(aname, &len)) == NULL) {
+		perr_printf("Couldn't convert '%s' to Unicode", aname);
 		goto error_out;
+	}
 
 	if (ntfs_attr_lookup(AT_DATA, ustr, len, 0, 0, NULL, 0, ctx)) {
 		perr_printf("ntfs_attr_lookup");
 		goto error_out;
 	}
-	if (ustr != AT_UNNAMED)
-		free(ustr);
-
+	ntfs_ucsfree(ustr);
 	return ctx;
 error_out:
 	ntfs_attr_put_search_ctx(ctx);

Index: ntfscp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ntfscp.c	21 Nov 2005 21:25:15 -0000	1.34
+++ ntfscp.c	5 Apr 2006 02:45:56 -0000	1.35
@@ -393,16 +393,13 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (opts.attr_name) {
-		attr_name = NULL;
-		attr_name_len = ntfs_mbstoucs(opts.attr_name, &attr_name, 0);
-		if (attr_name_len == -1) {
-			ntfs_log_perror("ERROR: Failed to parse attribute "
-					"name");
-			goto close_dst;
-		}
-	} else
-		attr_name = AT_UNNAMED;
+	attr_name = ntfs_str2ucs(opts.attr_name, &attr_name_len);
+	if (!attr_name) {
+		ntfs_log_perror("ERROR: Failed to parse attribute name '%s'",
+				opts.attr_name);
+		goto close_dst;
+	}
+
 	na = ntfs_attr_open(out, opts.attribute, attr_name, attr_name_len);
 	if (!na) {
 		if (errno != ENOENT) {
@@ -423,8 +420,7 @@ int main(int argc, char *argv[])
 			goto close_dst;
 		}
 	}
-	if (attr_name != AT_UNNAMED)
-		free(attr_name);
+	ntfs_ucsfree(attr_name);
 
 	ntfs_log_verbose("Old file size: %lld\n", na->data_size);
 	if (na->data_size != new_size) {

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- ntfsresize.c	30 Mar 2006 00:15:32 -0000	1.113
+++ ntfsresize.c	5 Apr 2006 02:45:56 -0000	1.114
@@ -638,39 +638,25 @@ static s64 nr_clusters_to_bitmap_byte_si
 	return bm_bsize;
 }
 
-static int str2unicode(const char *aname, ntfschar **ustr, int *len)
-{
-	if (aname && ((*len = ntfs_mbstoucs(aname, ustr, 0)) == -1)) {
-		perr_printf("Couldn't convert string to Unicode");
-		return -1;
-	}
-
-	if (!*ustr || !*len) {
-		*ustr = AT_UNNAMED;
-		*len = 0;
-	}
-
-	return 0;
-}
-
 static int is_badclus_bad(u64 mft_no, ATTR_RECORD *a)
 {
 	int len, ret = 0;
-	ntfschar *ustr = NULL;
+	ntfschar *ustr;
 
 	if (mft_no != FILE_BadClus)
 	       	return 0;
 
-	if (str2unicode("$Bad", &ustr, &len) == -1)
+	if ((ustr = ntfs_str2ucs("$Bad", &len)) == NULL) {
+		perr_printf("Couldn't convert '$Bad' to Unicode");
 		return -1;
+	}
 
 	if (ustr && ntfs_names_are_equal(ustr, len,
 			(ntfschar *)((u8 *)a + le16_to_cpu(a->name_offset)),
 			a->name_length, 0, NULL, 0))
 		ret = 1;
 
-	if (ustr != AT_UNNAMED)
-		free(ustr);
+	ntfs_ucsfree(ustr);
 
 	return ret;
 }
@@ -2013,7 +1999,7 @@ static void lookup_data_attr(ntfs_volume
 			     ntfs_attr_search_ctx **ctx)
 {
 	ntfs_inode *ni;
-	ntfschar *ustr = NULL;
+	ntfschar *ustr;
 	int len = 0;
 
 	if (!(ni = ntfs_inode_open(vol, mref)))
@@ -2022,14 +2008,15 @@ static void lookup_data_attr(ntfs_volume
 	if (!(*ctx = attr_get_search_ctx(ni, NULL)))
 		exit(1);
 
-	if (str2unicode(aname, &ustr, &len) == -1)
+	if ((ustr = ntfs_str2ucs(aname, &len)) == NULL) {
+		perr_printf("Couldn't convert '%s' to Unicode", aname);
 		exit(1);
+	}
 
 	if (ntfs_attr_lookup(AT_DATA, ustr, len, 0, 0, NULL, 0, *ctx))
 		perr_exit("ntfs_lookup_attr");
 
-	if (ustr != AT_UNNAMED)
-		free(ustr);
+	ntfs_ucsfree(ustr);
 }
 
 static int check_bad_sectors(ntfs_volume *vol)

Index: ntfstruncate.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ntfstruncate.c	20 Nov 2005 14:15:33 -0000	1.32
+++ ntfstruncate.c	5 Apr 2006 02:45:56 -0000	1.33
@@ -696,8 +696,7 @@ static void ntfstruncate_exit(void)
 	if (err == -1)
 		ntfs_log_perror("Warning: Could not umount %s", dev_name);
 	/* Free the attribute name if it exists. */
-	if (attr_name && attr_name != AT_UNNAMED)
-		free(attr_name);
+	ntfs_ucsfree(attr_name);
 }
 
 /**
@@ -801,8 +800,7 @@ int main(int argc, char **argv)
 		ntfs_log_perror("Warning: Failed to umount %s", dev_name);
 
 	/* Free the attribute name if it exists. */
-	if (attr_name && attr_name != AT_UNNAMED)
-		free(attr_name);
+	ntfs_ucsfree(attr_name);
 
 	/* Finally, disable our ntfstruncate_exit() handler. */
 	success = TRUE;

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs unistr.c,1.33,1.34

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

Changes by: szaka

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

Modified Files:
	unistr.c 
Log Message:
libntfs: add ntfs_str2ucs and ntfs_freeucs function, and convert
copy-pastes to use them


Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- unistr.c	2 Nov 2005 17:34:08 -0000	1.33
+++ unistr.c	5 Apr 2006 02:45:56 -0000	1.34
@@ -39,6 +39,7 @@
 #include <errno.h>
 #endif
 
+#include "attrib.h"
 #include "types.h"
 #include "unistr.h"
 #include "debug.h"
@@ -700,3 +701,55 @@ void ntfs_upcase_table_build(ntfschar *u
 	for (r = 0; uc_byte_table[r][0]; r++)
 		uc[uc_byte_table[r][0]] = uc_byte_table[r][1];
 }
+
+/**
+ * ntfs_str2ucs - convert a string to a valid NTFS file name
+ * @s:		input string
+ * @len:	length of output buffer in Unicode characters
+ *
+ * Convert the input @s string into the corresponding little endian,
+ * 2-byte Unicode string. The length of the converted string is less 
+ * or equal to the maximum length allowed by the NTFS format (255).
+ *
+ * If @s is NULL then return AT_UNNAMED.
+ *
+ * On success the function returns the Unicode string in an allocated 
+ * buffer and the caller is responsible to free it when it's not needed
+ * anymore.
+ *
+ * On error NULL is returned and errno is set to the error code.
+ */
+ntfschar *ntfs_str2ucs(const char *s, int *len)
+{
+	ntfschar *ucs = NULL;
+
+	if (s && ((*len = ntfs_mbstoucs(s, &ucs, 0)) == -1)) {
+		ntfs_log_perror("Couldn't convert '%s' to Unicode", s);
+		return NULL;
+	}
+	if (*len > 0xff) {
+		free(ucs);
+		errno = ENAMETOOLONG;
+		return NULL;
+	}
+	if (!ucs || !*len) {
+		ucs  = AT_UNNAMED;
+		*len = 0;
+	}
+	return ucs;
+}
+
+/**
+ * ntfs_ucsfree - free memory allocated by ntfs_str2ucs()
+ * @ucs		input string to be freed
+ *
+ * Free memory at @ucs and which was allocated by ntfs_str2ucs.
+ *
+ * Return value: none.
+ */
+void ntfs_ucsfree(ntfschar *ucs)
+{
+	if (ucs && (ucs != AT_UNNAMED))
+		free(ucs);
+}
+

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

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
libntfs: add ntfs_str2ucs and ntfs_freeucs function, and convert
copy-pastes to use them


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -p -r1.372 -r1.373
--- ChangeLog	29 Mar 2006 22:29:26 -0000	1.372
+++ ChangeLog	5 Apr 2006 02:45:55 -0000	1.373
@@ -32,6 +32,8 @@ xx/xx/2006 - 1.13.1-WIP
 	- 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)
+	- libntfs: add ntfs_str2ucs and ntfs_freeucs function, and convert 
+	  copy-pastes to use them.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs unistr.h,1.8,1.9

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

Changes by: szaka

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

Modified Files:
	unistr.h 
Log Message:
libntfs: add ntfs_str2ucs and ntfs_freeucs function, and convert
copy-pastes to use them


Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/unistr.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- unistr.h	13 Oct 2005 08:26:02 -0000	1.8
+++ unistr.h	5 Apr 2006 02:45:56 -0000	1.9
@@ -61,5 +61,9 @@ extern int ntfs_mbstoucs(const char *ins
 
 extern void ntfs_upcase_table_build(ntfschar *uc, u32 uc_len);
 
+extern ntfschar *ntfs_str2ucs(const char *s, int *len);
+
+extern void ntfs_ucsfree(ntfschar *ucs);
+
 #endif /* defined _NTFS_UNISTR_H */
 

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

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Cleanup has_bad_sectors() for code reuse; update copyrights


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- ntfsresize.c	13 Mar 2006 20:41:02 -0000	1.112
+++ ntfsresize.c	30 Mar 2006 00:15:32 -0000	1.113
@@ -1,7 +1,7 @@
 /**
  * ntfsresize - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2002-2005 Szabolcs Szakacsits
+ * Copyright (c) 2002-2006 Szabolcs Szakacsits
  * Copyright (c) 2002-2005 Anton Altaparmakov
  * Copyright (c) 2002-2003 Richard Russon
  *
@@ -366,8 +366,8 @@ static void proceed_question(void)
 static void version(void)
 {
 	printf("\nResize an NTFS Volume, without data loss.\n\n");
-	printf("Copyright (c) 2002-2005  Szabolcs Szakacsits\n");
-	printf("Copyright (c) 2002-2004  Anton Altaparmakov\n");
+	printf("Copyright (c) 2002-2006  Szabolcs Szakacsits\n");
+	printf("Copyright (c) 2002-2005  Anton Altaparmakov\n");
 	printf("Copyright (c) 2002-2003  Richard Russon\n");
 	printf("\n%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home);
 }
@@ -653,25 +653,19 @@ static int str2unicode(const char *aname
 	return 0;
 }
 
-static int has_bad_sectors(ntfs_resize_t *resize, int is_inode)
+static int is_badclus_bad(u64 mft_no, ATTR_RECORD *a)
 {
 	int len, ret = 0;
 	ntfschar *ustr = NULL;
-	ATTR_RECORD *a = resize->ctx->attr;
 
-	if (is_inode) {
-		if (resize->ni->mft_no != FILE_BadClus)
-			return 0;
-	} else {
-		if (resize->mref != FILE_BadClus)
-			return 0;
-	}
+	if (mft_no != FILE_BadClus)
+	       	return 0;
 
 	if (str2unicode("$Bad", &ustr, &len) == -1)
 		return -1;
 
 	if (ustr && ntfs_names_are_equal(ustr, len,
-			(ntfschar*)((u8*)a + le16_to_cpu(a->name_offset)),
+			(ntfschar *)((u8 *)a + le16_to_cpu(a->name_offset)),
 			a->name_length, 0, NULL, 0))
 		ret = 1;
 
@@ -695,7 +689,7 @@ static void collect_resize_constraints(n
 	flags = resize->ctx->attr->flags;
 	atype = resize->ctx->attr->type;
 
-	if ((ret = has_bad_sectors(resize, 1)) != 0) {
+	if ((ret = is_badclus_bad(inode, resize->ctx->attr)) != 0) {
 		if (ret == -1)
 			exit(1);
 		return;
@@ -1699,7 +1693,7 @@ static void relocate_attributes(ntfs_res
 		if (handle_mftdata(resize, do_mftdata) == 0)
 			continue;
 
-		ret = has_bad_sectors(resize, 0);
+		ret = is_badclus_bad(resize->mref, resize->ctx->attr);
 		if (ret == -1)
 			exit(1);
 		else if (ret == 1)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscat.c,1.25,1.26 ntfscluster.c,1.31,1.32 ntfsfix.c,1.31,1.32 ntfsinfo.c,1.119,1.120

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

Changes by: szaka

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

Modified Files:
	ntfscat.c ntfscluster.c ntfsfix.c ntfsinfo.c 
Log Message:
Update a few copyrights


Index: ntfscat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ntfscat.c	21 Nov 2005 21:25:14 -0000	1.25
+++ ntfscat.c	29 Mar 2006 22:54:22 -0000	1.26
@@ -62,7 +62,9 @@ static void version(void)
 	ntfs_log_info("\n%s v%s (libntfs %s) - Concatenate files and print on the "
 			"standard output.\n\n", EXEC_NAME, VERSION,
 			ntfs_libntfs_version());
-	ntfs_log_info("Copyright (c) 2003 Richard Russon\n");
+	ntfs_log_info("Copyright (c) 2003-2005 Richard Russon\n");
+	ntfs_log_info("Copyright (c) 2003-2005 Anton Altaparmakov\n");
+	ntfs_log_info("Copyright (c) 2003-2005 Szabolcs Szakacsits\n");
 	ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
 }
 

Index: ntfscluster.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ntfscluster.c	21 Nov 2005 21:25:15 -0000	1.31
+++ ntfscluster.c	29 Mar 2006 22:54:22 -0000	1.32
@@ -1,8 +1,9 @@
 /**
  * ntfscluster - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2005 Anton Altaparmakov
  * Copyright (c) 2002-2003 Richard Russon
+ * Copyright (c) 2005 Anton Altaparmakov
+ * Copyright (c) 2005-2006 Szabolcs Szakacsits
  *
  * This utility will locate the owner of any given sector or cluster.
  *
@@ -67,6 +68,8 @@ static void version(void)
 			"cluster.\n\n", EXEC_NAME, VERSION,
 			ntfs_libntfs_version());
 	ntfs_log_info("Copyright (c) 2002-2003 Richard Russon\n");
+	ntfs_log_info("Copyright (c) 2005 Anton Altaparmakov\n");
+	ntfs_log_info("Copyright (c) 2005-2006 Szabolcs Szakacsits\n");
 	ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
 }
 

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ntfsfix.c	27 Mar 2006 22:49:50 -0000	1.31
+++ ntfsfix.c	29 Mar 2006 22:54:22 -0000	1.32
@@ -2,7 +2,7 @@
  * ntfsfix - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2006 Anton Altaparmakov.
- * Copyright (c) 2002-2005 Szabolcs Szakacsits.
+ * Copyright (c) 2002-2006 Szabolcs Szakacsits.
  *
  * This utility fixes some common NTFS problems, resets the NTFS journal file
  * and schedules an NTFS consistency check for the first boot into Windows.
@@ -118,7 +118,8 @@ static void version(void)
 {
 	ntfs_log_info("%s v%s\n\n"
 		   "Attempt to fix an NTFS partition.\n\n"
-		   "Copyright (c) 2000-2003 Anton Altaparmakov.\n\n",
+		   "Copyright (c) 2000-2006 Anton Altaparmakov.\n"
+		   "Copyright (c) 2002-2006 Szabolcs Szakacsits.\n\n",
 		   EXEC_NAME, VERSION);
 	ntfs_log_info("%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home);
 	exit(1);

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- ntfsinfo.c	29 Mar 2006 22:44:17 -0000	1.119
+++ ntfsinfo.c	29 Mar 2006 22:54:22 -0000	1.120
@@ -108,9 +108,11 @@ static void version(void)
 			ntfs_libntfs_version());
 	printf("Copyright (c)\n");
 	printf("    2002-2004 Matthew J. Fanto\n");
-	printf("    2002-2005 Anton Altaparmakov\n");
+	printf("    2002-2006 Anton Altaparmakov\n");
 	printf("    2002-2005 Richard Russon\n");
+	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("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
 }

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.118,1.119

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

Changes by: antona

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

Modified Files:
	ntfsinfo.c 
Log Message:
fix an ommission in Szaka's cleanup.


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- ntfsinfo.c	29 Mar 2006 22:35:54 -0000	1.118
+++ ntfsinfo.c	29 Mar 2006 22:44:17 -0000	1.119
@@ -1202,7 +1202,6 @@ static void ntfs_dump_index_key(INDEX_EN
 	case INDEX_ATTR_OBJID_O:
 		ntfs_guid_to_mbs(&entry->key.object_id, printable_GUID);
 		ntfs_log_verbose("\t\tKey GUID:\t\t %s\n", printable_GUID);
-		ntfs_log_verbose("\t\tKey Data:\n");
 		break;
 	case INDEX_ATTR_REPARSE_R:
 		ntfs_log_verbose("\t\tKey reparse tag:\t 0x%08x\n",
@@ -1403,6 +1402,7 @@ static int ntfs_dump_index_entries(INDEX
 			ntfs_log_verbose("\t\tData length:\t\t %u\n",
 				le16_to_cpu(entry->data_length));
 			ntfs_dump_index_key(entry, type);
+			ntfs_log_verbose("\t\tKey Data:\n");
 			ntfs_dump_index_data(entry, type);
 			break;
 		}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.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-serv20557/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
Move $ObjId/$O data dumping to its logical place, from ntfs_dump_index_key() 
to ntfs_dump_index_data()


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- ntfsinfo.c	29 Mar 2006 22:29:26 -0000	1.117
+++ ntfsinfo.c	29 Mar 2006 22:35:54 -0000	1.118
@@ -1199,32 +1199,10 @@ static void ntfs_dump_index_key(INDEX_EN
 		ntfs_log_verbose("\t\tKey security id:\t %u\n",
 				 le32_to_cpu(entry->key.sdh.security_id));
 		break;
-	case INDEX_ATTR_OBJID_O: {
-		OBJ_ID_INDEX_DATA *object_id_data;
-
+	case INDEX_ATTR_OBJID_O:
 		ntfs_guid_to_mbs(&entry->key.object_id, printable_GUID);
 		ntfs_log_verbose("\t\tKey GUID:\t\t %s\n", printable_GUID);
 		ntfs_log_verbose("\t\tKey Data:\n");
-		object_id_data = (OBJ_ID_INDEX_DATA*)((u8*)entry +
-				le16_to_cpu(entry->data_offset));
-		ntfs_log_verbose("\t\tMFT Number:\t\t 0x%llx\n",
-				(unsigned long long)
-				MREF_LE(object_id_data->mft_reference));
-		ntfs_log_verbose("\t\tMFT Sequence Number:\t 0x%x\n",
-				(unsigned)
-				MSEQNO_LE(object_id_data->mft_reference));
-		ntfs_guid_to_mbs(&object_id_data->birth_volume_id,
-				printable_GUID);
-		ntfs_log_verbose("\t\tBirth volume id GUID:\t %s\n",
-				printable_GUID);
-		ntfs_guid_to_mbs(&object_id_data->birth_object_id,
-				printable_GUID);
-		ntfs_log_verbose("\t\tBirth object id GUID:\t %s\n",
-				printable_GUID);
-		ntfs_guid_to_mbs(&object_id_data->domain_id, printable_GUID);
-		ntfs_log_verbose("\t\tDomain id GUID:\t\t %s\n",
-				printable_GUID);
-		}
 		break;
 	case INDEX_ATTR_REPARSE_R:
 		ntfs_log_verbose("\t\tKey reparse tag:\t 0x%08x\n",
@@ -1284,8 +1262,30 @@ static void ntfs_dump_index_data(INDEX_E
 		ntfs_log_verbose("\t\tUnknown (padding):\t 0x%08x\n",
 				 le32_to_cpu(data->sdh.reserved_II));
 		break;
-	case INDEX_ATTR_OBJID_O:
-		/* TODO */
+	case INDEX_ATTR_OBJID_O: {
+		OBJ_ID_INDEX_DATA *object_id_data;
+		char printable_GUID[37];
+
+		object_id_data = (OBJ_ID_INDEX_DATA*)((u8*)entry +
+				le16_to_cpu(entry->data_offset));
+		ntfs_log_verbose("\t\tMFT Number:\t\t 0x%llx\n",
+				(unsigned long long)
+				MREF_LE(object_id_data->mft_reference));
+		ntfs_log_verbose("\t\tMFT Sequence Number:\t 0x%x\n",
+				(unsigned)
+				MSEQNO_LE(object_id_data->mft_reference));
+		ntfs_guid_to_mbs(&object_id_data->birth_volume_id,
+				printable_GUID);
+		ntfs_log_verbose("\t\tBirth volume id GUID:\t %s\n",
+				printable_GUID);
+		ntfs_guid_to_mbs(&object_id_data->birth_object_id,
+				printable_GUID);
+		ntfs_log_verbose("\t\tBirth object id GUID:\t %s\n",
+				printable_GUID);
+		ntfs_guid_to_mbs(&object_id_data->domain_id, printable_GUID);
+		ntfs_log_verbose("\t\tDomain id GUID:\t\t %s\n",
+				printable_GUID);
+		}
 		break;
 	case INDEX_ATTR_REPARSE_R:
 		/* TODO */

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.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-serv18765/ntfsprogs

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


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- ntfsinfo.c	27 Mar 2006 22:49:50 -0000	1.116
+++ ntfsinfo.c	29 Mar 2006 22:29:26 -0000	1.117
@@ -541,10 +541,6 @@ static void ntfs_dump_attr_standard_info
 	standard_attr = (STANDARD_INFORMATION*)((char *)attr +
 		le16_to_cpu(attr->value_offset));
 
-	printf("Dumping attribute $STANDARD_INFORMATION (0x10)\n");
-
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
 	/* let's start with mandatory? fields */
 
 	/* time conversion stuff */
@@ -599,40 +595,6 @@ static void ntfs_dump_attr_list(ATTR_REC
 	u8 *value;
 	s64 l;
 
-	printf("Dumping attribute AT_ATTRIBUTE_LIST (0x20)\n");
-
-	/* Dump list's name */
-	if (attr->name_length) {
-		char *stream_name = NULL;
-
-		stream_name = ntfs_attr_get_name(attr);
-		if (stream_name) {
-			printf("\tList name:\t\t '%s'\n",stream_name);
-			free(stream_name);
-		} else {
-			/* an error occurred, errno holds the reason - notify the user */
-			ntfs_log_perror("ntfsinfo error: could not parse stream name");
-		}
-	} else {
-		printf("\tList name:\t\t unnamed\n");
-	}
-
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
-	/* Dump list's size */
-	if (attr->non_resident) {
-		printf("\tAllocated size:\t\t %llu\n",
-			(unsigned long long)le64_to_cpu(attr->allocated_size));
-		printf("\tUsed size:\t\t %llu\n",
-			(unsigned long long)le64_to_cpu(attr->data_size));
-	} else {
-		/* print only the payload's size */
-		/* - "bytes" is mentioned here to avoid confusion with bits
-		     this is not required (almost) anywhere else */
-		printf("\tList's size:\t\t %u bytes\n",
-			(unsigned int)le32_to_cpu(attr->value_length));
-	}
-
 	if (!opts.verbose)
 		return;
 
@@ -698,8 +660,6 @@ static void ntfs_dump_attr_file_name(ATT
 	file_name_attr = (FILE_NAME_ATTR*)((char *)attr +
 		le16_to_cpu(attr->value_offset));
 
-	printf("Dumping attribute $FILE_NAME (0x30)\n");
-
 	/* let's start with the obvious - file name */
 
 	if (file_name_attr->file_name_length>0) {
@@ -726,8 +686,6 @@ static void ntfs_dump_attr_file_name(ATT
 
 	ntfs_dump_namespace(file_name_attr->file_name_type);
 
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
 	/* other basic stuff about the file */
 	printf("\tAllocated File Size:\t %lld\n",
 		(long long)sle64_to_cpu(file_name_attr->allocated_size));
@@ -769,10 +727,6 @@ static void ntfs_dump_attr_object_id(ATT
 	obj_id_attr = (OBJECT_ID_ATTR *)((u8*)attr +
 			le16_to_cpu(attr->value_offset));
 
-	printf("Dumping attribute $OBJECT_ID (0x40)\n");
-
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
 	if (vol->major_ver >= 3.0) {
 		u32 value_length;
 		char printable_GUID[37];
@@ -925,10 +879,6 @@ static void ntfs_dump_attr_security_desc
 {
 	SECURITY_DESCRIPTOR_ATTR *sec_desc_attr;
 
-	printf("Dumping attribute $SECURITY_DESCRIPTOR (0x50)\n");
-
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
 	if (attr->non_resident) {
 		/* FIXME: We don't handle fragmented mapping pairs case. */
 		runlist *rl = ntfs_mapping_pairs_decompress(vol, attr, 0);
@@ -977,10 +927,6 @@ static void ntfs_dump_attr_volume_name(A
 {
 	ntfschar *ucs_vol_name = NULL;
 
-	printf("Dumping attribute $VOLUME_NAME (0x60)\n");
-
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
 	if (attr->value_length>0) {
 		char *mbs_vol_name = NULL;
 		int mbs_vol_name_size;
@@ -1018,10 +964,6 @@ static void ntfs_dump_attr_volume_inform
 	vol_information = (VOLUME_INFORMATION*)((char *)attr+
 		le16_to_cpu(attr->value_offset));
 
-	printf("Dumping attribute $VOLUME_INFORMATION (0x70)\n");
-
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
 	printf("\tVolume Version:\t\t %d.%d\n", vol_information->major_ver,
 		vol_information->minor_ver);
 	printf("\tFlags:\t\t\t ");
@@ -1116,84 +1058,116 @@ static void ntfs_dump_sds(ATTR_RECORD *a
 	
 	free(sds);
 }
-/**
- * ntfs_dump_data_attr()
- *
- * dump some info about the data attribute
- */
-static void ntfs_dump_attr_data(ATTR_RECORD *attr, ntfs_inode *ni)
-{
-	ntfs_volume *vol = ni->vol;
-	
-	printf("Dumping attribute $DATA (0x80) related info\n");
 
-	/* Dump stream name */
-	if (attr->name_length) {
-		char *stream_name = NULL;
-
-		stream_name = ntfs_attr_get_name(attr);
-		if (stream_name) {
-			printf("\tStream name:\t\t '%s'\n",stream_name);
-			free(stream_name);
-		} else {
-			/* an error occurred, errno holds the reason - notify the user */
-			ntfs_log_perror("ntfsinfo error: could not parse stream name");
-		}
-	} else {
-		printf("\tStream name:\t\t unnamed\n");
+static const char *get_attribute_type_name(u32 type)
+{
+	switch (type) {
+	case AT_UNUSED:			return "$UNUSED";
+	case AT_STANDARD_INFORMATION:   return "$STANDARD_INFORMATION";
+	case AT_ATTRIBUTE_LIST:         return "$ATTRIBUTE_LIST";
+	case AT_FILE_NAME:              return "$FILE_NAME";
+	case AT_OBJECT_ID:              return "$OBJECT_ID";
+	case AT_SECURITY_DESCRIPTOR:    return "$SECURITY_DESCRIPTOR";
+	case AT_VOLUME_NAME:            return "$VOLUME_NAME";
+	case AT_VOLUME_INFORMATION:     return "$VOLUME_INFORMATION";
+	case AT_DATA:                   return "$DATA";
+	case AT_INDEX_ROOT:             return "$INDEX_ROOT";
+	case AT_INDEX_ALLOCATION:       return "$INDEX_ALLOCATION";
+	case AT_BITMAP:                 return "$BITMAP";
+	case AT_REPARSE_POINT:          return "$REPARSE_POINT";
+	case AT_EA_INFORMATION:         return "$EA_INFORMATION";
+	case AT_EA:                     return "$EA";
+	case AT_PROPERTY_SET:           return "$PROPERTY_SET";
+	case AT_LOGGED_UTILITY_STREAM:  return "$LOGGED_UTILITY_STREAM";
+	case AT_END:                    return "$END";
+	}
+
+	return "$UNKNOWN";
+}
+	
+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);
+
+	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));
+
+	/* Dump the attribute (stream) name */
+	if (a->name_length) {
+		char *attribute_name = NULL;
+
+		attribute_name = ntfs_attr_get_name(a);
+		if (attribute_name) {
+			printf("\tAttribute name:\t\t '%s'\n", attribute_name);
+			free(attribute_name);
+		} else
+			ntfs_log_perror("Error: couldn't parse attribute name");
 	}
 
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
 	/* TODO: parse the flags */
-	printf("\tFlags:\t\t\t 0x%04hx\n",le16_to_cpu(attr->flags));
+	printf("\tFlags:\t\t\t 0x%04hx\n",le16_to_cpu(a->flags));
+	printf("\tAttribute instance:\t %u\n", le16_to_cpu(a->instance));
 
-	/* fork by residence */
-	if (attr->non_resident) {
-/*		VCN lowest_vcn;	  Lowest valid virtual cluster number
-		VCN highest_vcn;  Highest valid vcn of this extent of
-		u16 mapping_pairs_offset; Byte offset from the ... */
-		printf("\tIs resident? \t\t No\n");
+	/* Resident attribute */
+	if (!a->non_resident) {
+		printf("\tData size:\t\t %u\n",
+			(unsigned int)le32_to_cpu(a->value_length));
+		ntfs_log_verbose("\tData offset:\t\t %u\n",
+			(unsigned int)le16_to_cpu(a->value_offset));
+		/* TODO: parse the flags */
+		printf("\tResident flags:\t\t 0x%02hhx\n", a->resident_flags);
+		ntfs_log_verbose("\tReservedR:\t\t %d\n", a->reservedR);
+		return;
+	}
+
+	/* Non-resident attribute */
+	ntfs_log_verbose("\tLowest VCN\t\t %lld\n",
+			 (long long)sle64_to_cpu(a->lowest_vcn));
+	ntfs_log_verbose("\tHighest VCN:\t\t %lld\n",
+			 (long long)sle64_to_cpu(a->highest_vcn));
+	ntfs_log_verbose("\tMapping pairs offset:\t %u\n",
+			 le16_to_cpu(a->mapping_pairs_offset));
+	printf("\tCompression unit:\t %u\n", a->compression_unit);
+	/* TODO: dump the 5 reserved bytes here in verbose mode */
+
+	if (!a->lowest_vcn) {
 		printf("\tData size:\t\t %llu\n",
-			(long long)le64_to_cpu(attr->data_size));
+			(long long)le64_to_cpu(a->data_size));
 		printf("\tAllocated size:\t\t %llu\n",
-			(long long)le64_to_cpu(attr->allocated_size));
+			(long long)le64_to_cpu(a->allocated_size));
 		printf("\tInitialized size:\t %llu\n",
-			(long long)le64_to_cpu(attr->initialized_size));
-		if (attr->compression_unit) {
-			printf("\tCompression unit:\t %u\n",attr->compression_unit);
-			printf("\tCompressed size:\t %llu\n",
-				(long long)le64_to_cpu(attr->compressed_size));
-		} else {
-			printf("\tNot Compressed\n");
-		}
+			(long long)le64_to_cpu(a->initialized_size));
+		if (a->compression_unit || (a->flags & ATTR_IS_COMPRESSED))
+			printf("\tCompressed size:\t %llu\n", 
+			       (long long)le64_to_cpu(a->compressed_size));
+	}
 
-		if (opts.verbose) {
-			runlist *rl = ntfs_mapping_pairs_decompress(vol, attr, 0);
-			if (rl) {
-				runlist *rlc = rl;
-				printf("\tRunlist:\tVCN\t\tLCN\t\tLength\n");
-				while (rlc->length) {
-					printf("\t\t\t%lld\t\t%lld\t\t%lld\n",
-						rlc->vcn, rlc->lcn, rlc->length);
-					rlc++;
-				}
-				free(rl);
-			} else {
-				ntfs_log_error("ntfsinfo error: could not "
-					"decompress runlist\n");
-				return;
+	if (opts.verbose) {
+		runlist *rl = ntfs_mapping_pairs_decompress(vol, a, 0);
+		if (rl) {
+			runlist *rlc = rl;
+			printf("\tRunlist:\tVCN\t\tLCN\t\tLength\n");
+			while (rlc->length) {
+				printf("\t\t\t%lld\t\t%lld\t\t%lld\n",
+					rlc->vcn, rlc->lcn, rlc->length);
+				rlc++;
 			}
-		}
-	} else {
-		printf("\tIs resident? \t\t Yes\n");
-		printf("\tData size:\t\t %u\n",
-			(unsigned int)le32_to_cpu(attr->value_length));
-
-		/* TODO: parse the flags */
-		printf("\tResidence Flags:\t 0x%02hhx\n", attr->resident_flags);
+			free(rl);
+		} else
+			ntfs_log_error("Error: couldn't decompress runlist\n");
 	}
-	
+}
+
+/**
+ * ntfs_dump_data_attr()
+ *
+ * dump some info about the data attribute if it's metadata
+ */
+static void ntfs_dump_attr_data(ATTR_RECORD *attr, ntfs_inode *ni)
+{
 	if (opts.verbose)
 		ntfs_dump_sds(attr, ni);
 }
@@ -1522,26 +1496,6 @@ static void ntfs_dump_attr_index_root(AT
 
 	index_root = (INDEX_ROOT*)((u8*)attr + le16_to_cpu(attr->value_offset));
 
-	printf("Dumping attribute $INDEX_ROOT (0x90)\n");
-
-	/* Dump index name */
-	if (attr->name_length) {
-		char *index_name = NULL;
-		index_name = ntfs_attr_get_name(attr);
-
-		if (index_name) {
-			printf("\tIndex name:\t\t '%s'\n",index_name);
-			free(index_name);
-		} else {
-			/* an error occurred, errno holds the reason - notify the user */
-			ntfs_log_perror("ntfsinfo error: could not parse index name");
-		}
-	} else {
-		printf("\tIndex name:\t\t unnamed\n");
-	}
-
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
 	/* attr_type dumping */
 	type = get_index_attr_type(ni, attr, index_root);
 	printf("\tIndexed Attr Type:\t ");
@@ -1580,7 +1534,7 @@ static void ntfs_dump_attr_index_root(AT
  *
  * dump context of the index_allocation attribute
  */
-static void ntfs_dump_index_allocation(ATTR_RECORD *attr, ntfs_inode *ni)
+static void ntfs_dump_attr_index_allocation(ATTR_RECORD *attr, ntfs_inode *ni)
 {
 	INDEX_ALLOCATION *allocation, *tmp_alloc;
 	INDEX_ENTRY *entry;
@@ -1657,91 +1611,13 @@ out_index_root:
 }
 
 /**
- * ntfs_dump_attr_index_allocation()
- *
- * dump the index_allocation attribute
- */
-static void ntfs_dump_attr_index_allocation(ATTR_RECORD *attr, ntfs_inode *ni)
-{
-	printf("Dumping attribute $INDEX_ALLOCATION (0xA0)\n");
-
-	/* Dump index name */
-	if (attr->name_length) {
-		char *index_name = NULL;
-		index_name = ntfs_attr_get_name(attr);
-
-		if (index_name) {
-			printf("\tIndex name:\t\t '%s'\n",index_name);
-			free(index_name);
-		} else {
-			/*
-			 * An error occurred, errno holds the reason -
-			 * notify the user
-			 */
-			ntfs_log_perror("ntfsinfo error: could not parse index name");
-		}
-	} else {
-		printf("\tIndex name:\t\t unnamed\n");
-	}
-
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
-	/* dump index's size */
-	if (attr->non_resident) {
-		/* print only the non resident part's size */
-		printf("\tAllocated data size:\t %llu\n",
-			(unsigned long long)le64_to_cpu(attr->allocated_size));
-		printf("\tUsed data size:\t\t %llu\n",
-			(unsigned long long)le64_to_cpu(attr->data_size));
-	} else {
-		ntfs_log_error("Invalid $INDEX_ALLOCATION attribute. Should be"
-						    " non-resident\n");
-	}
-
-	ntfs_dump_index_allocation(attr, ni);
-}
-
-/**
  * ntfs_dump_attr_bitmap()
  *
  * dump the bitmap attribute
  */
-static void ntfs_dump_attr_bitmap(ATTR_RECORD *attr)
+static void ntfs_dump_attr_bitmap(ATTR_RECORD *attr __attribute__((unused)))
 {
-	printf("Dumping attribute $BITMAP (0xB0)\n");
-
-	/* Dump bitmap name */
-	if (attr->name_length) {
-		char *bitmap_name = NULL;
-		bitmap_name = ntfs_attr_get_name(attr);
-
-		if (bitmap_name) {
-			printf("\tBitmap name:\t\t '%s'\n",bitmap_name);
-			free(bitmap_name);
-		} else {
-			/* an error occurred, errno holds the reason - notify the user */
-			ntfs_log_perror("ntfsinfo error: could not parse bitmap name");
-		}
-	} else {
-		printf("\tBitmap name:\t\t unnamed\n");
-	}
-
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
-	/* dump bitmap size */
-	if (attr->non_resident) {
-		/* print only the non resident part's size */
-		printf("\tAllocated data size:\t %llu\n",
-			(unsigned long long)le64_to_cpu(attr->allocated_size));
-		printf("\tUsed data size:\t\t %llu\n",
-			(unsigned long long)le64_to_cpu(attr->data_size));
-	} else {
-		/* print only the payload's size */
-		/* - "bytes" is mentioned here to avoid confusion with bits
-		     this is not required (almost) anywhere else */
-		printf("\tBitmap's size:\t\t %u bytes\n",
-			(unsigned int)le32_to_cpu(attr->value_length));
-	}
+	/* TODO */
 }
 
 /**
@@ -1751,8 +1627,7 @@ static void ntfs_dump_attr_bitmap(ATTR_R
  */
 static void ntfs_dump_attr_reparse_point(ATTR_RECORD *attr __attribute__((unused)))
 {
-	printf("Dumping attribute $REPARSE_POINT/$SYMBOLIC_LINK (0xC0)\n");
-	printf("\tTODO\n");
+	/* TODO */
 }
 
 /**
@@ -1766,7 +1641,6 @@ static void ntfs_dump_attr_ea_informatio
 
 	ea_info = (EA_INFORMATION*)((u8*)attr +
 			le16_to_cpu(attr->value_offset));
-	printf("Dumping attribute $EA_INFORMATION (0xD0)\n");
 	printf("\tPacked EA length:\t %u\n", le16_to_cpu(ea_info->ea_length));
 	printf("\tNEED_EA count:\t\t %u\n",
 			le16_to_cpu(ea_info->need_ea_count));
@@ -1785,13 +1659,10 @@ static void ntfs_dump_attr_ea(ATTR_RECOR
 	u8 *buf = NULL;
 	s64 data_size;
 
-	printf("Dumping attribute $EA (0xE0)\n");
 	if (attr->non_resident) {
 		runlist *rl;
 
 		data_size = sle64_to_cpu(attr->data_size);
-		printf("\tIs resident? \t\t No\n");
-		printf("\tData size:\t\t %lld\n", data_size);
 		if (!opts.verbose)
 			return;
 		/* FIXME: We don't handle fragmented mapping pairs case. */
@@ -1820,8 +1691,6 @@ static void ntfs_dump_attr_ea(ATTR_RECOR
 		}
 	} else {
 		data_size = le32_to_cpu(attr->value_length);
-		printf("\tIs resident? \t\t Yes\n");
-		printf("\tAttribute value length:\t %lld\n", data_size);
 		if (!opts.verbose)
 			return;
 		ea = (EA_ATTR*)((u8*)attr + le16_to_cpu(attr->value_offset));
@@ -1858,8 +1727,7 @@ static void ntfs_dump_attr_ea(ATTR_RECOR
  */
 static void ntfs_dump_attr_property_set(ATTR_RECORD *attr __attribute__((unused)))
 {
-	printf("Dumping attribute $PROPERTY_SET (0xF0)\n");
-	printf("\tTODO\n");
+	/* TODO */
 }
 
 /**
@@ -1869,8 +1737,7 @@ static void ntfs_dump_attr_property_set(
  */
 static void ntfs_dump_attr_logged_utility_stream(ATTR_RECORD *attr __attribute__((unused)))
 {
-	printf("Dumping attribute $LOGGED_UTILITY_STREAM (0x100)\n");
-	printf("\tTODO\n");
+	/* TODO */
 }
 
 /**
@@ -1917,68 +1784,10 @@ static void ntfs_hex_dump(void *buf,unsi
  */
 static void ntfs_dump_attr_unknown(ATTR_RECORD *attr)
 {
-	printf("Dumping unknown attribute type 0x%X.\n"
-		"--Please report this to %s--\n",
-		(unsigned int)le32_to_cpu(attr->type), NTFS_DEV_LIST);
-
-	printf("\tResident size:\t\t %u\n",(unsigned int)le32_to_cpu(attr->length));
-
-	printf("\tIs resident? \t\t ");
-	if (attr->non_resident) {
-		printf("No\n");
-	} else {
-		printf("Yes\n");
-	}
-
-	/* Dump attribute name */
-	if (attr->name_length) {
-		char *attr_name = NULL;
-		attr_name = ntfs_attr_get_name(attr);
-
-		if (attr_name) {
-			printf("\tAttribute name:\t '%s'\n",attr_name);
-			free(attr_name);
-		} else {
-			/* an error occurred, errno holds the reason
-			 * notify the user
-			 */
-			ntfs_log_perror("ntfsinfo error: could not parse "
-				"attribute name");
-		}
-	} else {
-		printf("\tAttribute name:\t unnamed\n");
-	}
-
-	/* we could parse the flags */
-	/* however, it does not make sense with a new attribute type */
-	printf("\tFlags:\t\t\t 0x%04hx\n",le16_to_cpu(attr->flags));
-
-	/* fork by residence */
-	printf("\tIs resident?\t\t ");
-	if (attr->non_resident) {
-		printf("No\n");
-		printf("\tAllocated data size:\t %llu\n",
-			(unsigned long long)le64_to_cpu(attr->allocated_size));
-		printf("\tUsed data size:\t %llu\n",
-			(unsigned long long)le64_to_cpu(attr->data_size));
-		printf("\tInitialized data size:\t %llu\n",
-			(unsigned long long)le64_to_cpu(attr->initialized_size));
-
-		/* if the attribute resident part is large enough, it may
-		 * contain the compressed size
-		 */
-		if ((le32_to_cpu(attr->length)>=72) &&
-			((attr->name_offset==0) || (le16_to_cpu(attr->name_offset)>=72))) {
-			printf("\tCompressed size:\t %llu\n",
-				(unsigned long long)le64_to_cpu(attr->compressed_size));
-		}
-	} else {
-		printf("Yes\n");
-		printf("\tResident payload size:\t %u\n",
-			(unsigned int)le32_to_cpu(attr->value_length));
-
-		printf("\tResidence Flags:\t 0x%02hhx\n", attr->resident_flags);
+	printf("=====  Please report this unknown attribute type to %s =====\n",
+	       NTFS_DEV_LIST);
 
+	if (!attr->non_resident) {
 		/* hex dump */
 		printf("\tDumping some of the attribute data:\n");
 		ntfs_hex_dump((u8*)attr + le16_to_cpu(attr->value_offset),
@@ -1996,11 +1805,11 @@ static void ntfs_dump_inode_general_info
 
 	printf("Dumping Inode #%llu\n",(long long)inode->mft_no);
 
-	printf("Update Sequence Offset:\t %hu\n",
+	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 %hu\n",
+	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));
@@ -2008,7 +1817,7 @@ static void ntfs_dump_inode_general_info
 		(short unsigned int)le16_to_cpu(inode->mrec->sequence_number));
 	printf("Number of hard links:\t\t %hu\n",
 		le16_to_cpu(inode->mrec->link_count));
-	printf("First attribute offset:\t %hu\n",
+	printf("First attribute offset:\t\t %hu\n",
 		le16_to_cpu(inode->mrec->attrs_offset));
 
 	printf("MFT record Flags:\t\t ");
@@ -2061,12 +1870,17 @@ static void ntfs_dump_file_attributes(nt
 	   see ntfs_attr_lookup documentation for detailed explanation */
 	ctx = ntfs_attr_get_search_ctx(inode, NULL);
 	while (!ntfs_attr_lookup(AT_UNUSED, NULL, 0, 0, 0, NULL, 0, ctx)) {
+		
+		if (ctx->attr->type == AT_END || ctx->attr->type == AT_UNUSED) {
+			printf("Weird: %s attribute type was found, please "
+			       "report this.\n", 
+			       get_attribute_type_name(ctx->attr->type));
+			continue;
+		}
+		
+		ntfs_dump_attribute_header(ctx->attr, inode->vol);
+		
 		switch (ctx->attr->type) {
-		case AT_UNUSED:
-			/* That's an internal type, isn't it? */
-			printf("Weird: AT_UNUSED type was returned, please "
-				"report this.\n");
-			break;
 		case AT_STANDARD_INFORMATION:
 			ntfs_dump_attr_standard_information(ctx->attr);
 			break;
@@ -2115,10 +1929,6 @@ static void ntfs_dump_file_attributes(nt
 		case AT_LOGGED_UTILITY_STREAM:
 			ntfs_dump_attr_logged_utility_stream(ctx->attr);
 			break;
-		case AT_END:
-			printf("Weird: AT_END type was returned, please report "
-				"this.\n");
-			break;
 		default:
 			ntfs_dump_attr_unknown(ctx->attr);
 		}