linux-ntfs-cvs

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.99,1.100

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Restore correct V3.1 $AttrDef creation which got last by the recent command 
line parsing rewrite. Thanks to ntfscmp for catching this! :)


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- mkntfs.c	10 Nov 2005 20:24:07 -0000	1.99
+++ mkntfs.c	10 Nov 2005 20:54:00 -0000	1.100
@@ -4932,8 +4932,13 @@ static int mkntfs_redirect(struct mkntfs
 	g_vol->indx_record_size      = 4096;
 	g_vol->indx_record_size_bits = 12;
 
-	g_vol->attrdef = (ATTR_DEF*)&attrdef_ntfs12_array;
-	g_vol->attrdef_len = sizeof(attrdef_ntfs12_array);
+	if (g_vol->major_ver < 3) {
+		g_vol->attrdef = (ATTR_DEF*)&attrdef_ntfs12_array;
+		g_vol->attrdef_len = sizeof(attrdef_ntfs12_array);
+	} else {
+		g_vol->attrdef = (ATTR_DEF*)&attrdef_ntfs3x_array;
+		g_vol->attrdef_len = sizeof(attrdef_ntfs3x_array);
+	}
 
 	if (mkntfs_open_partition())		/* Open the partition. */
 		goto done;

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.99,1.100

[Richard R. <nt...@fl...>]

Hi Szaka,

> Restore correct V3.1 $AttrDef creation which got last by the recent command 
> line parsing rewrite. Thanks to ntfscmp for catching this! :)

Damn!  Sorry about that, Szaka.  I was trying hard not to make any code
changes.

Cheers,
  FlatCap (Rich)

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.99,1.100

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

Hi FlatCap,

On Mon, 14 Nov 2005, Richard Russon wrote:

> > Restore correct V3.1 $AttrDef creation which got last by the recent command 
> > line parsing rewrite. Thanks to ntfscmp for catching this! :)
> 
> Damn!  Sorry about that, Szaka.  I was trying hard not to make any code
> changes.

Only those can make mistake who actually work ;) ntfscmp caught it
immediately, anyway.

There was another change, I don't know if it was intentional or not. The
maximum value of the number of sectors and the start position increased
from max of strtoul() to strtoll(). But this change was actually handy,
otherwise I couldn't have immediately created a 16 TB volume on Friday to
demonstrate on the ntfs-dev list that our tools also work on 2+ TB volumes :)

There is check in mkntfs to enforce the maximum volume size limits for
given cluster sizes and they seem to work.

Cheers,
	Szaka