[Linux-NTFS-cvs] CVS: ntfs-driver-tng/scripts compat.c,1.6,1.7 rl.c,1.12,1.13

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv1380

Modified Files:
	compat.c rl.c 
Log Message:
fix wrong notmapped length


Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/compat.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- compat.c	11 Feb 2002 05:32:27 -0000	1.6
+++ compat.c	12 Feb 2002 02:30:59 -0000	1.7
@@ -255,5 +255,5 @@
 void ntfs_debug_dump_runlist(const run_list *rl)
 {
-	int abbr = 1;	/* abbreviate long lists */
+	int abbr = 0;	/* abbreviate long lists */
 	int len = 0;
 	int i;

Index: rl.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/rl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- rl.c	11 Feb 2002 05:32:27 -0000	1.12
+++ rl.c	12 Feb 2002 02:30:59 -0000	1.13
@@ -199,9 +199,7 @@
 	rl_mc (res, loc + disc - hole, new, left, nsize - left);
 
-	if (res[loc+nsize-left+disc-hole].lcn == LCN_HOLE) {
+	if (res[loc+nsize-left+disc-hole].lcn <= LCN_HOLE) {
 		res[loc+nsize-left+disc-hole].length -= (new[nsize-1].vcn +
 			new[nsize-1].length - new[0].vcn);
-	}
-	if (res[loc+nsize-left+disc-hole].lcn <= LCN_HOLE) {
 		res[loc+nsize-left+disc-hole].vcn =
 			res[loc+nsize-left+disc-hole-1].vcn +
@@ -1008,9 +1006,9 @@
 		return 1;
 	//printf ("rl1    %p\n", rl1);
-	rl2 = decompress_mapping_pairs (&vol, (ATTR_RECORD*) buf2, NULL);
+	rl2 = decompress_mapping_pairs (&vol, (ATTR_RECORD*) buf2, rl1);
 	if (IS_ERR (rl2))
 		return 1;
 	//printf ("rl2    %p\n", rl2);
-	rl3 = decompress_mapping_pairs (&vol, (ATTR_RECORD*) buf3, NULL);
+	rl3 = decompress_mapping_pairs (&vol, (ATTR_RECORD*) buf3, rl2);
 	if (IS_ERR (rl3))
 		return 1;
@@ -1020,5 +1018,5 @@
 	//ntfs_debug_dump_runlist (rl2);
 	//ntfs_debug_dump_runlist (rl3);
-
+#if 0
 	switch (TEST)
 	{
@@ -1048,8 +1046,8 @@
 		break;
 	}
-
 	//ntfs_debug_dump_runlist (res2);
 	ntfs_free (res2);
 	//printf ("success\n");
+#endif
 /*
 }