[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsresize.c,1.6,1.7

[? <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv32439

Modified Files:
	ntfsresize.c 
Log Message:
Bail out if $Bitmap/$BadClust has attribite list attribute, this 
condition is stronger what we need now but better to be on the 
safer side. Other minor updates.


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsresize.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ntfsresize.c	10 Jul 2002 10:56:26 -0000	1.6
+++ ntfsresize.c	11 Jul 2002 09:02:26 -0000	1.7
@@ -270,5 +270,5 @@
 
 	if (current != p->stop) {
-		if ((current != p->start) && (current % p->resolution))
+		if ((current - p->start) % p->resolution)
 			return;
 		printf("%6.2f percent completed\r", percent);
@@ -296,4 +296,6 @@
 		mref = (MFT_REF)inode;
 		if (ntfs_read_file_record(vol, mref, &mrec, NULL)) {
+			/* FIXME: continue only if it make sense, e.g. 
+			   MFT record not in use based on $MFT bitmap */
 			if (errno == EIO)
 				continue;
@@ -493,4 +495,7 @@
 		perr_exit("ntfs_open_inode");
 
+	if (NInoAttrList(ni))
+		perr_exit("Attribute list attribute not yet supported");
+
 	if (!(*ctx = ntfs_get_attr_search_ctx(ni, NULL)))
                 perr_exit("ntfs_get_attr_search_ctx");
@@ -575,4 +580,6 @@
 	NTFS_BOOT_SECTOR bs;
 	
+	printf("Updating Boot record ...\n");
+
 	if (lseek(vol->fd, 0, SEEK_SET) == (off_t)-1)
 		perr_exit("lseek");
@@ -635,5 +642,6 @@
 	/* FIXME: "call" ntfsfix: set the volume dirty, delete log, etc */
 
-	printf("Volume had been resized. Please run 'ntfsfix' on it.\n");
+	printf("NTFS had been resized on volume %s. "
+	       "Please run 'ntfsfix' on it.\n", vol->dev_name);
 
 	return 0;