[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;