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

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ...

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

Hi Szaka,

> > -	printf("Collecting shrinkage constrains ...\n");
> > +	printf("Collecting shrinkage constraints ...\n");
> 
> They always looked just wrong.

hehe, never underestimate the power of a drunkard with ispell!

Rich.

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.8.in,1.18,1.19

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

Changes by: szaka

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

Modified Files:
	ntfsresize.8.in 
Log Message:
Document --bad-sectors of ntfsresize; update acknowledgement & known issues


Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ntfsresize.8.in	26 Jun 2005 20:43:21 -0000	1.18
+++ ntfsresize.8.in	7 Jul 2005 21:20:04 -0000	1.19
@@ -154,6 +154,14 @@ Volume will be opened read-only and
 displays what it would do if it were to resize the filesystem. 
 Continue with the real resizing only if the test run passed.
 .TP
+.B -b, --bad-sectors
+Support disks having physical errors, bad sectors. Make a backup by
+.BR ntfsclone (8)
+using option --rescue, then run from the command line 'chkdsk /f /r 
+volume:' on Windows prior using this option with ntfsresize. 
+
+If the guarantee is still valid for the disk then replace it. It's defected.
+.TP
 .B -P, --no-progress-bar
 Don't show progress bars.
 .TP
@@ -173,7 +181,7 @@ but the mailing list is moderated and it
 to approve your post. 
 .PP
 There are some very rarely met limitations at present: filesystems having 
-bad sectors, highly fragmented Master File Table (MFT), relocation 
+unknown bad sectors, highly fragmented Master File Table (MFT), relocation
 of the first MFT extent and resizing in the middle of some metadata
 in some cases aren't supported yet. These cases are detected and 
 resizing is refused, restricted to a safe size or the closest safe 
@@ -212,9 +220,11 @@ to Gergely Madarasz, Dewey M. Sasser and
 at the University of Granada for their continuous and highly valuable help, 
 furthermore to Erik Meade, Martin Fick, Sandro Hawke, Dave Croal, 
 Lorrin Nelson, Geert Hendrickx, Robert Bjorkman and Richard Burdick 
-for beta testing and to Theodore Ts'o whose 
+for beta testing the relocation support, to Florian Eyben, Fritz Oppliger,
+Richard Ebling, Sid-Ahmed Touati, Jan Kiszka for the valued
+contributions and to Theodore Ts'o whose 
 .BR resize2fs (8)
-man page formed the basis of this page.
+man page originally formed the basis of this page.
 .SH AVAILABILITY
 .B Ntfsresize
 is part of the 

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.58,1.59 ntfscp.c,1.23,1.24 ntfsdump_logfile.c,1.27,1.28 ntfsinfo.c,1.65,1.66 ntfsls.c,1.22,1.23 ntfsmftalloc.c,1.4,1.5 ntfsmount.c,1.8,1.9 ntfsmove.c,1.12,1.13 ntfsresize.c,1.69,1.70 ntfsrm.c,1.35,1.36 ntfstruncate.c,1.25,1.26 ntfsundelete.c,1.40,1.41 ntfsundelete.h,1.11,1.12 ntfswipe.c,1.35,1.36 sd.c,1.6,1.7

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

Hi,

On Wed, 6 Jul 2005, Richard Russon wrote:

> -	printf("Collecting shrinkage constrains ...\n");
> +	printf("Collecting shrinkage constraints ...\n");

I've been annoyed by these 'constrains' unconsciously for two years but 
never realized the misspellings. They always looked just wrong. Thanks! :-)

Cheers,
 	Szaka

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.166,1.167 attrlist.c,1.25,1.26 collate.c,1.6,1.7 compat.c,1.6,1.7 device.c,1.16,1.17 dir.c,1.17,1.18 index.c,1.6,1.7 inode.c,1.60,1.61 logfile.c,1.4,1.5 mft.c,1.30,1.31 mst.c,1.11,1.12 runlist.c,1.51,1.52 unistr.c,1.19,1.20 unix_io.c,1.3,1.4 volume.c,1.45,1.46

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

Changes by: flatcap

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

Modified Files:
	attrib.c attrlist.c collate.c compat.c device.c dir.c index.c 
	inode.c logfile.c mft.c mst.c runlist.c unistr.c unix_io.c 
	volume.c 
Log Message:
got bored.  don't read the diffs.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- attrib.c	5 Jul 2005 16:34:16 -0000	1.166
+++ attrib.c	6 Jul 2005 22:47:16 -0000	1.167
@@ -264,7 +264,7 @@ static __inline__ void __ntfs_attr_init(
  * @na:
  * @non_resident:
  * @compressed:
- * @ecnrypted:
+ * @encrypted:
  * @sparse:
  * @allocated_size:
  * @data_size:
@@ -1105,7 +1105,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 			/* The buffer is non zero, instantiate the hole. */
 			cur_vcn = rl->vcn;
 			from_vcn = rl->vcn + (ofs >> vol->cluster_size_bits);
-			Dprintf("%s(): Isntantiate the hole with vcn 0x%llx.\n",
+			Dprintf("%s(): Instantiate the hole with vcn 0x%llx.\n",
 					__FUNCTION__, cur_vcn);
 			/*
 			 * Search backwards to find the best lcn to start
@@ -1154,7 +1154,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 				if (ntfs_cluster_free_from_rl(vol, rlc)) {
 					Dprintf("%s(): Failed to free just "
 						"allocated clusters. Leaving "
-						"inconsist metadata. "
+						"inconstant metadata. "
 						"Run chkdsk", __FUNCTION__);
 				}
 				errno = eo;
@@ -1167,7 +1167,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 				/*
 				 * It's definitely a BUG, if we failed to find
 				 * @cur_vcn, because we missed it during
-				 * instatiating of the hole.
+				 * instantiating of the hole.
 				 */
 				Dprintf("%s(): BUG! Failed to find run after "
 					"instantiating. Please report to the "
@@ -1179,7 +1179,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 			/* If leaved part of the hole go to the next run. */
 			if (rl->lcn < 0)
 				rl++;
-			/* Now LCN should shoudn't be lesser than 0. */
+			/* Now LCN shoudn't be less than 0. */
 			if (rl->lcn < 0) {
 				Dprintf("%s(): BUG! LCN is lesser than 0. "
 						"Please report to the "
@@ -1494,7 +1494,7 @@ s64 ntfs_attr_mst_pwrite(ntfs_attr *na, 
  * but not AT_UNNAMED search for a named attribute matching @name. Otherwise,
  * match both named and unnamed attributes.
  *
- * If @ic is IGNORE_CASE, the @name comparisson is not case sensitive and
+ * If @ic is IGNORE_CASE, the @name comparison is not case sensitive and
  * @ctx->ntfs_ino must be set to the ntfs inode to which the mft record
  * @ctx->mrec belongs. This is so we can get at the ntfs volume and hence at
  * the upcase table. If @ic is CASE_SENSITIVE, the comparison is case
@@ -2260,7 +2260,7 @@ void ntfs_attr_put_search_ctx(ntfs_attr_
  * @type in the $AttrDef system file.
  *
  * Return the attribute type definition record if found and NULL if not found
- * or an error occured. On error the error code is stored in errno. The
+ * or an error occurred. On error the error code is stored in errno. The
  * following error codes are defined:
  *	ENOENT	- The attribute @type is not specified in $AttrDef.
  *	EINVAL	- Invalid parameters (e.g. @vol is not valid).
@@ -2299,7 +2299,7 @@ ATTR_DEF *ntfs_attr_find_in_attrdef(cons
  * Check whether the @size in bytes is valid for an attribute of @type on the
  * ntfs volume @vol. This information is obtained from $AttrDef system file.
  *
- * Return 0 if valid and -1 if not valid or an error occured. On error the
+ * Return 0 if valid and -1 if not valid or an error occurred. On error the
  * error code is stored in errno. The following error codes are defined:
  *	ERANGE	- @size is not valid for the attribute @type.
  *	ENOENT	- The attribute @type is not specified in $AttrDef.
@@ -2348,7 +2348,7 @@ int ntfs_attr_size_bounds_check(const nt
  * be non-resident. This information is obtained from $AttrDef system file.
  *
  * Return 0 if the attribute is allowed to be non-resident and -1 if not or an
- * error occured. On error the error code is stored in errno. The following
+ * error occurred. On error the error code is stored in errno. The following
  * error codes are defined:
  *	EPERM	- The attribute is not allowed to be non-resident.
  *	ENOENT	- The attribute @type is not specified in $AttrDef.
@@ -2382,7 +2382,7 @@ int ntfs_attr_can_be_non_resident(const 
  * allocation and extended attribute attributes.
  *
  * Return 0 if the attribute is allowed to be resident and -1 if not or an
- * error occured. On error the error code is stored in errno. The following
+ * error occurred. On error the error code is stored in errno. The following
  * error codes are defined:
  *	EPERM	- The attribute is not allowed to be resident.
  *	EINVAL	- Invalid parameters (e.g. @vol is not valid).
@@ -2425,7 +2425,7 @@ int ntfs_make_room_for_attr(MFT_RECORD *
 	Dprintf("%s(): Entering for pos 0x%d, size %u.\n",
 		 __FUNCTION__, (int)(pos - (u8*)m), (unsigned) size);
 
-	/* Make size 8-byte aligment. */
+	/* Make size 8-byte alignment. */
 	size = (size + 7) & ~7;
 
 	/* Rigorous consistency checks. */
@@ -2467,9 +2467,9 @@ int ntfs_make_room_for_attr(MFT_RECORD *
  * Return offset to attribute from the beginning of the mft record on success
  * and -1 on error. On error the error code is stored in errno.
  * Possible error codes are:
- *	EINVAL	- Invalid argumets passed to function.
+ *	EINVAL	- Invalid arguments passed to function.
  *	EEXIST	- Attribute of such type and with same name already exists.
- *	EIO	- I/O error occured or damaged filesystem.
+ *	EIO	- I/O error occurred or damaged filesystem.
  */
 int ntfs_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type,
 			ntfschar *name, u8 name_len, ATTR_FLAGS flags)
@@ -2502,7 +2502,7 @@ int ntfs_resident_attr_record_add(ntfs_i
 		return -1;
 	}
 
-	/* Locate place where record shoud be. */
+	/* Locate place where record should be. */
 	ctx = ntfs_attr_get_search_ctx(NULL, ni->mrec);
 	if (!ctx)
 		return -1;
@@ -2580,10 +2580,10 @@ put_err_out:
  * Return offset to attribute from the beginning of the mft record on success
  * and -1 on error. On error the error code is stored in errno.
  * Possible error codes are:
- *	EINVAL	- Invalid argumets passed to function.
+ *	EINVAL	- Invalid arguments passed to function.
  *	EEXIST	- Attribute of such type, with same lowest vcn and with same
  *		  name already exists.
- *	EIO	- I/O error occured or damaged filesystem.
+ *	EIO	- I/O error occurred or damaged filesystem.
  */
 int ntfs_non_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type,
 		ntfschar *name, u8 name_len, VCN lowest_vcn, int dataruns_size,
@@ -2618,7 +2618,7 @@ int ntfs_non_resident_attr_record_add(nt
 		return -1;
 	}
 
-	/* Locate place where record shoud be. */
+	/* Locate place where record should be. */
 	ctx = ntfs_attr_get_search_ctx(NULL, ni->mrec);
 	if (!ctx)
 		return -1;
@@ -2699,7 +2699,7 @@ int ntfs_non_resident_attr_record_add(nt
 					lowest_vcn, NULL, 0, ctx)) {
 		err = errno;
 		Dprintf("%s(): Attribute lookup failed. Probably leaving "
-			"inconsist metadata.\n", __FUNCTION__);
+			"inconstant metadata.\n", __FUNCTION__);
 		ntfs_attr_put_search_ctx(ctx);
 		errno = err;
 		return -1;
@@ -2716,15 +2716,15 @@ put_err_out:
 
 /**
  * ntfs_attr_record_rm - remove attribute extent
- * @ctx:	search context describing the attrubute which should be removed
+ * @ctx:	search context describing the attribute which should be removed
  *
  * If this function succeed, user should reinit search context if he/she wants
  * use it anymore.
  *
  * Return 0 on success and -1 on error. On error the error code is stored in
  * errno. Possible error codes are:
- *	EINVAL	- Invalid argumets passed to function.
- *	EIO	- I/O error occured or damaged filesystem.
+ *	EINVAL	- Invalid arguments passed to function.
+ *	EIO	- I/O error occurred or damaged filesystem.
  */
 int ntfs_attr_record_rm(ntfs_attr_search_ctx *ctx)
 {
@@ -2749,12 +2749,12 @@ int ntfs_attr_record_rm(ntfs_attr_search
 
 	/* Remove attribute itself. */
 	if (ntfs_attr_record_resize(ctx->mrec, ctx->attr, 0)) {
-		Dprintf("%s(): Coudn't remove attribute record. Bug or "
+		Dprintf("%s(): Couldn't remove attribute record. Bug or "
 			"damaged MFT record.\n", __FUNCTION__);
 		if (NInoAttrList(base_ni) && type != AT_ATTRIBUTE_LIST)
 			if (ntfs_attrlist_entry_add(ni, ctx->attr))
 				Dprintf("%s(): Rollback failed. Leaving "
-					"inconsist metadata.\n", __FUNCTION__);
+					"inconstant metadata.\n", __FUNCTION__);
 		err = EIO;
 		return -1;
 	}
@@ -2767,7 +2767,7 @@ int ntfs_attr_record_rm(ntfs_attr_search
 	if (NInoAttrList(base_ni) && type != AT_ATTRIBUTE_LIST) {
 		if (ntfs_attrlist_entry_rm(ctx)) {
 			err = errno;
-			Dprintf("%s(): Coudn't delete record from "
+			Dprintf("%s(): Couldn't delete record from "
 				"$ATTRIBUTE_LIST.\n",  __FUNCTION__);
 			errno = err;
 			return -1;
@@ -2788,7 +2788,7 @@ int ntfs_attr_record_rm(ntfs_attr_search
 			le16_to_cpu(ctx->mrec->attrs_offset) == 8) {
 		if (ntfs_mft_record_free(ni->vol, ni)) {
 			// FIXME: We need rollback here.
-			Dprintf("%s(): Coudn't free MFT record.\n",
+			Dprintf("%s(): Couldn't free MFT record.\n",
 					__FUNCTION__);
 			errno = EIO;
 			return -1;
@@ -2811,7 +2811,7 @@ int ntfs_attr_record_rm(ntfs_attr_search
 			 * goes wrong because NInoAttrList(base_ni) returned
 			 * that we have got attribute list.
 			 */
-			Dprintf("%s(): Coudn't find attribute list. Succeed "
+			Dprintf("%s(): Couldn't find attribute list. Succeed "
 				"anyway.\n", __FUNCTION__);
 			return 0;
 		}
@@ -2842,7 +2842,7 @@ int ntfs_attr_record_rm(ntfs_attr_search
 			 * complain if it find MFT record with attribute list,
 			 * but without extents.
 			 */
-			Dprintf("%s(): Coudn't remove attribute list. Succeed "
+			Dprintf("%s(): Couldn't remove attribute list. Succeed "
 				"anyway.\n", __FUNCTION__);
 			return 0;
 		}
@@ -2855,10 +2855,10 @@ int ntfs_attr_record_rm(ntfs_attr_search
  * @ni:		opened ntfs inode to which add attribute
  * @type:	type of the new attribute
  * @name:	name in unicode of the new attribute
- * @name_len:	name length in unicode charcters of the new attribute
+ * @name_len:	name length in unicode characters of the new attribute
  * @size:	size of the new attribute
  *
- * If inode haven't got enogh space to add attribute, add attribute to one of it
+ * If inode haven't got enough space to add attribute, add attribute to one of it
  * extents, if no extents present or no one of them have enough space, than
  * allocate new extent and add attribute to it.
  *
@@ -3013,7 +3013,7 @@ add_attr_record:
 				__FUNCTION__);
 		if (ntfs_attr_rm(na)) {
 			Dprintf("%s(): Failed to remove just added attribute. "
-				"Probably leaving inconsist metadata.\n",
+				"Probably leaving inconstant metadata.\n",
 				__FUNCTION__);
 		}
 		goto err_out;
@@ -3034,7 +3034,7 @@ free_err_out:
 			le32_to_cpu(attr_ni->mrec->attrs_offset) == 8) {
 		if (ntfs_mft_record_free(attr_ni->vol, attr_ni)) {
 			Dprintf("%s(): Failed to free MFT record. Leaving "
-					"inconsist metadata.\n", __FUNCTION__);
+					"inconstant metadata.\n", __FUNCTION__);
 		}
 	}
 err_out:
@@ -3071,7 +3071,7 @@ int ntfs_attr_rm(ntfs_attr *na)
 			return -1;
 		if (ntfs_cluster_free(na->ni->vol, na, 0, -1) < 0) {
 			Dprintf("%s(): Failed to free cluster allocation. "
-				"Leaving inconsist metadata.\n", __FUNCTION__);
+				"Leaving inconstant metadata.\n", __FUNCTION__);
 			ret = -1;
 		}
 	}
@@ -3084,14 +3084,14 @@ int ntfs_attr_rm(ntfs_attr *na)
 				CASE_SENSITIVE, 0, NULL, 0, ctx)) {
 		if (ntfs_attr_record_rm(ctx)) {
 			Dprintf("%s(): Failed to remove attribute extent. "
-				"Leaving inconsist metadata.\n", __FUNCTION__);
+				"Leaving inconstant metadata.\n", __FUNCTION__);
 			ret = -1;
 		}
 		ntfs_attr_reinit_search_ctx(ctx);
 	}
 	if (errno != ENOENT) {
 		Dprintf("%s(): Attribute lookup failed. Probably leaving "
-				"inconsist metadata.\n", __FUNCTION__);
+				"inconstant metadata.\n", __FUNCTION__);
 		ret = -1;
 	}
 
@@ -3165,7 +3165,7 @@ int ntfs_resident_attr_value_resize(MFT_
 {
 	/*
 	 * Check that the attribute name hasn't been placed after the
-	 * attribute valuy. Chkdsk treat this as corruption.
+	 * attribute value. Chkdsk treat this as corruption.
 	 */
 	if (a->name_length && le16_to_cpu(a->name_offset) >=
 			le16_to_cpu(a->value_offset)) {
@@ -3201,7 +3201,7 @@ int ntfs_resident_attr_value_resize(MFT_
 
 /**
  * ntfs_attr_record_move_to - move attribute record to target inode
- * @ctx:	attribute search context describing the attrubute record
+ * @ctx:	attribute search context describing the attribute record
  * @ni:		opened ntfs inode to which move attribute record
  *
  * If this function succeed, user should reinit search context if he/she wants
@@ -3292,8 +3292,8 @@ put_err_out:
 
 /**
  * ntfs_attr_record_move_away - move away attribute record from it's mft record
- * @ctx:	attribute search context describing the attrubute record
- * @extra:	minimum amount of free spase in the new holder of record
+ * @ctx:	attribute search context describing the attribute record
+ * @extra:	minimum amount of free space in the new holder of record
  *
  * New attribute record holder must have free @extra bytes after moving
  * attribute record to it.
@@ -3419,7 +3419,7 @@ static int ntfs_attr_make_non_resident(n
 
 	/*
 	 * Check that the attribute name hasn't been placed after the
-	 * attribute valuy. Chkdsk treat this as corruption.
+	 * attribute value. Chkdsk treat this as corruption.
 	 */
 	if (a->name_length && le16_to_cpu(a->name_offset) >=
 			le16_to_cpu(a->value_offset)) {
@@ -3580,7 +3580,7 @@ cluster_free_err_out:
  * The following error codes are defined:
  *	ENOMEM	- Not enough memory to complete operation.
  *	ERANGE	- @newsize is not valid for the attribute type of @na.
- *	ENOSPC  - There is no enogh space in base mft to resize $ATTRIBUTE_LIST.
+ *	ENOSPC  - There is no enough space in base mft to resize $ATTRIBUTE_LIST.
  */
 static int ntfs_resident_attr_resize(ntfs_attr *na, const s64 newsize)
 {
@@ -3689,7 +3689,7 @@ static int ntfs_resident_attr_resize(ntf
 		ntfs_attr_put_search_ctx(ctx);
 		return ntfs_resident_attr_resize(na, newsize);
 	}
-	/* Check whether error occured. */
+	/* Check whether error occurred. */
 	if (errno != ENOENT) {
 		err = errno;
 		Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__);
@@ -3921,7 +3921,7 @@ static int ntfs_attr_make_resident(ntfs_
 		if (bytes_read < 0)
 			err = errno;
 		Dprintf("%s(): Eeek! Failed to read attribute data. "
-				"Leaving inconsist metadata. Run chkdsk.  "
+				"Leaving inconstant metadata. Run chkdsk.  "
 				"Aborting...\n", __FUNCTION__);
 		errno = err;
 		return -1;
@@ -3975,7 +3975,7 @@ static int ntfs_attr_make_resident(ntfs_
  * On success return 0 and on error return -1 with errno set to the error code.
  * The following error codes are defined:
  *	ENOMEM	- Not enough memory to complete operation.
- *	ENOSPC  - There is no enogh space in base mft to resize $ATTRIBUTE_LIST.
+ *	ENOSPC  - There is no enough space in base mft to resize $ATTRIBUTE_LIST.
  */
 int ntfs_attr_update_mapping_pairs(ntfs_attr *na)
 {
@@ -4177,7 +4177,7 @@ retry:
 			/*
 			 * Mapping pairs of $ATTRIBUTE_LIST attribute must fit
 			 * in the base mft record. Try to move out other
-			 * attibutes and try again.
+			 * attributes and try again.
 			 */
 			if (na->type == AT_ATTRIBUTE_LIST) {
 				ntfs_attr_put_search_ctx(ctx);
@@ -4201,7 +4201,7 @@ retry:
 				ntfs_attr_put_search_ctx(ctx);
 				if (ntfs_inode_add_attrlist(base_ni)) {
 					err = errno;
-					Dprintf("%s(): Eeek! Coudn't add "
+					Dprintf("%s(): Eeek! Couldn't add "
 						"attribute list.\n",
 						__FUNCTION__);
 					errno = err;
@@ -4264,7 +4264,7 @@ retry:
 		}
 		a->highest_vcn = cpu_to_sle64(stop_vcn - 1);
 	}
-	/* Check whether error occured. */
+	/* Check whether error occurred. */
 	if (errno != ENOENT) {
 		err = errno;
 		Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__);
@@ -4283,7 +4283,7 @@ retry:
 			/* Remove unused attribute record. */
 			if (ntfs_attr_record_rm(ctx)) {
 				err = errno;
-				Dprintf("%s(): Coudn't remove unused attribute "
+				Dprintf("%s(): Couldn't remove unused attribute "
 					"record.\n", __FUNCTION__);
 				goto put_err_out;
 			}
@@ -4323,7 +4323,7 @@ retry:
 		}
 		m = ni->mrec;
 		/*
-		 * If mapping size exceed avaible space, set them to
+		 * If mapping size exceed available space, set them to
 		 * possible maximum.
 		 */
 		cur_max_mp_size = le32_to_cpu(m->bytes_allocated) -
@@ -4334,7 +4334,7 @@ retry:
 				((sizeof(ntfschar) * na->name_len + 7) & ~7);
 		if (mp_size > cur_max_mp_size)
 			mp_size = cur_max_mp_size;
-		/* Add atribute extent to new record. */
+		/* Add attribute extent to new record. */
 		err = ntfs_non_resident_attr_record_add(ni, na->type,
 			 na->name, na->name_len, stop_vcn, mp_size, 0);
 		if (err == -1) {
@@ -4342,7 +4342,7 @@ retry:
 			Dprintf("%s(): Couldn't add attribute extent "
 				"into the MFT record.\n", __FUNCTION__);
 			if (ntfs_mft_record_free(na->ni->vol, ni)) {
-				Dprintf("%s(): Coudn't free MFT record.\n",
+				Dprintf("%s(): Couldn't free MFT record.\n",
 					__FUNCTION__);
 			}
 			goto put_err_out;
@@ -4361,7 +4361,7 @@ retry:
 				"lin...@li....\n",
 				__FUNCTION__);
 			if (ntfs_mft_record_free(na->ni->vol, ni))
-				Dprintf("%s(): Coudn't free MFT record.\n",
+				Dprintf("%s(): Couldn't free MFT record.\n",
 					__FUNCTION__);
 			goto put_err_out;
 		}
@@ -4466,7 +4466,7 @@ static int ntfs_non_resident_attr_shrink
 		if (ntfs_attr_update_mapping_pairs(na)) {
 			err = errno;
 			Dprintf("%s(): Eeek! Mapping pairs update failed. "
-				"Leaving inconsist metadata. Run chkdsk.\n",
+				"Leaving inconstant metadata. Run chkdsk.\n",
 				__FUNCTION__);
 			errno = err;
 			return -1;
@@ -4479,10 +4479,10 @@ static int ntfs_non_resident_attr_shrink
 		err = errno;
 		if ((na->allocated_size >> vol->cluster_size_bits)
 						!= first_free_vcn)
-			Dprintf("%s(): Coudn't get attribute search context. "
-				"Leaving inconsist metadata.\n", __FUNCTION__);
+			Dprintf("%s(): Couldn't get attribute search context. "
+				"Leaving inconstant metadata.\n", __FUNCTION__);
 		else
-			Dprintf("%s(): Coudn't get attribute search context.\n",
+			Dprintf("%s(): Couldn't get attribute search context.\n",
 				 __FUNCTION__);
 		errno = err;
 		return -1;
@@ -4493,7 +4493,7 @@ static int ntfs_non_resident_attr_shrink
 		if (err == ENOENT)
 			err = EIO;
 		Dprintf("%s(): Eeek! Lookup of first attribute extent failed. "
-			"Leaving inconsist metadata.\n", __FUNCTION__);
+			"Leaving inconstant metadata.\n", __FUNCTION__);
 		goto put_err_out;
 	}
 	a = ctx->attr;
@@ -4511,7 +4511,7 @@ static int ntfs_non_resident_attr_shrink
 		new_compr_size = ntfs_rl_get_compressed_size(vol, na->rl);
 		if (new_compr_size == -1) {
 			err = errno;
-			Dprintf("%s(): BUG! Leaving inconsist metadata.\n",
+			Dprintf("%s(): BUG! Leaving inconstant metadata.\n",
 					__FUNCTION__);
 			goto put_err_out;
 		}
@@ -4561,7 +4561,7 @@ put_err_out:
  * The following error codes are defined:
  *	ENOMEM	- Not enough memory to complete operation.
  *	ERANGE	- @newsize is not valid for the attribute type of @na.
- *	ENOSPC  - There is no enogh space in base mft to resize $ATTRIBUTE_LIST.
+ *	ENOSPC  - There is no enough space in base mft to resize $ATTRIBUTE_LIST.
  */
 static int ntfs_non_resident_attr_expand(ntfs_attr *na, const s64 newsize)
 {
@@ -4611,7 +4611,7 @@ static int ntfs_non_resident_attr_expand
 
 		/*
 		 * If we extend $DATA attribute on NTFS 3+ volume, we can add
-		 * sparse runs instead of real alloction of clusters.
+		 * sparse runs instead of real allocation of clusters.
 		 */
 		if (na->type == AT_DATA && vol->major_ver >= 3) {
 			rl = malloc(0x1000);
@@ -4643,7 +4643,7 @@ static int ntfs_non_resident_attr_expand
 				for (rl = na->rl; (rl + 1)->length; rl++)
 					;
 				/*
-				 * If the last LCN is a hole or simillar seek
+				 * If the last LCN is a hole or similar seek
 				 * back to last valid LCN.
 				 */
 				while (rl->lcn < 0 && rl != na->rl)
@@ -4733,7 +4733,7 @@ static int ntfs_non_resident_attr_expand
 		new_compr_size = ntfs_rl_get_compressed_size(vol, na->rl);
 		if (new_compr_size == -1) {
 			err = errno;
-			Dprintf("%s(): BUG! Leaving inconsist metadata.\n",
+			Dprintf("%s(): BUG! Leaving inconstant metadata.\n",
 					__FUNCTION__);
 			goto put_err_out;
 		}
@@ -4766,12 +4766,12 @@ rollback:
 		 */
 		free(na->rl);
 		na->rl = NULL;
-		Dprintf("%s(): Eeek! Coudn't truncate runlist. Rollback "
+		Dprintf("%s(): Eeek! Couldn't truncate runlist. Rollback "
 			"failed.\n", __FUNCTION__);
 	} else {
-		/* Retore mapping pairs. */
+		/* Restore mapping pairs. */
 		if (ntfs_attr_update_mapping_pairs(na)) {
-			Dprintf("%s(): Eeek! Coudn't restore old mapping "
+			Dprintf("%s(): Eeek! Couldn't restore old mapping "
 				"pairs. Rollback failed.\n", __FUNCTION__);
 		}
 	}
@@ -4818,7 +4818,7 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 
 	if (!na || newsize < 0 ||
 			(na->ni->mft_no == FILE_MFT && na->type == AT_DATA)) {
-		Dprintf("%s(): Invalid aruments passed.\n", __FUNCTION__);
+		Dprintf("%s(): Invalid arguments passed.\n", __FUNCTION__);
 		errno = EINVAL;
 		return -1;
 	}
@@ -4852,8 +4852,8 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 		NInoFileNameSetDirty(na->ni);
 		na->ni->data_size = na->data_size;
 		/*
-		 * If attribute sparse or commpreseed then allocated size in
-		 * index should be euqal to compressed size, not to allocated
+		 * If attribute sparse or compressed then allocated size in
+		 * index should be equal to compressed size, not to allocated
 		 * size.
 		 */
 		if (NAttrCompressed(na) || NAttrSparse(na))

Index: attrlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrlist.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- attrlist.c	2 Jul 2005 13:47:29 -0000	1.25
+++ attrlist.c	6 Jul 2005 22:47:16 -0000	1.26
@@ -37,13 +37,13 @@
  * ntfs_attrlist_need - check whether attribute need attribute list
  * @ni:		opened ntfs inode for which perform check
  *
- * Check whether all are atributes belong to one MFT record, in that case
+ * Check whether all are attributes belong to one MFT record, in that case
  * attribute list is not needed.
  *
  * Return 1 if inode need attribute list, 0 if not, -1 on error with errno set
  * to the error code. If function succeed errno set to 0. The following error
  * codes are defined:
- *	EINVAL	- Invalid argumets passed to function or attribute haven't got
+ *	EINVAL	- Invalid arguments passed to function or attribute haven't got
  *		  attribute list.
  */
 int ntfs_attrlist_need(ntfs_inode *ni)
@@ -51,7 +51,7 @@ int ntfs_attrlist_need(ntfs_inode *ni)
 	ATTR_LIST_ENTRY *ale;
 
 	if (!ni) {
-		Dprintf("%s(): Invalid argumets.\n", __FUNCTION__);
+		Dprintf("%s(): Invalid arguments.\n", __FUNCTION__);
 		errno = EINVAL;
 		return -1;
 	}
@@ -67,7 +67,7 @@ int ntfs_attrlist_need(ntfs_inode *ni)
 	}
 
 	if (!ni->attr_list) {
-		Dprintf("%s(): Corrput in-memory struct.\n", __FUNCTION__);
+		Dprintf("%s(): Corrupt in-memory struct.\n", __FUNCTION__);
 		errno = EINVAL;
 		return -1;
 	}
@@ -89,9 +89,9 @@ int ntfs_attrlist_need(ntfs_inode *ni)
  *
  * Return 0 on success and -1 on error with errno set to the error code. The
  * following error codes are defined:
- *	EINVAL	- Invalid argumets passed to function.
+ *	EINVAL	- Invalid arguments passed to function.
  *	ENOMEM	- Not enough memory to allocate necessary buffers.
- *	EIO	- I/O error occured or damaged filesystem.
+ *	EIO	- I/O error occurred or damaged filesystem.
  */
 int ntfs_attrlist_entry_add(ntfs_inode *ni, ATTR_RECORD *attr)
 {
@@ -106,7 +106,7 @@ int ntfs_attrlist_entry_add(ntfs_inode *
 			(unsigned) le32_to_cpu(attr->type));
 
 	if (!ni || !attr) {
-		Dprintf("%s(): Invalid argumets.\n", __FUNCTION__);
+		Dprintf("%s(): Invalid arguments.\n", __FUNCTION__);
 		errno = EINVAL;
 		return -1;
 	}
@@ -172,7 +172,7 @@ int ntfs_attrlist_entry_add(ntfs_inode *
 	entry_offset = ((u8 *)ale - ni->attr_list);
 	/* Set pointer to new entry. */
 	ale = (ATTR_LIST_ENTRY *)(new_al + entry_offset);
-	/* Zero it to fix valgrid warning. */
+	/* Zero it to fix valgrind warning. */
 	memset(ale, 0, entry_len);
 	/* Form new entry. */
 	ale->type = attr->type;
@@ -226,7 +226,7 @@ err_out:
 
 /**
  * ntfs_attrlist_entry_rm - remove an attribute list attribute entry
- * @ctx:	attribute search context describing the attrubute list entry
+ * @ctx:	attribute search context describing the attribute list entry
  *
  * Remove the attribute list entry @ctx->al_entry from the attribute list.
  *
@@ -242,7 +242,7 @@ int ntfs_attrlist_entry_rm(ntfs_attr_sea
 	int err;
 
 	if (!ctx || !ctx->ntfs_ino || !ctx->al_entry) {
-		Dprintf("%s(): Invalid argumets.\n", __FUNCTION__);
+		Dprintf("%s(): Invalid arguments.\n", __FUNCTION__);
 		errno = EINVAL;
 		return -1;
 	}

Index: collate.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- collate.c	20 Jun 2005 14:23:50 -0000	1.6
+++ collate.c	6 Jul 2005 22:47:17 -0000	1.7
@@ -124,7 +124,7 @@ static ntfs_collate_func_t ntfs_do_colla
  * For speed we use the collation rule @cr as an index into two tables of
  * function pointers to call the appropriate collation function.
  *
- * Return NTFS_COLLATION_ERROR if error occured.
+ * Return NTFS_COLLATION_ERROR if error occurred.
  */
 int ntfs_collate(ntfs_volume *vol, COLLATION_RULES cr,
 		const void *data1, const int data1_len,

Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/compat.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- compat.c	20 Feb 2004 14:44:16 -0000	1.6
+++ compat.c	6 Jul 2005 22:47:17 -0000	1.7
@@ -1,5 +1,5 @@
 /*
- * compat.c - Tweaks for Windows compatability
+ * compat.c - Tweaks for Windows compatibility
  *
  * Copyright (c) 2002 Richard Russon
  * Copyright (c) 2002-2004 Anton Altaparmakov

Index: device.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/device.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- device.c	11 Jan 2005 20:28:28 -0000	1.16
+++ device.c	6 Jul 2005 22:47:17 -0000	1.17
@@ -307,7 +307,7 @@ s64 ntfs_mst_pread(struct ntfs_device *d
  * @dev at position @pos.
  *
  * On success, return the number of successfully written blocks. If this number
- * is lower than @count this means that the write has been interrutped or that
+ * is lower than @count this means that the write has been interrupted or that
  * an error was encountered during the write so that the write is partial. 0
  * means nothing was written (also return 0 when @count or @bksize are 0).
  *

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- dir.c	21 Jun 2005 09:55:15 -0000	1.17
+++ dir.c	6 Jul 2005 22:47:17 -0000	1.18
@@ -910,7 +910,7 @@ skip_index_root:
 	if (br != bmp_buf_size) {
 		if (br != -1)
 			errno = EIO;
-		Dperror("Failed to read from inde bitmap attribute");
+		Dperror("Failed to read from index bitmap attribute");
 		goto err_out;
 	}
 
@@ -933,7 +933,7 @@ find_next_index_buffer:
 		if (br != bmp_buf_size) {
 			if (br != -1)
 				errno = EIO;
-			Dperror("Failed to read from inde bitmap attribute");
+			Dperror("Failed to read from index bitmap attribute");
 			goto err_out;
 		}
 	}

Index: index.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- index.c	21 Jun 2005 09:55:15 -0000	1.6
+++ index.c	6 Jul 2005 22:47:17 -0000	1.7
@@ -228,7 +228,7 @@ done:
 			break;
 		/*
 		 * A match should never happen as the memcmp() call should have
-		 * cought it, but we still treat it correctly.
+		 * caught it, but we still treat it correctly.
 		 */
 		if (!rc)
 			goto ir_done;
@@ -356,7 +356,7 @@ ia_done:
 			break;
 		/*
 		 * A match should never happen as the memcmp() call should have
-		 * cought it, but we still treat it correctly.
+		 * caught it, but we still treat it correctly.
 		 */
 		if (!rc)
 			goto ia_done;

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- inode.c	2 Jul 2005 17:48:59 -0000	1.60
+++ inode.c	6 Jul 2005 22:47:17 -0000	1.61
@@ -256,7 +256,7 @@ int ntfs_inode_close(ntfs_inode *ni)
 			}
 			/* 
 			 * ElectricFence is unhappy with realloc(x,0) as free(x)
-			 * thus we explicitely separate these two cases.
+			 * thus we explicitly separate these two cases.
 			 */
 			if (base_ni->nr_extents) {
 				/* Resize the memory buffer. */
@@ -375,8 +375,8 @@ err_out:
 }
 
 /**
- * ntfs_inode_attach_all_extents - atach all extents for target inode
- * @ni:		opened ntfs inode for which perform atach
+ * ntfs_inode_attach_all_extents - attach all extents for target inode
+ * @ni:		opened ntfs inode for which perform attach
  *
  * Return 0 on success and -1 on error with errno set to the error code.
  */
@@ -386,7 +386,7 @@ int ntfs_inode_attach_all_extents(ntfs_i
 	u64 prev_attached = 0;
 
 	if (!ni) {
-		Dprintf("%s(): Invalid argumets.\n", __FUNCTION__);
+		Dprintf("%s(): Invalid arguments.\n", __FUNCTION__);
 		errno = EINVAL;
 		return -1;
 	}
@@ -402,7 +402,7 @@ int ntfs_inode_attach_all_extents(ntfs_i
 		return 0;
 
 	if (!ni->attr_list) {
-		Dprintf("%s(): Corrput in-memory struct.\n", __FUNCTION__);
+		Dprintf("%s(): Corrupt in-memory struct.\n", __FUNCTION__);
 		errno = EINVAL;
 		return -1;
 	}
@@ -427,7 +427,7 @@ int ntfs_inode_attach_all_extents(ntfs_i
 }
 
 /**
- * ntfs_inode_sync_standard_information - update standard informaiton attribute
+ * ntfs_inode_sync_standard_information - update standard information attribute
  * @ni:		ntfs inode to update standard information
  *
  * Return 0 on success or -1 on error with errno set to the error code.
@@ -499,7 +499,7 @@ static int ntfs_inode_sync_file_name(ntf
 		if (MREF_LE(fn->parent_directory) == ni->mft_no) {
 			/*
 			 * WARNING: We cheater here and obtain 2 attribute
-			 * search contextes for one inode (first we obtained
+			 * search contexts for one inode (first we obtained
 			 * above, second will be obtained inside
 			 * ntfs_index_lookup), it's acceptable for library,
 			 * but will lock kernel.
@@ -558,7 +558,7 @@ static int ntfs_inode_sync_file_name(ntf
 		ntfs_index_ctx_put(ictx);
 		ntfs_inode_close(index_ni);
 	}
-	/* Check for real error occured. */
+	/* Check for real error occurred. */
 	if (errno != ENOENT) {
 		err = errno;
 		Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__);
@@ -723,9 +723,9 @@ int ntfs_inode_sync(ntfs_inode *ni)
  * Return 0 on success or -1 on error with errno set to the error code.
  * The following error codes are defined:
  *	EINVAL	- Invalid arguments were passed to the function.
- *	EEXIST	- Attibute list already exist.
- *	EIO	- Input/Ouput error occured.
- *	ENOMEM	- Not enogh memory to perform add.
+ *	EEXIST	- Attribute list already exist.
+ *	EIO	- Input/Ouput error occurred.
+ *	ENOMEM	- Not enough memory to perform add.
  */
 int ntfs_inode_add_attrlist(ntfs_inode *ni)
 {
@@ -737,7 +737,7 @@ int ntfs_inode_add_attrlist(ntfs_inode *
 	ntfs_attr *na;
 
 	if (!ni) {
-		Dprintf("%s(): Invalid argumets.\n", __FUNCTION__);
+		Dprintf("%s(): Invalid arguments.\n", __FUNCTION__);
 		errno = EINVAL;
 		return -1;
 	}
@@ -766,7 +766,7 @@ int ntfs_inode_add_attrlist(ntfs_inode *
 	ctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!ctx) {
 		err = errno;
-		Dprintf("%s(): Coudn't get search context.\n", __FUNCTION__);
+		Dprintf("%s(): Couldn't get search context.\n", __FUNCTION__);
 		goto err_out;
 	}
 	/* Walk through all attributes. */
@@ -811,7 +811,7 @@ int ntfs_inode_add_attrlist(ntfs_inode *
 				ctx->attr->name_length * sizeof(ntfschar));
 		ale = (ATTR_LIST_ENTRY *)(al + al_len);
 	}
-	/* Check for real error occured. */
+	/* Check for real error occurred. */
 	if (errno != ENOENT) {
 		err = errno;
 		Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__);
@@ -885,7 +885,7 @@ remove_attrlist_record:
 			Dprintf("%s(): Rollback failed. Failed to remove "
 				"attribute list record.\n", __FUNCTION__);
 	} else
-		Dprintf("%s(): Rollback failed. Coudn't find attribute list "
+		Dprintf("%s(): Rollback failed. Couldn't find attribute list "
 			"record.\n", __FUNCTION__);
 	/* Setup back in-memory runlist. */
 	ni->attr_list = al;
@@ -944,7 +944,7 @@ int ntfs_inode_free_space(ntfs_inode *ni
 	int freed, err;
 
 	if (!ni || size < 0) {
-		Dprintf("%s(): Invalid argumets.\n", __FUNCTION__);
+		Dprintf("%s(): Invalid arguments.\n", __FUNCTION__);
 		errno = EINVAL;
 		return -1;
 	}
@@ -968,9 +968,9 @@ int ntfs_inode_free_space(ntfs_inode *ni
 	}
 
 	/*
-	 * Chkdsk complain if $STANDART_INFORMATION is not in the base MFT
+	 * Chkdsk complain if $STANDARD_INFORMATION is not in the base MFT
 	 * record. FIXME: I'm not sure in this, need to recheck. For now simply
-	 * do not move $STANDART_INFORMATION at all.
+	 * do not move $STANDARD_INFORMATION at all.
 	 *
 	 * Also we can't move $ATTRIBUTE_LIST from base MFT_RECORD, so position
 	 * search context on first attribute after $STANDARD_INFORMATION and
@@ -1033,7 +1033,7 @@ int ntfs_inode_free_space(ntfs_inode *ni
 		}
 
 		/*
-		 * Repostion to first attribute after $STANDARD_INFORMATION and
+		 * Reposition to first attribute after $STANDARD_INFORMATION and
 		 * $ATTRIBUTE_LIST (see comments upwards).
 		 */
 		ntfs_attr_reinit_search_ctx(ctx);

Index: logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- logfile.c	20 Jun 2005 14:31:58 -0000	1.4
+++ logfile.c	6 Jul 2005 22:47:18 -0000	1.5
@@ -222,7 +222,7 @@ static BOOL ntfs_check_restart_area(REST
 				"inconsistent log record header length.");
 		return FALSE;
 	}
-	/* Dito for the log page data offset. */
+	/* Ditto for the log page data offset. */
 	if (((le16_to_cpu(ra->log_page_data_offset) + 7) & ~7) !=
 			le16_to_cpu(ra->log_page_data_offset)) {
 		ntfs_error(vi->i_sb, "$LogFile restart area specifies "
@@ -378,7 +378,7 @@ err_out:
 }
 
 /**
- * ntfs_ckeck_logfile - check in the journal if the volume is consistent
+ * ntfs_check_logfile - check in the journal if the volume is consistent
  * @log_na:	ntfs attribute of loaded journal $LogFile to check
  *
  * Check the $LogFile journal for consistency and return TRUE if it is
@@ -442,7 +442,7 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n
 	 * page header is at the beginning of a page we only need to search at
 	 * what could be the beginning of a page (for each page size) rather
 	 * than scanning the whole file byte by byte.  If all potential places
-	 * contain empty and uninitialzed records, the log file can be assumed
+	 * contain empty and uninitialized records, the log file can be assumed
 	 * to be empty.
 	 */
 	for (pos = 0; pos < size; pos <<= 1) {
@@ -573,7 +573,7 @@ err_out:
  * of cases where we think that a volume is dirty when in fact it is clean.
  * This should only affect volumes that have not been shutdown cleanly but did
  * not have any pending, non-check-pointed i/o, i.e. they were completely idle
- * at least for the five seconds preceeding the unclean shutdown.
+ * at least for the five seconds preceding the unclean shutdown.
  *
  * This function assumes that the $LogFile journal has already been consistency
  * checked by a call to ntfs_check_logfile() and in particular if the $LogFile

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mft.c	19 Jun 2005 21:09:40 -0000	1.30
+++ mft.c	6 Jul 2005 22:47:18 -0000	1.31
@@ -400,7 +400,7 @@ static inline unsigned int ntfs_ffz(unsi
  *
  * Return the free mft record on success and -1 on error with errno set to the
  * error code.  An error code of ENOSPC means that there are no free mft
- * records in the currently initialized mft bitmal.
+ * records in the currently initialized mft bitmap.
  */
 static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *vol, ntfs_inode *base_ni)
 {
@@ -607,7 +607,7 @@ static int ntfs_mft_bitmap_extend_alloca
 			ntfs_error(vol->sb, "Failed to merge runlists for mft "
 					"bitmap.");
 			if (ntfs_cluster_free_from_rl(vol, rl2))
-				ntfs_error(vol->sb, "Failed to dealocate "
+				ntfs_error(vol->sb, "Failed to deallocate "
 						"cluster.%s", es);
 			free(rl2);
 			errno = ret;
@@ -665,7 +665,7 @@ static int ntfs_mft_bitmap_extend_alloca
 		// TODO: Deal with this by moving this extent to a new mft
 		// record or by starting a new extent in a new mft record.
 		ntfs_error(vol->sb, "Not enough space in this mft record to "
-				"accomodate extended mft bitmap attribute "
+				"accommodate extended mft bitmap attribute "
 				"extent.  Cannot handle this yet.");
 		errno = ENOTSUP;
 		goto undo_alloc;
@@ -931,7 +931,7 @@ static int ntfs_mft_data_extend_allocati
 		ntfs_error(vol->sb, "Failed to merge runlists for mft data "
 				"attribute.");
 		if (ntfs_cluster_free_from_rl(vol, rl2))
-			ntfs_error(vol->sb, "Failed to dealocate clusters "
+			ntfs_error(vol->sb, "Failed to deallocate clusters "
 					"from the mft data attribute.%s", es);
 		free(rl2);
 		errno = err;
@@ -987,7 +987,7 @@ static int ntfs_mft_data_extend_allocati
 		// this extent is not required to find the mft record in
 		// question.
 		ntfs_error(vol->sb, "Not enough space in this mft record to "
-				"accomodate extended mft data attribute "
+				"accommodate extended mft data attribute "
 				"extent.  Cannot handle this yet.");
 		errno = ENOTSUP;
 		goto undo_alloc;
@@ -1133,7 +1133,7 @@ undo_alloc:
  * extend the initialized size (and data size) by 8 bytes, allocating another
  * cluster if required.  The bitmap data size has to be at least equal to the
  * number of mft records in the mft, but it can be bigger, in which case the
- * superflous bits are padded with zeroes.
+ * superfluous bits are padded with zeroes.
  *
  * Thus, when we return successfully (return value non-zero), we will have:
  *	- initialized / extended the mft bitmap if necessary,
@@ -1144,7 +1144,7 @@ undo_alloc:
  *	- return the ntfs_inode.
  *
  * On error (return value zero), nothing will have changed.  If we had changed
- * anything before the error occured, we will have reverted back to the
+ * anything before the error occurred, we will have reverted back to the
  * starting state before returning to the caller.  Thus, except for bugs, we
  * should always leave the volume in a consistent state when returning from
  * this function.
@@ -1241,7 +1241,7 @@ ntfs_inode *ntfs_mft_record_alloc(ntfs_v
 	bit = mftbmp_na->initialized_size << 3;
 	if (ntfs_mft_bitmap_extend_initialized(vol))
 		goto err_out;
-	ntfs_debug("Status of mftbmp after initialized extention: "
+	ntfs_debug("Status of mftbmp after initialized extension: "
 			"allocated_size 0x%llx, data_size 0x%llx, "
 			"initialized_size 0x%llx.",
 			(long long)mftbmp_na->allocated_size,
@@ -1289,7 +1289,7 @@ found_free_rec:
 	old_data_size = mft_na->data_size;
 	/*
 	 * Extend mft data initialized size (and data size of course) to reach
-	 * the allocated mft record, formatting the mft records allong the way.
+	 * the allocated mft record, formatting the mft records along the way.
 	 * Note: We only modify the ntfs_attr structure as that is all that is
 	 * needed by ntfs_mft_record_format().  We will update the attribute
 	 * record itself in one fell swoop later on.

Index: mst.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mst.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mst.c	11 Jan 2005 20:28:28 -0000	1.11
+++ mst.c	6 Jul 2005 22:47:18 -0000	1.12
@@ -37,7 +37,7 @@
  * Return 0 on success and -1 on error, with errno set to the error code. The
  * following error codes are defined:
  *	EINVAL	Invalid arguments or invalid NTFS record in buffer @b.
- *	EIO	Mulit sector transfer error was detected. Magic of the NTFS
+ *	EIO	Multi sector transfer error was detected. Magic of the NTFS
  *		record in @b will have been set to "BAAD".
  */
 int ntfs_mst_post_read_fixup(NTFS_RECORD *b, const u32 size)
@@ -63,7 +63,7 @@ int ntfs_mst_post_read_fixup(NTFS_RECORD
 	 * u16 values before they are fixed up. Note no need to care for
 	 * endianness since we are comparing and moving data for on disk
 	 * structures which means the data is consistent. - If it is
-	 * consistenty the wrong endianness it doesn't make any difference.
+	 * consistency the wrong endianness it doesn't make any difference.
 	 */
 	usn = *usa_pos;
 	/*

Index: runlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- runlist.c	21 Jun 2005 09:55:15 -0000	1.51
+++ runlist.c	6 Jul 2005 22:47:18 -0000	1.52
@@ -1261,7 +1261,7 @@ int ntfs_get_size_for_mapping_pairs(cons
 		return -1;
 	}
 	prev_lcn = 0;
-	/* Always need the termining zero byte. */
+	/* Always need the terminating zero byte. */
 	rls = 1;
 	/* Do the first partial run if present. */
 	if (start_vcn > rl->vcn) {
@@ -1331,7 +1331,7 @@ err_out:
  * write.
  *
  * This is used when building the mapping pairs array of a runlist to compress
- * a given logical cluster number (lcn) or a specific run length to the minumum
+ * a given logical cluster number (lcn) or a specific run length to the minimum
  * size possible.
  *
  * Return the number of bytes written on success. On error, i.e. the

Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- unistr.c	20 Sep 2004 14:46:38 -0000	1.19
+++ unistr.c	6 Jul 2005 22:47:18 -0000	1.20
@@ -69,7 +69,7 @@ const u8 legal_ansi_char_array[0x40] = {
  *
  * Compare the names @s1 and @s2 and return TRUE (1) if the names are
  * identical, or FALSE (0) if they are not identical. If @ic is IGNORE_CASE,
- * the @upcase table is used to performa a case insensitive comparison.
+ * the @upcase table is used to perform a case insensitive comparison.
  */
 BOOL ntfs_names_are_equal(const ntfschar *s1, size_t s1_len,
 		const ntfschar *s2, size_t s2_len,

Index: unix_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unix_io.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- unix_io.c	9 Mar 2004 11:06:54 -0000	1.3
+++ unix_io.c	6 Jul 2005 22:47:18 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * unix_io.c - Unix stule disk io functions. Part of the Linux-NTFS project.
+ * unix_io.c - Unix style disk io functions. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2003 Anton Altaparmakov
  *
@@ -64,7 +64,7 @@ static int ntfs_device_unix_io_open(stru
 	/* Setup our read-only flag. */
 	if ((flags & O_RDWR) != O_RDWR)
 		NDevSetReadOnly(dev);
-	/* Acquire exlusive (mandatory) lock on the whole device. */
+	/* Acquire exclusive (mandatory) lock on the whole device. */
 	memset(&flk, 0, sizeof(flk));
 	if (NDevReadOnly(dev))
 		flk.l_type = F_RDLCK;
@@ -103,7 +103,7 @@ static int ntfs_device_unix_io_close(str
 	}
 	if (NDevDirty(dev))
 		fsync(DEV_FD(dev));
-	/* Release exlusive (mandatory) lock on the whole device. */
+	/* Release exclusive (mandatory) lock on the whole device. */
 	memset(&flk, 0, sizeof(flk));
 	flk.l_type = F_UNLCK;
 	flk.l_whence = SEEK_SET;

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- volume.c	19 Jun 2005 21:09:40 -0000	1.45
+++ volume.c	6 Jul 2005 22:47:18 -0000	1.46
@@ -199,7 +199,7 @@ static int ntfs_mft_load(ntfs_volume *vo
 		goto io_error_exit;
 	}
 	if (l != vol->mft_ni->attr_list_size) {
-		Dputs("Error: got unexepected amount of data when reading "
+		Dputs("Error: got unexpected amount of data when reading "
 				"$MFT/$ATTRIBUTE_LIST.");
 		goto io_error_exit;
 	}
@@ -1288,7 +1288,7 @@ static int ntfs_mntent_check(const char 
  * Finally, check if the file system is mounted read-only, and if so set the
  * NTFS_MF_READONLY flag in *@mnt_flags.
  *
- * On sucess return 0 with *@mnt_flags set to the ntfs mount flags.
+ * On success return 0 with *@mnt_flags set to the ntfs mount flags.
  *
  * On error return -1 with errno set to the error code.
  */

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs attrib.h,1.18,1.19 compat.h,1.3,1.4 index.h,1.3,1.4 layout.h,1.20,1.21 logfile.h,1.11,1.12

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

Changes by: flatcap

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

Modified Files:
	attrib.h compat.h index.h layout.h logfile.h 
Log Message:
got bored.  don't read the diffs.


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/attrib.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- attrib.h	2 Jul 2005 19:16:18 -0000	1.18
+++ attrib.h	6 Jul 2005 22:47:01 -0000	1.19
@@ -115,7 +115,7 @@ extern ATTR_DEF *ntfs_attr_find_in_attrd
  *		// with it and then just continue with the while loop.
  *	}
  *	if (err && errno != ENOENT)
- *		// Ooops. An error occured! You should handle this case.
+ *		// Ooops. An error occurred! You should handle this case.
  *	// Now finished with all attributes in the inode.
  */
 static __inline__ int ntfs_attrs_walk(ntfs_attr_search_ctx *ctx)
@@ -131,7 +131,7 @@ static __inline__ int ntfs_attrs_walk(nt
  * @type:		attribute type
  * @name:		Unicode name of the attribute
  * @name_len:		length of @name in Unicode characters
- * @state:		NTFS attribute specific flags descibing this attribute
+ * @state:		NTFS attribute specific flags describing this attribute
  * @allocated_size:	copy from the attribute record
  * @data_size:		copy from the attribute record
  * @initialized_size:	copy from the attribute record
@@ -154,16 +154,16 @@ static __inline__ int ntfs_attrs_walk(nt
  *
  * @rl is the decompressed runlist of the attribute described by this
  * structure. Obviously this only makes sense if the attribute is not resident,
- * i.e. NAttrNonResident() is true. If the runlist hasn't been decomressed yet
+ * i.e. NAttrNonResident() is true. If the runlist hasn't been decompressed yet
  * @rl is NULL, so be prepared to cope with @rl == NULL.
  *
  * @ni is the base ntfs inode of the attribute described by this structure.
  *
  * @type is the attribute type (see layout.h for the definition of ATTR_TYPES),
  * @name and @name_len are the little endian Unicode name and the name length
- * in Unicode characters of the attribute, respecitvely.
+ * in Unicode characters of the attribute, respectively.
  *
- * @state contains NTFS attribute specific flags descibing this attribute
+ * @state contains NTFS attribute specific flags describing this attribute
  * structure. See ntfs_attr_state_bits above.
  */
 struct _ntfs_attr {

Index: compat.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/compat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- compat.h	29 Feb 2004 14:09:45 -0000	1.3
+++ compat.h	6 Jul 2005 22:47:01 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * compat.h - Tweaks for Windows compatability.
+ * compat.h - Tweaks for Windows compatibility.
  *
  * Copyright (c) 2002 Richard Russon
  * Copyright (c) 2002-2004 Anton Altaparmakov

Index: index.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/index.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- index.h	19 Jun 2005 21:09:40 -0000	1.3
+++ index.h	6 Jul 2005 22:47:01 -0000	1.4
@@ -53,12 +53,12 @@
  *
  * If @is_in_root is TRUE, @entry is in the index root attribute @ir described
  * by the attribute search context @actx and inode @ni.  @ia, @ia_vcn and
- * @ia_dirty are undifined in this case.
+ * @ia_dirty are undefined in this case.
  *
  * If @is_in_root is FALSE, @entry is in the index allocation attribute and @ia
  * and @ia_vcn point to the index allocation block and VCN where it's placed,
  * respectively. @ir and @actx are NULL in this case. @ia_na is opened
- * INDEX_ALLOCTAION attribute. @ia_dirty is TRUE if index block was changed and
+ * INDEX_ALLOCATION attribute. @ia_dirty is TRUE if index block was changed and
  * FALSE otherwise.
  *
  * To obtain a context call ntfs_index_ctx_get().

Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- layout.h	19 Jun 2005 21:09:40 -0000	1.20
+++ layout.h	6 Jul 2005 22:47:01 -0000	1.21
@@ -171,7 +171,7 @@ typedef enum {
  * been written to disk. The values 0 and -1 (ie. 0xffff) are not used. All
  * last u16's of each sector have to be equal to the usn (during reading) or
  * are set to it (during writing). If they are not, an incomplete multi sector
- * transfer has occured when the data was written.
+ * transfer has occurred when the data was written.
  * The maximum size for the update sequence array is fixed to:
  *	maximum size = usa_ofs + (usa_count * 2) = 510 bytes
  * The 510 bytes comes from the fact that the last u16 in the array has to
@@ -279,7 +279,7 @@ typedef enum {
  * fragmented. Volume free space includes the empty part of the mft zone and
  * when the volume's free 88% are used up, the mft zone is shrunk by a factor
  * of 2, thus making more space available for more files/data. This process is
- * repeated everytime there is no more free space except for the mft zone until
+ * repeated every time there is no more free space except for the mft zone until
  * there really is no more free space.
  */
 
@@ -951,7 +951,7 @@ typedef struct {
  * itself. The list is sorted: first by attribute type, second by attribute
  * name (if present), third by instance number. The extents of one
  * non-resident attribute (if present) immediately follow after the initial
- * extent. They are ordered by lowest_vcn and have their instace set to zero.
+ * extent. They are ordered by lowest_vcn and have their instance set to zero.
  * It is not allowed to have two attributes with all sorting keys equal.
  * - Further restrictions:
  *	- If not resident, the vcn to lcn mapping array has to fit inside the
@@ -1522,7 +1522,7 @@ typedef enum {
 	 * Write access. For files, this maps onto:
 	 *	FILE_APPEND_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA |
 	 *	FILE_WRITE_EA | STANDARD_RIGHTS_WRITE | SYNCHRONIZE
-	 * For directories, the mapping has the same numberical value. See
+	 * For directories, the mapping has the same numerical value. See
 	 * above for the descriptions of the rights granted.
 	 */
 	GENERIC_WRITE			= const_cpu_to_le32(0x40000000),
@@ -1531,7 +1531,7 @@ typedef enum {
 	 * Read access. For files, this maps onto:
 	 *	FILE_READ_ATTRIBUTES | FILE_READ_DATA | FILE_READ_EA |
 	 *	STANDARD_RIGHTS_READ | SYNCHRONIZE
-	 * For directories, the mapping has the same numberical value. See
+	 * For directories, the mapping has the same numerical value. See
 	 * above for the descriptions of the rights granted.
 	 */
 	GENERIC_READ			= const_cpu_to_le32(0x80000000),
@@ -1633,14 +1633,14 @@ typedef enum {
  *	SID pointed to by the Owner field was provided by a
  *	defaulting mechanism rather than explicitly provided by the
  *	original provider of the security descriptor.  This may
- *	affect the treatment of the SID with respect to inheritence
+ *	affect the treatment of the SID with respect to inheritance
  *	of an owner.
  *
  * SE_GROUP_DEFAULTED - This boolean flag, when set, indicates that the
  *	SID in the Group field was provided by a defaulting mechanism
  *	rather than explicitly provided by the original provider of
  *	the security descriptor.  This may affect the treatment of
- *	the SID with respect to inheritence of a primary group.
+ *	the SID with respect to inheritance of a primary group.
  *
  * SE_DACL_PRESENT - This boolean flag, when set, indicates that the
  *	security descriptor contains a discretionary ACL.  If this
@@ -1651,7 +1651,7 @@ typedef enum {
  *	ACL pointed to by the Dacl field was provided by a defaulting
  *	mechanism rather than explicitly provided by the original
  *	provider of the security descriptor.  This may affect the
- *	treatment of the ACL with respect to inheritence of an ACL.
+ *	treatment of the ACL with respect to inheritance of an ACL.
  *	This flag is ignored if the DaclPresent flag is not set.
  *
  * SE_SACL_PRESENT - This boolean flag, when set,  indicates that the
@@ -1664,7 +1664,7 @@ typedef enum {
  *	ACL pointed to by the Sacl field was provided by a defaulting
  *	mechanism rather than explicitly provided by the original
  *	provider of the security descriptor.  This may affect the
- *	treatment of the ACL with respect to inheritence of an ACL.
+ *	treatment of the ACL with respect to inheritance of an ACL.
  *	This flag is ignored if the SaclPresent flag is not set.
  *
  * SE_SELF_RELATIVE - This boolean flag, when set, indicates that the
@@ -1791,7 +1791,7 @@ typedef SECURITY_DESCRIPTOR_RELATIVE SEC
  * matching hash is found, but the security descriptors do not match, the
  * search in the $SDH index is continued, searching for a next matching hash.
  *
- * When a precise match is found, the security_id coresponding to the security
+ * When a precise match is found, the security_id corresponding to the security
  * descriptor in the $SDS attribute is read from the found $SDH index entry and
  * is stored in the $STANDARD_INFORMATION attribute of the file/directory to
  * which the security descriptor is being applied. The $STANDARD_INFORMATION
@@ -1968,14 +1968,14 @@ typedef struct {
  *
  * When a directory is small enough to fit inside the index root then this
  * is the only attribute describing the directory. When the directory is too
- * large to fit in the index root, on the other hand, two aditional attributes
+ * large to fit in the index root, on the other hand, two additional attributes
  * are present: an index allocation attribute, containing sub-nodes of the B+
  * directory tree (see below), and a bitmap attribute, describing which virtual
  * cluster numbers (vcns) in the index allocation attribute are in use by an
  * index block.
  *
  * NOTE: The root directory (FILE_root) contains an entry for itself. Other
- * dircetories do not contain entries for themselves, though.
+ * directories do not contain entries for themselves, though.
  */
 typedef struct {
 	ATTR_TYPES type;		/* Type of the indexed attribute. Is
@@ -2244,7 +2244,7 @@ typedef struct {
  *
  * The reparse point tag is an unsigned 32-bit value divided in three parts:
  *
- * 1. The least significant 16 bits (i.e. bits 0 to 15) specifiy the type of
+ * 1. The least significant 16 bits (i.e. bits 0 to 15) specify the type of
  *    the reparse point.
  * 2. The 13 bits after this (i.e. bits 16 to 28) are reserved for future use.
  * 3. The most significant three bits are flags describing the reparse point.

Index: logfile.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/logfile.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- logfile.h	25 Jan 2005 21:41:25 -0000	1.11
+++ logfile.h	6 Jul 2005 22:47:03 -0000	1.12
@@ -124,7 +124,7 @@ typedef struct {
 				   when the restart area was last written.
 				   This happens often but what is the interval?
 				   Is it just fixed time or is it every time a
-				   check point is written or somethine else?
+				   check point is written or something else?
 				   On create set to 0. */
 /*  8*/	le16 log_clients;	/* Number of log client records in the array of
 				   log client records which follows this
@@ -217,7 +217,7 @@ typedef struct {
 /* 24*/	sle64 file_size;	/* Usable byte size of the log file.  If the
 				   restart_area_offset + the offset of the
 				   file_size are > 510 then corruption has
-				   occured.  This is the very first check when
+				   occurred.  This is the very first check when
 				   starting with the restart_area as if it
 				   fails it means that some of the above values
 				   will be corrupted by the multi sector

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.58,1.59 ntfscp.c,1.23,1.24 ntfsdump_logfile.c,1.27,1.28 ntfsinfo.c,1.65,1.66 ntfsls.c,1.22,1.23 ntfsmftalloc.c,1.4,1.5 ntfsmount.c,1.8,1.9 ntfsmove.c,1.12,1.13 ntfsresize.c,1.69,1.70 ntfsrm.c,1.35,1.36 ntfstruncate.c,1.25,1.26 ntfsundelete.c,1.40,1.41 ntfsundelete.h,1.11,1.12 ntfswipe.c,1.35,1.36 sd.c,1.6,1.7

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

Changes by: flatcap

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

Modified Files:
	mkntfs.c ntfscp.c ntfsdump_logfile.c ntfsinfo.c ntfsls.c 
	ntfsmftalloc.c ntfsmount.c ntfsmove.c ntfsresize.c ntfsrm.c 
	ntfstruncate.c ntfsundelete.c ntfsundelete.h ntfswipe.c sd.c 
Log Message:
got bored.  don't read the diffs.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- mkntfs.c	19 Jun 2005 21:09:41 -0000	1.58
+++ mkntfs.c	6 Jul 2005 22:47:18 -0000	1.59
@@ -113,7 +113,7 @@
 #include <limits.h>
 
 #if defined(linux) && defined(_IO) && !defined(BLKSSZGET)
-#	define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytse. */
+#	define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytes. */
 #endif
 
 #include "types.h"
@@ -211,7 +211,7 @@ struct {
 } opts;
 
 /**
- * mkDprintf - debugging output (-vv); overriden by quiet (-q)
+ * mkDprintf - debugging output (-vv); overridden by quiet (-q)
  */
 static void mkDprintf(const char *fmt, ...)
 		__attribute__((format(printf, 1, 2)));
@@ -3015,7 +3015,7 @@ static void mkntfs_initialize_rl_mft(voi
 	 * The mft mirror is either 4kb (the first four records) or one cluster
 	 * in size, which ever is bigger. In either case, it contains a
 	 * byte-for-byte identical copy of the beginning of the mft (i.e. either
-	 * ther first four records (4kb) or the first cluster worth of records,
+	 * the first four records (4kb) or the first cluster worth of records,
 	 * whichever is bigger).
 	 */
 	j = (4 * vol->mft_record_size + vol->cluster_size - 1) / vol->cluster_size;
@@ -3731,7 +3731,7 @@ int main(int argc, char **argv)
 	mkntfs_initialize_bitmaps();
 	/* Initialize MFT & set opts.logfile_lcn. */
 	mkntfs_initialize_rl_mft();
-	/* Initlialize $LogFile. */
+	/* Initialise $LogFile. */
 	mkntfs_initialize_rl_logfile();
 	/* Initialize $Boot. */
 	mkntfs_initialize_rl_boot();

Index: ntfscp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ntfscp.c	25 Jun 2005 16:37:50 -0000	1.23
+++ ntfscp.c	6 Jul 2005 22:47:19 -0000	1.24
@@ -163,7 +163,7 @@ static int parse_options (int argc, char
 
 			attr = strtol(optarg, &s, 0);
 			if (*s) {
-				Eprintf("Coudn't parse attribute.\n");
+				Eprintf("Couldn't parse attribute.\n");
 				err++;
 			} else
 				opts.attribute = (ATTR_TYPES)attr;

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ntfsdump_logfile.c	21 Jun 2005 09:57:22 -0000	1.27
+++ ntfsdump_logfile.c	6 Jul 2005 22:47:19 -0000	1.28
@@ -25,7 +25,7 @@
 /* TODO:
  *	- Remove the need for clipping at 64MiB.
  *	- Add normal command line switchs (use getopt_long()).
- *	- For a volume: allow dumping only uncommited records.
+ *	- For a volume: allow dumping only uncommitted records.
  *	- For a file:   get an optional command line parameter for the last SN.
  *	- Sanity checks.
  */

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- ntfsinfo.c	19 Jun 2005 21:09:41 -0000	1.65
+++ ntfsinfo.c	6 Jul 2005 22:47:19 -0000	1.66
@@ -204,7 +204,7 @@ static int parse_options (int argc, char
 			opts.notime++;
 			break;
 		case 'T':
-			/* 'T' is depreceted, notify */
+			/* 'T' is deprecated, notify */
 			Eprintf ("Option 'T' is deprecated, it was replaced by 't'.\n");
 			err++;
 			break;
@@ -287,7 +287,7 @@ static char *ntfsinfo_time_to_str(const 
 
 /**
  * ntfs_attr_get_name()
- * @attr:	a vaild attribute record
+ * @attr:	a valid attribute record
  *
  * return multi-byte string containing the attribute name if exist. the user
  *             is then responsible of freeing that memory.
@@ -569,7 +569,7 @@ static void ntfs_dump_attr_list(ATTR_REC
 			printf("\tList name:\t\t '%s'\n",stream_name);
 			free(stream_name);
 		} else {
-			/* an error occured, errno holds the reason - notify the user */
+			/* an error occurred, errno holds the reason - notify the user */
 			fprintf(stderr, "ntfsinfo error: could not parse stream name: %s\n",
 				strerror(errno));
 		}
@@ -617,7 +617,7 @@ static void ntfs_dump_attr_list(ATTR_REC
 	for(;(u8 *)entry < (u8 *) value + l; entry = (ATTR_LIST_ENTRY *)
 				((u8 *) entry + le16_to_cpu(entry->length))) {
 		printf("\n");
-		printf("\t\tAtrribute type:\t0x%x\n",
+		printf("\t\tAttribute type:\t0x%x\n",
 				(unsigned int)le32_to_cpu(entry->type));
 		printf("\t\tRecord length:\t%u\n",
 				le16_to_cpu(entry->length));
@@ -675,7 +675,7 @@ static void ntfs_dump_attr_file_name(ATT
 			printf("\tFile Name:\t\t '%s'\n", mbs_file_name);
 			free(mbs_file_name);
 		} else {
-			/* an error occured, errno holds the reason - notify the user */
+			/* an error occurred, errno holds the reason - notify the user */
 			fprintf(stderr, "ntfsinfo error: could not parse file name: %s\n",
 				strerror(errno));
 		}
@@ -854,7 +854,7 @@ static void ntfs_dump_attr_security_desc
 						data_size, sec_desc_attr);
 			if (bytes_read != data_size) {
 				Eprintf("ntfsinfo error: could not "
-						"read secutiry descriptor\n");
+						"read security descriptor\n");
 				free(sec_desc_attr);
 				return;
 			}
@@ -940,7 +940,7 @@ static void ntfs_dump_attr_volume_name(A
 			printf("\tVolume Name:\t\t '%s'\n",mbs_vol_name);
 			free(mbs_vol_name);
 		} else {
-			/* an error occured, errno holds the reason - notify the user */
+			/* an error occurred, errno holds the reason - notify the user */
 			fprintf(stderr,"ntfsinfo error: could not parse volume name: %s\n",
 				strerror(errno));
 		}
@@ -1011,7 +1011,7 @@ static void ntfs_dump_attr_data(ATTR_REC
 			printf("\tStream name:\t\t '%s'\n",stream_name);
 			free(stream_name);
 		} else {
-			/* an error occured, errno holds the reason - notify the user */
+			/* an error occurred, errno holds the reason - notify the user */
 			fprintf(stderr, "ntfsinfo error: could not parse stream name: %s\n",
 				strerror(errno));
 		}
@@ -1168,7 +1168,7 @@ static void ntfs_dump_attr_index_root(AT
 			printf("\tIndex name:\t\t '%s'\n",index_name);
 			free(index_name);
 		} else {
-			/* an error occured, errno holds the reason - notify the user */
+			/* an error occurred, errno holds the reason - notify the user */
 			fprintf(stderr, "ntfsinfo error: could not parse index name: %s\n",
 				strerror(errno));
 		}
@@ -1183,7 +1183,7 @@ static void ntfs_dump_attr_index_root(AT
 	type = le32_to_cpu(index_root->type);
 	if (type) {
 		if (index_root->type != AT_FILE_NAME) {
-			/* wierd, this should be illgeal */
+			/* weird, this should be illgeal */
 			printf("0x%0X\n", type);
 			fprintf(stderr, "ntfsinfo error: Unknown Indexed Attr Type: 0x%0X\n",
 				type);
@@ -1375,7 +1375,7 @@ static void ntfs_dump_attr_index_allocat
 			free(index_name);
 		} else {
 			/*
-			 * An error occured, errno holds the reason -
+			 * An error occurred, errno holds the reason -
 			 * notify the user
 			 */
 			fprintf(stderr, "ntfsinfo error: could not parse "
@@ -1395,7 +1395,7 @@ static void ntfs_dump_attr_index_allocat
 		printf("\tUsed data size:\t\t %llu\n",
 			(unsigned long long)le64_to_cpu(attr->data_size));
 	} else {
-		Eprintf("Invalid $INDEX_ALLOCTION attribute. Should be be"
+		Eprintf("Invalid $INDEX_ALLOCATION attribute. Should be be"
 						    " non-resident\n");
 	}
 
@@ -1420,7 +1420,7 @@ static void ntfs_dump_attr_bitmap(ATTR_R
 			printf("\tBitmap name:\t\t '%s'\n",bitmap_name);
 			free(bitmap_name);
 		} else {
-			/* an error occured, errno holds the reason - notify the user */
+			/* an error occurred, errno holds the reason - notify the user */
 			fprintf(stderr, "ntfsinfo error: could not parse bitmap name: %s\n",
 				strerror(errno));
 		}
@@ -1567,7 +1567,7 @@ static void ntfs_dump_attr_unknown(ATTR_
 			printf("\tAttribute name:\t '%s'\n",attr_name);
 			free(attr_name);
 		} else {
-			/* an error occured, errno holds the reason - notify the user */
+			/* an error occurred, errno holds the reason - notify the user */
 			fprintf(stderr, "ntfsinfo error: could not parse attribute name: %s\n",
 				strerror(errno));
 		}
@@ -1666,7 +1666,7 @@ static void ntfs_dump_file_attributes(nt
 	ntfs_attr_search_ctx *ctx = NULL;
 
 	/* then start enumerating attributes
-	   see ntfs_attr_lookup documentation for detailed explenation */
+	   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)) {
 		switch (ctx->attr->type) {

Index: ntfsls.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ntfsls.c	12 Jun 2005 18:12:56 -0000	1.22
+++ ntfsls.c	6 Jul 2005 22:47:19 -0000	1.23
@@ -447,7 +447,7 @@ static int readdir_recursive(ntfs_inode 
 	if (tofree)
 		free_dir(tofree);
 
-	/* if at the outter-most readdir_recursive, then clean up */
+	/* if at the outer-most readdir_recursive, then clean up */
 	if (ni_depth == 0) {
 		free_dirs(&dirs.list);
 	}
@@ -575,7 +575,7 @@ static int list_dir_entry(ntfsls_dirent 
 
 		result = 0;
 release:
-		/* Release atrtibute search context and close the inode. */
+		/* Release attribute search context and close the inode. */
 		if (ctx)
 			ntfs_attr_put_search_ctx(ctx);
 		if (ni)

Index: ntfsmftalloc.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmftalloc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ntfsmftalloc.c	22 Dec 2004 14:04:41 -0000	1.4
+++ ntfsmftalloc.c	6 Jul 2005 22:47:19 -0000	1.5
@@ -84,7 +84,7 @@ static struct {
 } opts;
 
 /**
- * mkDprintf - debugging output (-vv); overriden by quiet (-q)
+ * mkDprintf - debugging output (-vv); overridden by quiet (-q)
  */
 static void mkDprintf(const char *fmt, ...)
 		__attribute__((format(printf, 1, 2)));
@@ -152,7 +152,7 @@ static void copyright(void)
 }
 
 /**
- * license - print licese statement
+ * license - print license statement
  */
 static void license(void)
 {

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ntfsmount.c	5 Jul 2005 04:54:28 -0000	1.8
+++ ntfsmount.c	6 Jul 2005 22:47:19 -0000	1.9
@@ -204,8 +204,8 @@ static int ntfs_fuse_statfs(const char *
  * after use.
  *
  * Return values:
- *	<0	Error occured, return -errno;
- *	 0	No stream name, @*stream is not allocated and set to AT_UNMAMED.
+ *	<0	Error occurred, return -errno;
+ *	 0	No stream name, @*stream is not allocated and set to AT_UNNAMED.
  *	>0	Stream name length in unicode characters.
  */
 static int ntfs_fuse_parse_path(const char *org_path, char **path,

Index: ntfsmove.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ntfsmove.c	19 Jun 2005 21:09:41 -0000	1.12
+++ ntfsmove.c	6 Jul 2005 22:47:19 -0000	1.13
@@ -640,7 +640,7 @@ static s64 move_runlist (ntfs_volume *vo
 
 // got to get the runlist out of this function
 //      requires a mrec arg, not an ino (ino->mrec will do for now)
-// check size of new runlist before allocting / moving
+// check size of new runlist before allocating / moving
 // replace one datarun with another (by hand)
 static s64 move_datarun (ntfs_volume *vol, ntfs_inode *ino, ATTR_RECORD *rec,
 	runlist_element *run, u64 loc, int flags)

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- ntfsresize.c	3 Jul 2005 23:21:01 -0000	1.69
+++ ntfsresize.c	6 Jul 2005 22:47:19 -0000	1.70
@@ -1049,7 +1049,7 @@ close_inode:
 	return 0;
 }
 
-static void build_resize_constrains(ntfs_resize_t *resize)
+static void build_resize_constraints(ntfs_resize_t *resize)
 {
 	s64 i;
 	runlist *rl;
@@ -1073,7 +1073,7 @@ static void build_resize_constrains(ntfs
 	free(rl);
 }
 
-static void resize_constrains_by_attributes(ntfs_resize_t *resize)
+static void resize_constraints_by_attributes(ntfs_resize_t *resize)
 {
 	if (!(resize->ctx = attr_get_search_ctx(resize->ni, NULL)))
 		exit(1);
@@ -1081,18 +1081,18 @@ static void resize_constrains_by_attribu
 	while (!ntfs_attrs_walk(resize->ctx)) {
 		if (resize->ctx->attr->type == AT_END)
 			break;
-		build_resize_constrains(resize);
+		build_resize_constraints(resize);
 	}
 
 	ntfs_attr_put_search_ctx(resize->ctx);
 }
 
-static void set_resize_constrains(ntfs_resize_t *resize)
+static void set_resize_constraints(ntfs_resize_t *resize)
 {
 	s64 nr_mft_records, inode;
 	ntfs_inode *ni;
 
-	printf("Collecting shrinkage constrains ...\n");
+	printf("Collecting shrinkage constraints ...\n");
 
 	nr_mft_records = resize->vol->mft_na->initialized_size >>
 			resize->vol->mft_record_size_bits;
@@ -1110,7 +1110,7 @@ static void set_resize_constrains(ntfs_r
 			goto close_inode;
 
 		resize->ni = ni;
-		resize_constrains_by_attributes(resize);
+		resize_constraints_by_attributes(resize);
 close_inode:
 		if (inode_close(ni) != 0)
 			exit(1);
@@ -1518,7 +1518,7 @@ static void rl_insert_at_run(runlist **r
 
 	return;
 
-	/* FIXME: fastpath if ins_items = 1 */
+	/* FIXME: fast path if ins_items = 1 */
 //	(*rl + run)->lcn = ins->lcn;
 }
 
@@ -2293,7 +2293,7 @@ int main(int argc, char **argv)
 	if (new_size < vol->nr_clusters)
 		resize.shrink = 1;
 
-	set_resize_constrains(&resize);
+	set_resize_constraints(&resize);
 	set_disk_usage_constraint(&resize);
 	check_resize_constraints(&resize);
 

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ntfsrm.c	23 Jun 2005 18:55:03 -0000	1.35
+++ ntfsrm.c	6 Jul 2005 22:47:19 -0000	1.36
@@ -1887,7 +1887,7 @@ static int ntfs_inode_close2 (ntfs_inode
 	// unlink
 	//   ino->private_data
 
-	// XXX tempoarary until we have commit/rollback
+	// XXX temporary until we have commit/rollback
 	NInoClearDirty(ni);
 
 	return ntfs_inode_close (ni);
@@ -4524,7 +4524,7 @@ static int ntfs_file_remove (ntfs_volume
 	 * successor.
 	 */
 
-	// find the key nearest the root which has no descendents
+	// find the key nearest the root which has no descendants
 	printf ("\n");
 	printf (BOLD YELLOW "Find childless parent:\n" END);
 	for (par = del->parent, old = par; par; old = par, par = par->parent) {

Index: ntfstruncate.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ntfstruncate.c	19 Jun 2005 21:09:41 -0000	1.25
+++ ntfstruncate.c	6 Jul 2005 22:47:19 -0000	1.26
@@ -93,7 +93,7 @@ struct {
 } opts;
 
 /**
- * mkDprintf - debugging output (-vv); overriden by quiet (-q)
+ * mkDprintf - debugging output (-vv); overridden by quiet (-q)
  */
 static void mkDprintf(const char *fmt, ...)
 		__attribute__((format(printf, 1, 2)));
@@ -159,7 +159,7 @@ static void copyright(void)
 }
 
 /**
- * license - print licese statement
+ * license - print license statement
  */
 static void license(void)
 {

Index: ntfsundelete.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ntfsundelete.c	20 Jun 2005 14:31:59 -0000	1.40
+++ ntfsundelete.c	6 Jul 2005 22:47:20 -0000	1.41
@@ -716,7 +716,7 @@ static void free_file (struct ufile *fil
  *
  * Check that @rec is the parent of the file represented by @name.
  * If @rec is a directory, but it is created after @name, then we
- * can't determine wheter @rec is really @name's parent.
+ * can't determine whether @rec is really @name's parent.
  *
  * Return:	@rec's filename, either same name space as @name or lowest space.
  *		NULL if can't determine parenthood or on error.

Index: ntfsundelete.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntfsundelete.h	23 Aug 2004 22:54:51 -0000	1.11
+++ ntfsundelete.h	6 Jul 2005 22:47:20 -0000	1.12
@@ -91,7 +91,7 @@ struct data {
 	long long	 size_init;	/* Initialised size, may be less than data size */
 	long long	 size_vcn;	/* Highest VCN in the data runs */
 	runlist_element *runlist;	/* Decoded data runs */
-	int		 percent;	/* Amont potentially recoverable */
+	int		 percent;	/* Amount potentially recoverable */
 	void		*data;		/* If resident, a pointer to the data */
 	char		 padding[4];	/* Unused: padding to 64 bit. */
 };

Index: ntfswipe.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ntfswipe.c	19 Jun 2005 21:09:41 -0000	1.35
+++ ntfswipe.c	6 Jul 2005 22:47:20 -0000	1.36
@@ -352,7 +352,7 @@ static int parse_options (int argc, char
  *
  * Read $Bitmap and wipe any clusters that are marked as not in use.
  *
- * Return: >0  Success, the atrribute was wiped
+ * Return: >0  Success, the attribute was wiped
  *          0  Nothing to wipe
  *         -1  Error, something went wrong
  */
@@ -406,7 +406,7 @@ free:
  * @act:	Wipe, test or info
  * @na:		Opened ntfs attribute
  *
- * Return: >0  Success, the atrribute was wiped
+ * Return: >0  Success, the attribute was wiped
  *          0  Nothing to wipe
  *         -1  Error, something went wrong
  */
@@ -511,7 +511,7 @@ next:
  * @act:	Wipe, test or info
  * @na:		Opened ntfs attribute
  *
- * Return: >0  Success, the atrribute was wiped
+ * Return: >0  Success, the attribute was wiped
  *          0  Nothing to wipe
  *         -1  Error, something went wrong
  */
@@ -598,7 +598,7 @@ static s64 wipe_tails (ntfs_volume *vol,
 		}
 
 		if (!NAttrNonResident(na)) {
-			Vprintf ("Resident $DATA atrribute. Skipping.\n");
+			Vprintf ("Resident $DATA attribute. Skipping.\n");
 			goto close_attr;
 		}
 
@@ -773,7 +773,7 @@ free:
  * @byte:		Overwrite with this value
  * @act:		Wipe, test or info
  * @naa:		Opened ntfs $INDEX_ALLOCATION attribute
- * @nab:		Opened ntfs $BIMTAP attribute
+ * @nab:		Opened ntfs $BITMAP attribute
  * @indx_record_size:	Size of INDX record
  *
  * Return: >0  Success, the clusters were wiped
@@ -1049,7 +1049,7 @@ close_inode:
  * @act:   Wipe, test or info
  *
  * The logfile journals the metadata to give the volume fault-tolerance.  If the
- * volume is in a consistant state, then this information can be erased.
+ * volume is in a consistent state, then this information can be erased.
  *
  * Return: >0  Success, the clusters were wiped
  *          0  Nothing to wipe
@@ -1197,7 +1197,7 @@ static s64 wipe_pagefile (ntfs_volume *v
 		goto io_error_exit;
 	}
 
-	/* Get length of pagfile.sys contents. */
+	/* Get length of pagefile.sys contents. */
 	len = na->data_size;
 	if (!len) {
 		Dprintf("pagefile.sys has zero length, no disk write needed.\n");

Index: sd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/sd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sd.c	19 Jun 2005 21:09:42 -0000	1.6
+++ sd.c	6 Jul 2005 22:47:20 -0000	1.7
@@ -4,7 +4,7 @@
 /**
  * init_system_file_sd
  *
- * NTFS 1.2 - System files security decriptors
+ * NTFS 1.2 - System files security descriptors
  * ===========================================
  *
  * Create the security descriptor for system file number @sys_file_no and
@@ -15,14 +15,14 @@
  *
  * $Volume, $Quota, and system files 0xb-0xf are the same. They are almost the
  * same as the above, the only difference being that the two SIDs present in
- * the DACL grant GENERIC_WRITE and GENERIC_READ equivalent priviledges while
- * the above only grant GENERIC_READ equivalent priviledges. (For some reason
+ * the DACL grant GENERIC_WRITE and GENERIC_READ equivalent privileges while
+ * the above only grant GENERIC_READ equivalent privileges. (For some reason
  * the flags for GENERIC_READ/GENERIC_WRITE are not set by NT4, even though
  * the permissions are equivalent, so we comply.
  *
  * Root directory system file (".") is different altogether.
  *
- * The sd is recturned in *@sd_val and has length *@sd_val_len.
+ * The sd is returned in *@sd_val and has length *@sd_val_len.
  *
  * Do NOT free *@sd_val as it is static memory. This also means that you can
  * only use *@sd_val until the next call to this function.

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscluster.8.in,1.8,1.9

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfscluster.8.in 
Log Message:
Fix typos, patch from debian version of nftsprogs 1.9.4-2.


Index: ntfscluster.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.8.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ntfscluster.8.in	1 Jun 2004 20:07:35 -0000	1.8
+++ ntfscluster.8.in	5 Jul 2005 16:34:16 -0000	1.9
@@ -21,7 +21,7 @@ and
 .PP
 The default mode,
 .I info
-is currently not implemented.  It will display general infomation about the NTFS
+is currently not implemented.  It will display general information about the NTFS
 volume when it is working.
 .SS Sector
 .PP

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.165,1.166

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
Fix typos, patch from debian version of nftsprogs 1.9.4-2.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- attrib.c	2 Jul 2005 19:16:18 -0000	1.165
+++ attrib.c	5 Jul 2005 16:34:16 -0000	1.166
@@ -83,7 +83,7 @@ s64 ntfs_get_attribute_value(const ntfs_
 	}
 	/* Complex attribute? */
 	if (a->flags) {
-		Dputs("Enountered non-zero attribute flags.  Cannot handle "
+		Dputs("Encountered non-zero attribute flags.  Cannot handle "
 				"this yet.");
 		errno = ENOTSUP;
 		return 0;

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

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	types.h 
Log Message:
Fix typos, patch from debian version of nftsprogs 1.9.4-2.


Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/types.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- types.h	16 Jun 2005 23:16:32 -0000	1.9
+++ types.h	5 Jul 2005 16:34:15 -0000	1.10
@@ -70,7 +70,7 @@ typedef s64 LSN;
 typedef sle64 leLSN;
 
 /*
- * Cygwin has a collusion between our BOOL and <windef.h>'s
+ * Cygwin has a collision between our BOOL and <windef.h>'s
  * As long as this file will be included after <windows.h> were fine.
  */
 #ifndef _WINDEF_H

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

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	NEWS 
Log Message:
NEWS: update my name to be in format similar to names in other news.


Index: NEWS
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/NEWS,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- NEWS	5 Jul 2005 01:18:02 -0000	1.25
+++ NEWS	5 Jul 2005 05:04:31 -0000	1.26
@@ -5,11 +5,11 @@ Add new utility - ntfsmount. It's a FUSE
 you need FUSE to compile it, xattr is also highly recommended. This module
 support file overwrite changing it size and can read/write/add/remove
 named data streams via "file:stream" interface and list them via
-"ntfs.streams.list" extended attribute.  (Yura)
+"ntfs.streams.list" extended attribute.  (Yura Pakhuchiy)
 
 Attribute resize code for normal and sparse files is completed.  Thus, ntfscp
 should always successfully overwrite any normal or sparse file even if file
-size is changed.
+size is changed.  (Yura Pakhuchiy)
 
 Moved back from BitKeeper to CVS on SF.net.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.8.in,1.1,1.2 ntfsmount.c,1.7,1.8

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.8.in ntfsmount.c 
Log Message:
ntfsmount:
* Fix named data streams access interface.
* New option: succeed_chmod to avoid chmod errors.


Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ntfsmount.8.in	5 Jul 2005 01:19:20 -0000	1.1
+++ ntfsmount.8.in	5 Jul 2005 04:54:28 -0000	1.2
@@ -133,6 +133,10 @@ Mount filesystem read-only.
 By default ntfsmount acts as "default_permissions,kernel_cache,allow_other,fsname=ntfs#device" was passed to it, this option cancel this behaviour.
 
 .TP
+.B succeed_chmod
+Don't change any permissions and don't return error on chmod operation.
+
+.TP
 .B dev=
 Mount this device.
 
@@ -155,7 +159,13 @@ Read-only mount /dev/hda5 to /home/user/
 .B ntfsmount /home/user/tmp -o dev=/dev/hda5,ro,uid=0
 .sp
 .RE
-Cat "artist" named data of "some.mp3":
+Umount /mnt/ntfs-fuse:
+.RS
+.sp
+.B fusermount -u /mnt/ntfs-fuse
+.sp
+.RE
+Cat "artist" named data stream of "some.mp3":
 .RS
 .sp
 .B cat some.mp3:artist

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ntfsmount.c	5 Jul 2005 01:18:05 -0000	1.7
+++ ntfsmount.c	5 Jul 2005 04:54:28 -0000	1.8
@@ -60,6 +60,7 @@ typedef struct {
 	mode_t dmask;
 	BOOL ro;
 	BOOL show_sys_files;
+	BOOL succeed_chmod;
 } ntfs_fuse_context_t;
 
 typedef enum {
@@ -193,17 +194,59 @@ static int ntfs_fuse_statfs(const char *
 	return 0;
 }
 
-static int ntfs_fuse_getattr(const char *path, struct stat *stbuf)
+/**
+ * ntfs_fuse_parse_path - split path to path and stream name.
+ * @org_path:		path to split
+ * @path:		pointer to buffer in which parsed path saved
+ * @stream_name:	pointer to buffer where stream name in unicode saved
+ *
+ * This function allocates buffers for @*path and @*stream, user must free them
+ * after use.
+ *
+ * Return values:
+ *	<0	Error occured, return -errno;
+ *	 0	No stream name, @*stream is not allocated and set to AT_UNMAMED.
+ *	>0	Stream name length in unicode characters.
+ */
+static int ntfs_fuse_parse_path(const char *org_path, char **path,
+		ntfschar **stream_name)
+{
+	char *stream_name_mbs;
+	int res;
+
+	stream_name_mbs = strdup(org_path);
+	if (!stream_name_mbs)
+		return -errno;
+	*path = strsep(&stream_name_mbs, ":");
+	if (stream_name_mbs) {
+		*stream_name = NULL;
+		res = ntfs_mbstoucs(stream_name_mbs, stream_name, 0);
+		if (res < 0)
+			return -errno;
+		return res;
+	}
+	*stream_name = AT_UNNAMED;
+	return 0;
+}
+
+static int ntfs_fuse_getattr(const char *org_path, struct stat *stbuf)
 {
 	int res = 0;
 	ntfs_inode *ni;
 	ntfs_attr *na;
 	ntfs_volume *vol;
+	char *path = NULL;
+	ntfschar *stream_name;
+	int stream_name_len;
 
 	vol = ctx->vol;
+	stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
+	if (stream_name_len < 0)
+		return stream_name_len;
 	memset(stbuf, 0, sizeof(struct stat));
 	if ((ni = ntfs_pathname_to_inode(vol, NULL, path))) {
-		if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) {
+		if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY &&
+				!stream_name_len) {
 			stbuf->st_mode = S_IFDIR | (0777 & ~ctx->dmask);
 			na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, I30, 0);
 			if (na) {
@@ -217,7 +260,8 @@ static int ntfs_fuse_getattr(const char 
 			}
 		} else {
 			stbuf->st_mode = S_IFREG | (0777 & ~ctx->fmask);
-			na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
+			na = ntfs_attr_open(ni, AT_DATA, stream_name,
+					stream_name_len);
 			if (na) {
 				stbuf->st_size = na->data_size;
 				stbuf->st_blocks = na->allocated_size >>
@@ -226,6 +270,8 @@ static int ntfs_fuse_getattr(const char 
 			} else {
 				stbuf->st_size = 0;
 				stbuf->st_blocks = 0;
+				if (stream_name_len)
+					res = -ENOENT;
 			}
 		}
 		stbuf->st_uid = ctx->uid;
@@ -241,6 +287,9 @@ static int ntfs_fuse_getattr(const char 
 		ntfs_inode_close(ni);
 	} else
 		res = -ENOENT;
+	free(path);
+	if (stream_name_len)
+		free(stream_name);
 	return res;
 }
 
@@ -278,8 +327,6 @@ static int ntfs_fuse_readdir(const char 
 	s64 pos = 0;
 
 	vol = ctx->vol;
-	if (!vol)
-		return -ENODEV;
 	fill_ctx.filler = filler;
 	fill_ctx.buf = buf;
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
@@ -290,103 +337,296 @@ static int ntfs_fuse_readdir(const char 
 	return 0;
 }
 
-static int ntfs_fuse_open(const char *path,
+static int ntfs_fuse_open(const char *org_path,
 		struct fuse_file_info *fi __attribute__((unused)))
 {
 	ntfs_volume *vol;
 	ntfs_inode *ni;
-	
+	ntfs_attr *na;
+	int res = 0;
+	char *path = NULL;
+	ntfschar *stream_name;
+	int stream_name_len;
+
+	stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
+	if (stream_name_len < 0)
+		return stream_name_len;
 	vol = ctx->vol;
-	if (!vol)
-		return -ENODEV;
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
-	if (!ni)
-		return -errno;
-	ntfs_inode_close(ni);
-	return 0;
+	if (ni) {
+		if (stream_name_len) {
+			na = ntfs_attr_open(ni, AT_DATA, stream_name,
+					stream_name_len);
+			if (na)
+				ntfs_attr_close(na);
+			else
+				res = -errno;
+		}
+		ntfs_inode_close(ni);
+	} else
+		res = -errno;
+	free(path);
+	if (stream_name_len)
+		free(stream_name);
+	return res;
 }
 
-static int ntfs_fuse_read(const char *path, char *buf, size_t size,
+static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
 		off_t offset, struct fuse_file_info *fi __attribute__((unused)))
 {
 	ntfs_volume *vol;
-	ntfs_inode *ni;
+	ntfs_inode *ni = NULL;
 	ntfs_attr *na;
 	int res;
-	
+	char *path = NULL;
+	ntfschar *stream_name;
+	int stream_name_len;
+
+	stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
+	if (stream_name_len < 0)
+		return stream_name_len;
 	vol = ctx->vol;
-	if (!vol)
-		return -ENODEV;
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
-	if (!ni)
-		return -errno;
-	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
-	if (!na)
-		return -errno;
+	if (!ni) {
+		res = -errno;
+		goto exit;
+	}
+	na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
+	if (!na) {
+		res = -errno;
+		goto exit;
+	}
 	res = ntfs_attr_pread(na, offset, size, buf);
 	ntfs_attr_close(na);
-	if (ntfs_inode_close(ni))
+exit:
+	if (ni && ntfs_inode_close(ni))
 		perror("Failed to close inode");
+	free(path);
+	if (stream_name_len)
+		free(stream_name);
 	return res;
 }
 
-static int ntfs_fuse_write(const char *path, const char *buf, size_t size,
+static int ntfs_fuse_write(const char *org_path, const char *buf, size_t size,
 		off_t offset, struct fuse_file_info *fi __attribute__((unused)))
 {
 	ntfs_volume *vol;
-	ntfs_inode *ni;
+	ntfs_inode *ni = NULL;
 	ntfs_attr *na;
 	int res;
-	
+	char *path = NULL;
+	ntfschar *stream_name;
+	int stream_name_len;
+
+	stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
+	if (stream_name_len < 0)
+		return stream_name_len;
 	vol = ctx->vol;
-	if (!vol)
-		return -ENODEV;
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
-	if (!ni)
-		return -errno;
-	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
-	if (!na)
-		return -errno;
-	res = ntfs_attr_pwrite(na, offset, size,  buf);
+	if (!ni) {
+		res = -errno;
+		goto exit;
+	}
+	na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
+	if (!na) {
+		res = -errno;
+		goto exit;
+	}
+	res = ntfs_attr_pwrite(na, offset, size, buf);
+	ctx->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate);
 	ntfs_attr_close(na);
-	if (ntfs_inode_close(ni))
+exit:
+	if (ni && ntfs_inode_close(ni))
 		perror("Failed to close inode");
-	ctx->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate);
+	free(path);
+	if (stream_name_len)
+		free(stream_name);
 	return res;
 }
 
-static int ntfs_fuse_truncate(const char *path, off_t size)
+static int ntfs_fuse_truncate(const char *org_path, off_t size)
 {
 	ntfs_volume *vol;
-	ntfs_inode *ni;
+	ntfs_inode *ni = NULL;
 	ntfs_attr *na;
 	int res;
-	
+	char *path = NULL;
+	ntfschar *stream_name;
+	int stream_name_len;
+
+	stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
+	if (stream_name_len < 0)
+		return stream_name_len;
 	vol = ctx->vol;
-	if (!vol)
-		return -ENODEV;
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
-	if (!ni)
-		return -errno;
-	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
-	if (!na)
-		return -errno;
+	if (!ni) {
+		res = -errno;
+		goto exit;
+	}
+	na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
+	if (!na) {
+		res = -errno;
+		goto exit;
+	}
 	res = ntfs_attr_truncate(na, size);
+	ctx->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate);
 	ntfs_attr_close(na);
-	if (ntfs_inode_close(ni))
+exit:
+	if (ni && ntfs_inode_close(ni))
 		perror("Failed to close inode");
-	ctx->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate);
+	free(path);
+	if (stream_name_len)
+		free(stream_name);
 	return res;
 }
 
 static int ntfs_fuse_chmod(const char *path __attribute__((unused)),
 		mode_t mode __attribute__((unused)))
 {
-	return 0;
+	if (ctx->succeed_chmod)
+		return 0;
+	return -EOPNOTSUPP;
+}
+
+static int ntfs_fuse_mknod(const char *org_path, mode_t mode,
+		dev_t dev __attribute__((unused)))
+{
+	ntfs_inode *ni = NULL;
+	ntfs_attr *na;
+	char *path = NULL;
+	ntfschar *stream_name;
+	int stream_name_len;
+	int res = 0;
+
+	if (mode && !(mode & S_IFREG))
+		return -EOPNOTSUPP;
+	stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
+	if (stream_name_len < 0)
+		return stream_name_len;
+	if (!stream_name_len) {
+		res = -EOPNOTSUPP;
+		goto exit;
+	}
+	ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
+	if (!ni) {
+		res = -errno;
+		if (res == -ENOENT)
+			res = -EOPNOTSUPP;
+		goto exit;
+	}
+	na = ntfs_attr_add(ni, AT_DATA, stream_name, stream_name_len, 0);
+	if (na)
+		ntfs_attr_close(na);
+	else
+		res = -errno;
+exit:
+	if (ni && ntfs_inode_close(ni))
+		perror("Failed to close inode");
+	free(path);
+	if (stream_name_len)
+		free(stream_name);
+	return res;
+}
+
+static int ntfs_fuse_unlink(const char *org_path)
+{
+	ntfs_inode *ni = NULL;
+	ntfs_attr *na;
+	char *path = NULL;
+	ntfschar *stream_name;
+	int stream_name_len;
+	int res = 0;
+
+	stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
+	if (stream_name_len < 0)
+		return stream_name_len;
+	if (!stream_name_len) {
+		res = -EOPNOTSUPP;
+		goto exit;
+	}
+	ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
+	if (!ni) {
+		res = -errno;
+		if (res == -ENOENT)
+			res = -EOPNOTSUPP;
+		goto exit;
+	}
+	na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
+	if (!na) {
+		res = -errno;
+		goto exit;
+	}
+	if (ntfs_attr_rm(na)) {
+		res = -errno;
+		ntfs_attr_close(na);
+	}
+exit:
+	if (ni && ntfs_inode_close(ni))
+		perror("Failed to close inode");
+	free(path);
+	if (stream_name_len)
+		free(stream_name);
+	return res;
 }
 
 #ifdef HAVE_SETXATTR
 
+static int ntfs_fuse_getxattr(const char *path, const char *name,
+				char *value, size_t size)
+{
+	ntfs_attr_search_ctx *actx = NULL;
+	ntfs_volume *vol;
+	ntfs_inode *ni;
+	char *to = value;
+	int ret = 0;
+
+	if (strcmp(name, "ntfs.streams.list"))
+		return -EOPNOTSUPP;
+	vol = ctx->vol;
+	if (!vol)
+		return -ENODEV;
+	ni = ntfs_pathname_to_inode(vol, NULL, path);
+	if (!ni)
+		return -errno;
+	actx = ntfs_attr_get_search_ctx(ni, NULL);
+	if (!actx) {
+		ret = -errno;
+		ntfs_inode_close(ni);
+		goto exit;
+	}
+	while (!ntfs_attr_lookup(AT_DATA, NULL, 0, CASE_SENSITIVE,
+				0, NULL, 0, actx)) {
+		if (!actx->attr->name_length)
+			continue;
+		if (ret)
+			ret++;
+		ret += actx->attr->name_length;
+		if ((size_t)ret <= size) {
+			if (to != value) {
+				*to = ' ';
+				to++;
+			}
+			if (ntfs_ucstombs((ntfschar *)((u8*)actx->attr +
+					le16_to_cpu(actx->attr->name_offset)),
+					actx->attr->name_length, &to,
+					actx->attr->name_length + 1) < 0) {
+				ret = -errno;
+				goto exit;
+			}
+			to += actx->attr->name_length;
+		}
+	}
+	if (errno != ENOENT)
+		ret = -errno;
+exit:
+	if (actx)
+		ntfs_attr_put_search_ctx(actx);
+	ntfs_inode_close(ni);
+	return ret;
+}
+
+#if 0
+
 static const char nf_ns_streams[] = "user.stream.";
 static const int nf_ns_streams_len = 12;
 
@@ -583,7 +823,10 @@ exit:
 		perror("Failed to close inode");
 	return res;
 }
-#endif
+
+#endif /* 0 */
+
+#endif /* HAVE_SETXATTR */
 
 static struct fuse_operations ntfs_fuse_oper = {
 	.getattr	= ntfs_fuse_getattr,
@@ -594,12 +837,16 @@ static struct fuse_operations ntfs_fuse_
 	.truncate	= ntfs_fuse_truncate,
 	.statfs		= ntfs_fuse_statfs,
 	.chmod		= ntfs_fuse_chmod,
+	.mknod		= ntfs_fuse_mknod,
+	.unlink		= ntfs_fuse_unlink,
 #ifdef HAVE_SETXATTR
-	.listxattr	= ntfs_fuse_listxattr,
 	.getxattr	= ntfs_fuse_getxattr,
+#if 0	
 	.setxattr	= ntfs_fuse_setxattr,
 	.removexattr	= ntfs_fuse_removexattr,
-#endif	
+	.listxattr	= ntfs_fuse_listxattr,
+#endif /* 0 */
+#endif /* HAVE_SETXATTR */
 };
 
 static int ntfs_fuse_init(void)
@@ -741,6 +988,13 @@ static char *parse_options(char *options
 				goto err_exit;
 			}
 			ctx->show_sys_files = TRUE;
+		} else if (!strcmp(opt, "succeed_chmod")) {
+			if (val) {
+				Eprintf("succeed_chmod option should not "
+						"have value.\n");
+				goto err_exit;
+			}
+			ctx->succeed_chmod = TRUE;
 		} else { /* Probably FUSE option. */
 			strcat(ret, opt);
 			if (val) {
@@ -778,7 +1032,7 @@ static void usage(void)
 	Eprintf("Possible options are:\n\tdefault_permissions\n\tallow_other\n"
 		"\tkernel_cache\n\tlarge_read\n\tdirect_io\n\tmax_read\n\t"
 		"fsname\n\tro\n\tno_def_opts\n\tumask\n\tfmask\n\tdmask\n\t"
-		"uid\n\tgid\n\tshow_sys_files\n\tdev\n\n");
+		"uid\n\tgid\n\tshow_sys_files\n\tsucceed_chmod\n\tdev\n\n");
 	Eprintf("Default options are: \"%sfsname=ntfs#device\".\n", def_opts);
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.8.in,NONE,1.1

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Added Files:
	ntfsmount.8.in 
Log Message:
Submit ntfsmount manual page.
As usual forgot "cvs new" before commit. :-)


--- NEW FILE ---
.\" -*- nroff -*-
.\" Copyright (c) 2005 Yura Pakhuchiy. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\"
.TH NTFSMOUNT 8 "July 2005" "ntfsprogs version @VERSION@"
.SH NAME
ntfsmount \- NTFS module for FUSE.
.SH SYNOPSIS
.BI "ntfsmount " mount_point " \-o " device "[," other_options "]"
.SH DESCRIPTION
.B ntfsmount
is a
.B FUSE
module that rely on
.B libntfs.
You need
.B FUSE
to compile it,
.B xattr
is also highly recommended.
.sp
.TP
.B NTFS FUSE features:

* Full read/only access to normal, sparse and compressed files.

* Can overwrite and change size of normal and sparse files.

* Can list/read/write/add/remove named data streams.

.SH OPTIONS
Below is a summary of all the options that
.B ntfsmount
accepts.

.TP
.B uid=, gid=, umask=
Provide default owner, group, and access mode mask.
These options work as documented in mount(8).  By
default, the files/directories are owned by user that mounted volume and
he/she has read and write permissions, as well as
browse permission for directories.  No one else has any
access permissions.  I.e. the mode on all files is by
default rw------- and for directories rwx------, a
consequence of the default fmask=0177 and dmask=0077.
Using a umask of zero will grant all permissions to
everyone, i.e. all files and directories will have mode
rwxrwxrwx.

.TP
.B fmask=, dmask=
Instead of specifying umask which applies both to
files and directories, fmask applies only to files and
mask only to directories.

.TP
.B show_sys_files
If show_sys_files is specified, show the system files
in directory listings.  Otherwise the default behaviour
is to hide the system files.
Note that even when show_sys_files is specified, "$MFT"
may will not be visible due to bugs/mis-features in glibc.
Further, note that irrespective of show_sys_files, all
files are accessible by name, i.e. you can always do
"ls -l \$UpCase" for example to specifically show the
system file containing the Unicode upcase table.

.TP
.B default_permissions
By default FUSE doesn't check file access permissions, the
filesystem is free to implement it's access policy or leave it to
the underlying file access mechanism (e.g. in case of network
filesystems).  This option enables permission checking, restricting
access based on file mode.  This is option is usually useful
together with the 'allow_other' mount option.

.TP
.B allow_other
This option overrides the security measure restricting file access
to the user mounting the filesystem.  This option is by default only
allowed to root, but this restriction can be removed with a
configuration option described in the previous section.

.TP
.B kernel_cache
This option disables flushing the cache of the file contents on
every open().  This should only be enabled on filesystems, where the
file data is never changed externally (not through the mounted FUSE
filesystem).  Thus it is not suitable for network filesystems and
other "intermediate" filesystems.

NOTE: if this option is not specified (and neither 'direct_io') data
is still cached after the open(), so a read() system call will not
always initiate a read operation.

.TP
.B large_read
Issue large read requests.  This can improve performance for some
filesystems, but can also degrade performance.  This option is only
useful on 2.4.X kernels, as on 2.6 kernels requests size is
automatically determined for optimum performance.

.TP
.B direct_io
This option disables the use of page cache (file content cache) in
the kernel for this filesystem.  This has several affects:

- Each read() or write() system call will initiate one or more
read or write operations, data will not be cached in the
kernel.

- The return value of the read() and write() system calls will
correspond to the return values of the read and write
operations.  This is useful for example if the file size is not
known in advance (before reading it).

.TP
.B max_read=
With this option the maximum size of read operations can be set.
The default is infinite.  Note that the size of read requests is
limited anyway to 32 pages (which is 128kbyte on i386).

.TP
.B fsname=
Sets the filesystem name.  The default is the program name.

.TP
.B ro
Mount filesystem read-only.

.TP
.B no_def_opts
By default ntfsmount acts as "default_permissions,kernel_cache,allow_other,fsname=ntfs#device" was passed to it, this option cancel this behaviour.

.TP
.B dev=
Mount this device.

.SH DATA STREAMS
All data on NTFS is stored in streams, which can have names. A file can have more than one data streams, but exactly one must have no name. The size of a file is the size of its unnamed data stream. Usually when you don't specify stream name you are access to unnamed data stream. If you want access to named data stream you need to add ":stream_name" to the filename. For example: by opening "some.mp3:artist" you will open stream "artist" in "some.mp3". But windows usually prevent you from accessing to named data streams, so you need to use some program like FAR or utils from cygwin to access named data streams.
.sp
NTFS FUSE module don't prevent you from accessing to named data streams so you can use your preferred utils to access them. You can even delete them using
.B rm.
You can list all named data streams by getting "ntfs.streams.list" extended attribute. NOTE: The last feauture is unique for NTFS FUSE module and maybe will be never supported by kernel driver.
.SH EXAMPLES
Mount /dev/hda1 to /mnt/ntfs-fuse using NTFS FUSE module:
.RS
.sp
.B ntfsmount /mnt/ntfs-fuse -o dev=/dev/hda1
.sp
.RE
Read-only mount /dev/hda5 to /home/user/tmp and make root to be owner of all files:
.RS
.sp
.B ntfsmount /home/user/tmp -o dev=/dev/hda5,ro,uid=0
.sp
.RE
Cat "artist" named data of "some.mp3":
.RS
.sp
.B cat some.mp3:artist
.sp
.RE
Write "Sympho Black Metal" to "genre" named data stream of "some.mp3":
.RS
.sp
.B echo Sympho Black Metal > some.mp3:genre
.sp
.RE
Remove "album" named data stream from "some.mp3":
.RS
.sp
.B rm some.mp3:album
.sp
.RE
List all named data streams for "some.mp3":
.RS
.sp
.B getfattr -n ntfs.streams.list some.mp3
.SH BUGS
No bugs are known at present. If you find any bugs, please send an email to
.nh
<lin...@li...>.
.hy
.SH AUTHOR
.B ntfsmount
was written by Yura Pakhuchiy. This manual page use information from Documentation/filesystems/ntfs.txt from linux kernel source, and from README from FUSE.
.SH DEDICATION
With love to Marina Sapego.
.SH THANKS
Many thanks to Miklos Szeredi for advices and answers about FUSE.
.SH AVAILABILITY
.B ntfsmount
is part of the ntfsprogs package and is available from
.br
.nh
http://linux\-ntfs.sourceforge.net/downloads.html.
.hy
.SH SEE ALSO
.BR "ntfsprogs" (8), " attr" (5), " getfattr" (1)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs .cvsignore,1.2,1.3 Makefile.am,1.33,1.34 Makefile.in,1.72,1.73 ntfsmount.c,1.6,1.7 ntfsprogs.8.in,1.11,1.12

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	.cvsignore Makefile.am Makefile.in ntfsmount.c ntfsprogs.8.in 
Log Message:
* ntfsmount: change default fmask and dmask to 0177 and 0077 respectively.
* Update NEWS, ntfsprogs.8.in, .cvsignore
* Update build system to install nftsmount man page.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Jun 2005 13:20:40 -0000	1.2
+++ .cvsignore	5 Jul 2005 01:18:04 -0000	1.3
@@ -12,6 +12,7 @@ ntfsinfo
 ntfslabel
 ntfsls
 ntfsmftalloc
+ntfsmount
 ntfsmove
 ntfsresize
 ntfsrm

Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- Makefile.am	3 Jul 2005 00:18:41 -0000	1.33
+++ Makefile.am	5 Jul 2005 01:18:04 -0000	1.34
@@ -19,7 +19,8 @@ EXTRA_PROGRAMS		= ntfsdump_logfile ntfsw
 
 man_MANS		= mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \
 			  ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \
-			  ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8
+			  ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8 \
+			  ntfsmount.8
 EXTRA_MANS		=
 
 CLEANFILES		= $(EXTRA_PROGRAMS)

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.in,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- Makefile.in	3 Jul 2005 00:18:41 -0000	1.72
+++ Makefile.in	5 Jul 2005 01:18:04 -0000	1.73
@@ -54,8 +54,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
 	$(srcdir)/ntfsclone.8.in $(srcdir)/ntfscluster.8.in \
 	$(srcdir)/ntfscp.8.in $(srcdir)/ntfsfix.8.in \
 	$(srcdir)/ntfsinfo.8.in $(srcdir)/ntfslabel.8.in \
-	$(srcdir)/ntfsls.8.in $(srcdir)/ntfsprogs.8.in \
-	$(srcdir)/ntfsresize.8.in $(srcdir)/ntfsundelete.8.in
+	$(srcdir)/ntfsls.8.in $(srcdir)/ntfsmount.8.in \
+	$(srcdir)/ntfsprogs.8.in $(srcdir)/ntfsresize.8.in \
+	$(srcdir)/ntfsundelete.8.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -63,8 +64,8 @@ am__configure_deps = $(am__aclocal_m4_de
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = mkntfs.8 ntfscat.8 ntfsclone.8 ntfscluster.8 \
-	ntfscp.8 ntfsfix.8 ntfsinfo.8 ntfslabel.8 ntfsls.8 ntfsprogs.8 \
-	ntfsresize.8 ntfsundelete.8
+	ntfscp.8 ntfsfix.8 ntfsinfo.8 ntfslabel.8 ntfsls.8 ntfsmount.8 \
+	ntfsprogs.8 ntfsresize.8 ntfsundelete.8
 @ENABLE_FUSE_MODULE_TRUE@am__EXEEXT_1 = ntfsmount$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
 	"$(DESTDIR)$(man8dir)"
@@ -294,7 +295,8 @@ target_vendor = @target_vendor@
 LINK = $(STATIC_LINK) $(LIBTOOL_LINK)
 man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \
 			  ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \
-			  ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8
+			  ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8 \
+			  ntfsmount.8
 
 EXTRA_MANS = 
 CLEANFILES = $(EXTRA_PROGRAMS)
@@ -410,6 +412,8 @@ ntfslabel.8: $(top_builddir)/config.stat
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 ntfsls.8: $(top_builddir)/config.status $(srcdir)/ntfsls.8.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ntfsmount.8: $(top_builddir)/config.status $(srcdir)/ntfsmount.8.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 ntfsprogs.8: $(top_builddir)/config.status $(srcdir)/ntfsprogs.8.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 ntfsresize.8: $(top_builddir)/config.status $(srcdir)/ntfsresize.8.in

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ntfsmount.c	4 Jul 2005 16:34:14 -0000	1.6
+++ ntfsmount.c	5 Jul 2005 01:18:05 -0000	1.7
@@ -613,7 +613,8 @@ static int ntfs_fuse_init(void)
 		.state = NF_FreeClustersOutdate | NF_FreeMFTOutdate,
 		.uid = geteuid(),
 		.gid = getegid(),
-		.fmask = 0111,
+		.fmask = 0177,
+		.dmask = 0077,
 	};
 	return 0;
 }

Index: ntfsprogs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsprogs.8.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntfsprogs.8.in	26 Jun 2005 20:09:26 -0000	1.11
+++ ntfsprogs.8.in	5 Jul 2005 01:18:05 -0000	1.12
@@ -51,6 +51,10 @@ or directories within it.
 .PP
 .BR ntfsls (8)
 : List information about files in a directory residing on an NTFS partition.
+.SS ntfsmount
+.PP
+.BR ntfsmount (8)
+: NTFS module for FUSE.
 .SS ntfsresize
 .PP
 .BR ntfsresize (8)

[Linux-NTFS-cvs] CVS: ntfsprogs NEWS,1.24,1.25 configure,1.82,1.83 configure.ac,1.60,1.61

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	NEWS configure configure.ac 
Log Message:
* ntfsmount: change default fmask and dmask to 0177 and 0077 respectively.
* Update NEWS, ntfsprogs.8.in, .cvsignore
* Update build system to install nftsmount man page.


Index: NEWS
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/NEWS,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- NEWS	3 Jul 2005 00:18:38 -0000	1.24
+++ NEWS	5 Jul 2005 01:18:02 -0000	1.25
@@ -3,8 +3,9 @@ Current news
 
 Add new utility - ntfsmount. It's a FUSE module that rely on libntfs. So,
 you need FUSE to compile it, xattr is also highly recommended. This module
-support file overwrite changing it size and can list/read/write/add/remove
-named data streams via xattr interface.  (Yura)
+support file overwrite changing it size and can read/write/add/remove
+named data streams via "file:stream" interface and list them via
+"ntfs.streams.list" extended attribute.  (Yura)
 
 Attribute resize code for normal and sparse files is completed.  Thus, ntfscp
 should always successfully overwrite any normal or sparse file even if file

Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- configure	3 Jul 2005 00:18:38 -0000	1.82
+++ configure	5 Jul 2005 01:18:02 -0000	1.83
@@ -23542,7 +23542,7 @@ done
 
 
 # Makefiles to be created by configure.
-                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile include/ntfs/Makefile libntfs/Makefile libntfs/libntfs.conf libntfs/libntfs-gnomevfs.8 ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfscp.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec"
+                                                                                                                                                                                                                            ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile include/ntfs/Makefile libntfs/Makefile libntfs/libntfs.conf libntfs/libntfs-gnomevfs.8 ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfscp.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 ntfsprogs/ntfsmount.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -24138,6 +24138,7 @@ do
   "ntfsprogs/ntfsinfo.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsinfo.8" ;;
   "ntfsprogs/ntfslabel.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfslabel.8" ;;
   "ntfsprogs/ntfsls.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsls.8" ;;
+  "ntfsprogs/ntfsmount.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsmount.8" ;;
   "ntfsprogs/ntfsprogs.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsprogs.8" ;;
   "ntfsprogs/ntfsresize.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsresize.8" ;;
   "ntfsprogs/ntfsundelete.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsundelete.8" ;;

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- configure.ac	3 Jul 2005 00:18:39 -0000	1.60
+++ configure.ac	5 Jul 2005 01:18:04 -0000	1.61
@@ -265,6 +265,7 @@ AC_CONFIG_FILES([
 	ntfsprogs/ntfsinfo.8
 	ntfsprogs/ntfslabel.8
 	ntfsprogs/ntfsls.8
+	ntfsprogs/ntfsmount.8
 	ntfsprogs/ntfsprogs.8
 	ntfsprogs/ntfsresize.8
 	ntfsprogs/ntfsundelete.8

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.5,1.6

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

Changes by: flatcap

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

Modified Files:
	ntfsmount.c 
Log Message:
fix a few sign warnings


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ntfsmount.c	3 Jul 2005 15:26:19 -0000	1.5
+++ ntfsmount.c	4 Jul 2005 16:34:14 -0000	1.6
@@ -451,7 +451,7 @@ static int ntfs_fuse_getxattr(const char
 	ntfschar *lename = NULL;
 
 	if (strncmp(name, nf_ns_streams, nf_ns_streams_len) ||
-			strlen(name) == nf_ns_streams_len)
+			strlen(name) == (size_t)nf_ns_streams_len)
 		return -ENODATA;
 	vol = ctx->vol;
 	if (!vol)
@@ -498,7 +498,7 @@ static int ntfs_fuse_setxattr(const char
 	ntfschar *lename = NULL;
 
 	if (strncmp(name, nf_ns_streams, nf_ns_streams_len) ||
-			strlen(name) == nf_ns_streams_len)
+			strlen(name) == (size_t)nf_ns_streams_len)
 		return -EACCES;
 	vol = ctx->vol;
 	if (!vol)
@@ -552,7 +552,7 @@ static int ntfs_fuse_removexattr(const c
 	ntfschar *lename = NULL;
 
 	if (strncmp(name, nf_ns_streams, nf_ns_streams_len) ||
-			strlen(name) == nf_ns_streams_len)
+			strlen(name) == (size_t)nf_ns_streams_len)
 		return -ENODATA;
 	vol = ctx->vol;
 	if (!vol)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.68,1.69

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
ntfsresize: support bad clusters list ($BadClus:$Bad)


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- ntfsresize.c	30 Jun 2005 21:13:34 -0000	1.68
+++ ntfsresize.c	3 Jul 2005 23:21:01 -0000	1.69
@@ -54,9 +54,9 @@
 static const char *EXEC_NAME = "ntfsresize";
 
 static const char *resize_warning_msg =
-"WARNING: Every sanity check passed and only the DANGEROUS operations left.\n"
-"Please make sure all your important data had been backed up in case of an\n"
-"unexpected failure!\n";
+"WARNING: Every sanity check passed and only the dangerous operations left.\n"
+"Make sure that important data has been backed up! Power outage or computer\n"
+"crash may result major data loss!\n";
 
 static const char *resize_important_msg =
 "You can go on to shrink the device e.g. with 'fdisk'.\n"
@@ -83,6 +83,16 @@ static const char *hibernated_volume_msg
 "Apparently the NTFS partition is hibernated. Windows must be resumed and\n"
 "turned off properly, thus resizing will be possible later on.\n";
 
+static const char *bad_sectors_warning_msg =
+"****************************************************************************\n"
+"* WARNING: The disk has bad sector. This means physical damage on the disk *\n"
+"* surface caused by deterioration, manufacturing faults or other reason.   *\n"
+"* The reliability of the disk may stay stable or degrade fast. We suggest  *\n"
+"* making a full backup urgently by running 'ntfsclone --rescue ...' then   *\n"
+"* run 'chkdsk /f /r volume:' on Windows then you should be able to resize  *\n"
+"* safely by additionally using the --bad-sectors option to ntfsresize.     *\n"
+"****************************************************************************\n";
+
 struct {
 	int verbose;
 	int debug;
@@ -90,9 +100,9 @@ struct {
 	int force;
 	int info;
 	int show_progress;
+	int badsectors;
 	s64 bytes;
 	char *volume;
-	u8 padding[4];		/* Unused: padding to 64 bit. */
 } opt;
 
 struct bitmap {
@@ -144,6 +154,7 @@ typedef struct {
 	s64 mftmir_old;		     /* $MFTMirr AT_DATA's old LCN */
 	int dirty_inode;	     /* some inode data got relocated */
 	int shrink;		     /* shrink = 1, enlarge = 0 */
+	s64 badclusters;	     /* num of physically dead clusters */
 	struct progress_bar progress;
 	struct bitmap lcn_bitmap;
 	/* Temporary statistics until all case is supported */
@@ -279,7 +290,8 @@ static void usage(void)
 		"    -s, --size SIZE        Resize volume to SIZE[k|M|G] bytes\n"
 		"\n"
 		"    -n, --no-action        Do not write to disk\n"
-		"    -f, --force            Force to progress (DANGEROUS)\n"
+		"    -b, --bad-sectors      Support disks having bad sectors\n"
+		"    -f, --force            Force to progress\n"
 		"    -P, --no-progress-bar  Don't show progress bar\n"
 		"    -v, --verbose          More output\n"
 		"    -V, --version          Display version information\n"
@@ -399,8 +411,9 @@ static s64 get_new_volume_size(char *s)
  */
 static int parse_options(int argc, char **argv)
 {
-	static const char *sopt = "-dfhinPs:vV";
+	static const char *sopt = "-bdfhinPs:vV";
 	static const struct option lopt[] = {
+		{ "bad-sectors",no_argument,		NULL, 'b' },
 #ifdef DEBUG
 		{ "debug",	no_argument,		NULL, 'd' },
 #endif
@@ -431,6 +444,9 @@ static int parse_options(int argc, char 
 			else
 				err++;
 			break;
+		case 'b':
+			opt.badsectors++;
+			break;
 		case 'd':
 			opt.debug++;
 			break;
@@ -592,8 +608,10 @@ static s64 nr_clusters_to_bitmap_byte_si
 
 static int str2unicode(const char *aname, ntfschar **ustr, int *len)
 {
-	if (aname && ((*len = ntfs_mbstoucs(aname, ustr, 0)) == -1))
+	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;
@@ -603,14 +621,19 @@ static int str2unicode(const char *aname
 	return 0;
 }
 
-static int has_bad_sectors(ntfs_resize_t *resize)
+static int has_bad_sectors(ntfs_resize_t *resize, int is_inode)
 {
 	int len, ret = 0;
 	ntfschar *ustr = NULL;
 	ATTR_RECORD *a = resize->ctx->attr;
 
-	if (resize->ni->mft_no != FILE_BadClus)
-		return 0;
+	if (is_inode) {
+		if (resize->ni->mft_no != FILE_BadClus)
+			return 0;
+	} else {
+		if (resize->mref != FILE_BadClus)
+			return 0;
+	}
 
 	if (str2unicode("$Bad", &ustr, &len) == -1)
 		return -1;
@@ -638,11 +661,17 @@ static void collect_resize_constraints(n
 	inode = resize->ni->mft_no;
 	flags = resize->ctx->attr->flags;
 
-	if ((ret = has_bad_sectors(resize)) != 0) {
+	if ((ret = has_bad_sectors(resize, 1)) != 0) {
 		if (ret == -1)
-			perr_exit("Couldn't convert string to Unicode");
-		err_exit("Your disk has bad sectors (manufacturing faults or "
-			 "dying disk).\nThis situation isn't supported yet.\n");
+			exit(1);
+		if (NInoAttrList(resize->ni))
+			err_exit("Hopelessly many bad sectors! Not supported.");
+		if (resize->badclusters == 0)
+			printf("WARNING: The disk has bad sector! "
+			       "This can cause reliability problems!\n");
+		resize->badclusters += last_lcn - rl->lcn + 1;
+		Vprintf("Bad clusters: %8lld - %lld\n", rl->lcn, last_lcn);
+		return;
 	}
 
 	if (NInoAttrList(resize->ni)) {
@@ -1576,12 +1605,21 @@ static void relocate_attribute(ntfs_resi
 
 static void relocate_attributes(ntfs_resize_t *resize)
 {
+	int ret;
+
 	if (!(resize->ctx = attr_get_search_ctx(NULL, resize->mrec)))
 		exit(1);
 
 	while (!ntfs_attrs_walk(resize->ctx)) {
 		if (resize->ctx->attr->type == AT_END)
 			break;
+		
+		ret = has_bad_sectors(resize, 0);
+		if (ret == -1)
+			exit(1);
+		else if (ret == 1)
+			return;
+
 		relocate_attribute(resize);
 	}
 
@@ -1679,6 +1717,36 @@ static void advise_on_resize(ntfs_resize
 	print_advise(vol, resize->last_unsupp);
 }
 
+
+static void rl_expand(runlist **rl, const VCN last_vcn)
+{
+	int len;
+	runlist *p = *rl;
+
+	len = rl_items(p);
+	if (len <= 1)
+		err_exit("ntfs_rl_expand: bad runlist length: %d\n", len);
+
+	if (p[len - 2].lcn == LCN_HOLE) {
+
+		p[len - 2].length += last_vcn - p[len - 1].vcn;
+		p[len - 1].vcn = last_vcn;
+
+	} else if (p[len - 2].lcn >= 0) {
+
+		p = realloc(*rl, ++len * sizeof(runlist_element));
+		if (!p)
+			perr_exit("ntfs_rl_expand: realloc");
+
+		p[len - 2].lcn = LCN_HOLE;
+		p[len - 2].length = last_vcn - p[len - 2].vcn;
+		rl_set(p + len - 1, last_vcn, LCN_ENOENT, 0LL);
+		*rl = p;
+
+	} else 
+		err_exit("ntfs_rl_expand: bad LCN: %lld\n", p[len - 2].lcn);
+}
+
 /**
  * bitmap_file_data_fixup
  *
@@ -1701,25 +1769,29 @@ static void bitmap_file_data_fixup(s64 c
  */
 static void truncate_badclust_bad_attr(ntfs_resize_t *resize)
 {
+	ATTR_RECORD *a;
 	runlist *rl_bad;
-	ATTR_RECORD *a = resize->ctx->attr;
 	s64 nr_clusters = resize->new_volume_size;
 	ntfs_volume *vol = resize->vol;
 
+	a = resize->ctx->attr;
 	if (!a->non_resident)
 		/* FIXME: handle resident attribute value */
 		err_exit("Resident attribute in $BadClust isn't supported!\n");
 
-	if (!(rl_bad = (runlist *)malloc(2 * sizeof(runlist_element))))
-		perr_exit("Couldn't get memory");
+	if (!(rl_bad = ntfs_mapping_pairs_decompress(vol, a, NULL)))
+		perr_exit("ntfs_mapping_pairs_decompress");
+	
+	if (resize->shrink) {
+		if (ntfs_rl_truncate(&rl_bad, nr_clusters) == -1)
+			perr_exit("ntfs_rl_truncate");
+	} else
+		rl_expand(&rl_bad, nr_clusters);
 
 	a->highest_vcn = cpu_to_le64(nr_clusters - 1LL);
 	a->allocated_size = cpu_to_le64(nr_clusters * vol->cluster_size);
 	a->data_size = cpu_to_le64(nr_clusters * vol->cluster_size);
 
-	rl_set(rl_bad, 0LL, (LCN)LCN_HOLE, nr_clusters);
-	rl_set(rl_bad + 1, nr_clusters, -1LL, 0LL);
-
 	replace_attribute_runlist(vol, resize->ctx, rl_bad);
 
 	free(rl_bad);
@@ -1831,7 +1903,7 @@ static void lookup_data_attr(ntfs_volume
 		exit(1);
 
 	if (str2unicode(aname, &ustr, &len) == -1)
-		perr_exit("Unable to convert string to Unicode");
+		exit(1);
 
 	if (ntfs_attr_lookup(AT_DATA, ustr, len, 0, 0, NULL, 0, *ctx))
 		perr_exit("ntfs_lookup_attr");
@@ -2088,10 +2160,21 @@ static void set_disk_usage_constraint(nt
 		resize->last_unsupp = last;
 }
 
-static void check_shrink_constraints(ntfs_resize_t *resize)
+static void check_resize_constraints(ntfs_resize_t *resize)
 {
 	s64 new_size = resize->new_volume_size;
 
+	if (resize->badclusters) {
+		printf("%sThe NTFS volume has at least %lld bad sector%s.\n",
+		       !opt.badsectors ? NERR_PREFIX : "",
+		       resize->badclusters, 
+		       resize->badclusters  - 1 ? "s" : "");
+		if (!opt.badsectors) {
+			printf(bad_sectors_warning_msg);
+			exit(1);
+		}
+	}
+		
 	/* FIXME: resize.shrink true also if only -i is used */
 	if (!resize->shrink)
 		return;
@@ -2212,7 +2295,7 @@ int main(int argc, char **argv)
 
 	set_resize_constrains(&resize);
 	set_disk_usage_constraint(&resize);
-	check_shrink_constraints(&resize);
+	check_resize_constraints(&resize);
 
 	if (opt.info) {
 	       	advise_on_resize(&resize);

[Linux-NTFS-cvs] CVS: ntfsprogs TODO.ntfsprogs,1.15,1.16 ChangeLog,1.233,1.234

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

Changes by: szaka

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

Modified Files:
	TODO.ntfsprogs ChangeLog 
Log Message:
ntfsresize: support bad clusters list ($BadClus:$Bad)


Index: TODO.ntfsprogs
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/TODO.ntfsprogs,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- TODO.ntfsprogs	12 Jun 2005 14:35:57 -0000	1.15
+++ TODO.ntfsprogs	3 Jul 2005 23:21:01 -0000	1.16
@@ -75,12 +75,12 @@ High priority
     bad sectors, etc) 
 
 Medium priority 
-  - support disks having bad sectors
   - cope with the rare, unsupported cases, see man ntfsresize 'KNOWN ISSUES'
   - save $Bitmap if it was modified and an error occures (e.g. bad sector).
   - handle signals (^C, etc)
 
 Low priority
+  - fully support disks with bad sectors (attrlist attr, unknown bad sectors)
   - move volume start
 
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- ChangeLog	3 Jul 2005 00:18:37 -0000	1.233
+++ ChangeLog	3 Jul 2005 23:21:01 -0000	1.234
@@ -8,6 +8,8 @@ xx/xx/xxxx - 1.10.1-WIP
 	- Fix memory managament error in ntfs_inode_close.  (Yura)
 	- Add new utility - ntfsmount. It's a FUSE module that
 	  rely on libntfs.  (Yura)
+	- ntfsresize: support bad clusters list ($BadClus:$Bad), a.k.a. disks
+	  having bad sectors if the new --bad-sectors option is used.  (Szaka)
 
 20/06/2005 - 1.10.0 - Lots of new features, enhancements, and bug fixes.
 

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.4,1.5

[Yura P. <pak...@ip...>]

On Sun, 2005-07-03 at 08:26 -0700, Yura Pakhuchiy wrote:
> Changes by: cha0smaster
> 
> Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12385/ntfsprogs
> 
> Modified Files:
> 	ntfsmount.c 
> Log Message:
> ../commit

Oh, here is should be "`cat ../commit`" replaced by:
* Fix options handling: print error when option requires argument but
it's not submitted and vice-versa.
* Replace "show_system_files" with "show_sys_files".
* Replace "user." namespace with "user.stream.", use constants instead
of hardcoded values.

-- 
Best regards,
        Yura

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.4,1.5

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
../commit

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ntfsmount.c	3 Jul 2005 13:07:15 -0000	1.4
+++ ntfsmount.c	3 Jul 2005 15:26:19 -0000	1.5
@@ -59,7 +59,7 @@ typedef struct {
 	mode_t fmask;
 	mode_t dmask;
 	BOOL ro;
-	BOOL show_system_files;
+	BOOL show_sys_files;
 } ntfs_fuse_context_t;
 
 typedef enum {
@@ -262,7 +262,7 @@ static int ntfs_fuse_filler(ntfs_fuse_fi
 		free(filename);
 		return err;
 	}
-	if (MREF(mref) >= FILE_first_user || ctx->show_system_files)
+	if (MREF(mref) >= FILE_first_user || ctx->show_sys_files)
 		fill_ctx->filler(fill_ctx->buf, filename, NULL, 0);
 	free(filename);
 	return err;
@@ -386,6 +386,13 @@ static int ntfs_fuse_chmod(const char *p
 }
 
 #ifdef HAVE_SETXATTR
+
+static const char nf_ns_streams[] = "user.stream.";
+static const int nf_ns_streams_len = 12;
+
+static const char nf_ns_eas[] = "user.ea.";
+static const int nf_ns_eas_len = 8;
+
 static int ntfs_fuse_listxattr(const char *path, char *list, size_t size)
 {
 	ntfs_attr_search_ctx *actx = NULL;
@@ -410,11 +417,10 @@ static int ntfs_fuse_listxattr(const cha
 				0, NULL, 0, actx)) {
 		if (!actx->attr->name_length)
 			continue;
-		ret += actx->attr->name_length + 6; /* 5 bytes for 'user.',
-						      1 byte for terminator. */
+		ret += actx->attr->name_length + nf_ns_streams_len + 1;
 		if (size && (size_t)ret <= size) {
-			strcpy(to, "user.");
-			to += 5;
+			strcpy(to, nf_ns_streams);
+			to += nf_ns_streams_len;
 			if (ntfs_ucstombs((ntfschar *)((u8*)actx->attr +
 					le16_to_cpu(actx->attr->name_offset)),
 					actx->attr->name_length, &to,
@@ -444,7 +450,8 @@ static int ntfs_fuse_getxattr(const char
 	int res;
 	ntfschar *lename = NULL;
 
-	if (strncmp(name, "user.", 5))
+	if (strncmp(name, nf_ns_streams, nf_ns_streams_len) ||
+			strlen(name) == nf_ns_streams_len)
 		return -ENODATA;
 	vol = ctx->vol;
 	if (!vol)
@@ -452,11 +459,12 @@ static int ntfs_fuse_getxattr(const char
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
 	if (!ni)
 		return -errno;
-	if (ntfs_mbstoucs(name + 5, &lename, 0) == -1) {
+	if (ntfs_mbstoucs(name + nf_ns_streams_len, &lename, 0) == -1) {
 		res = -errno;
 		goto exit;
 	}
-	na = ntfs_attr_open(ni, AT_DATA, lename, strlen(name) - 5);
+	na = ntfs_attr_open(ni, AT_DATA, lename,
+			strlen(name) - nf_ns_streams_len);
 	if (!na) {
 		res = -ENODATA;
 		goto exit;
@@ -489,7 +497,8 @@ static int ntfs_fuse_setxattr(const char
 	int res;
 	ntfschar *lename = NULL;
 
-	if (strncmp(name, "user.", 5))
+	if (strncmp(name, nf_ns_streams, nf_ns_streams_len) ||
+			strlen(name) == nf_ns_streams_len)
 		return -EACCES;
 	vol = ctx->vol;
 	if (!vol)
@@ -497,11 +506,12 @@ static int ntfs_fuse_setxattr(const char
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
 	if (!ni)
 		return -errno;
-	if (ntfs_mbstoucs(name + 5, &lename, 0) == -1) {
+	if (ntfs_mbstoucs(name + nf_ns_streams_len, &lename, 0) == -1) {
 		res = -errno;
 		goto exit;
 	}
-	na = ntfs_attr_open(ni, AT_DATA, lename, strlen(name) - 5);
+	na = ntfs_attr_open(ni, AT_DATA, lename,
+			strlen(name) - nf_ns_streams_len);
 	if (na && flags == XATTR_CREATE) {
 		res = -EEXIST;
 		goto exit;
@@ -511,7 +521,8 @@ static int ntfs_fuse_setxattr(const char
 			res = -ENODATA;
 			goto exit;
 		}
-		na = ntfs_attr_add(ni, AT_DATA, lename, strlen(name) - 5, 0);
+		na = ntfs_attr_add(ni, AT_DATA, lename, strlen(name) -
+				nf_ns_streams_len, 0);
 		if (!na) {
 			res = -errno;
 			goto exit;
@@ -540,7 +551,8 @@ static int ntfs_fuse_removexattr(const c
 	int res = 0;
 	ntfschar *lename = NULL;
 
-	if (strncmp(name, "user.", 5) || strlen(name) == 5)
+	if (strncmp(name, nf_ns_streams, nf_ns_streams_len) ||
+			strlen(name) == nf_ns_streams_len)
 		return -ENODATA;
 	vol = ctx->vol;
 	if (!vol)
@@ -548,11 +560,12 @@ static int ntfs_fuse_removexattr(const c
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
 	if (!ni)
 		return -errno;
-	if (ntfs_mbstoucs(name + 5, &lename, 0) == -1) {
+	if (ntfs_mbstoucs(name + nf_ns_streams_len, &lename, 0) == -1) {
 		res = -errno;
 		goto exit;
 	}
-	na = ntfs_attr_open(ni, AT_DATA, lename, strlen(name) - 5);
+	na = ntfs_attr_open(ni, AT_DATA, lename,
+			strlen(name) - nf_ns_streams_len);
 	if (!na) {
 		res = -ENODATA;
 		goto exit;
@@ -667,6 +680,10 @@ static char *parse_options(char *options
 			*device = malloc(strlen(val) + 1);
 			strcpy(*device, val);
 		} else if (!strcmp(opt, "ro")) { /* Read-only mount. */
+			if (val) {
+				Eprintf("ro option should not have value.\n");
+				goto err_exit;
+			}
 			ctx->ro =TRUE;
 			strcat(ret, "ro,");
 		} else if (!strcmp(opt, "fsname")) { /* Filesystem name. */
@@ -679,20 +696,50 @@ static char *parse_options(char *options
 			strcat(ret, val);
 			strcat(ret, ",");
 		} else if (!strcmp(opt, "no_def_opts")) {
+			if (val) {
+				Eprintf("no_def_opts option should not have "
+						"value.\n");
+				goto err_exit;
+			}
 			no_def_opts = TRUE; /* Don't add default options. */
 		} else if (!strcmp(opt, "umask")) {
+			if (!val) {
+				Eprintf("umask option should have value.\n");
+				goto err_exit;
+			}
 			sscanf(val, "%i", &ctx->fmask);
 			ctx->dmask = ctx->fmask;
 		} else if (!strcmp(opt, "fmask")) {
+			if (!val) {
+				Eprintf("fmask option should have value.\n");
+				goto err_exit;
+			}
 			sscanf(val, "%i", &ctx->fmask);
 		} else if (!strcmp(opt, "dmask")) {
+			if (!val) {
+				Eprintf("dmask option should have value.\n");
+				goto err_exit;
+			}
 			sscanf(val, "%i", &ctx->dmask);
 		} else if (!strcmp(opt, "uid")) {
+			if (!val) {
+				Eprintf("uid option should have value.\n");
+				goto err_exit;
+			}
 			sscanf(val, "%i", &ctx->uid);
 		} else if (!strcmp(opt, "gid")) {
+			if (!val) {
+				Eprintf("gid option should have value.\n");
+				goto err_exit;
+			}
 			sscanf(val, "%i", &ctx->gid);
-		} else if (!strcmp(opt, "show_system_files")) {
-			ctx->show_system_files = TRUE;
+		} else if (!strcmp(opt, "show_sys_files")) {
+			if (val) {
+				Eprintf("show_sys_files option should not "
+						"have value.\n");
+				goto err_exit;
+			}
+			ctx->show_sys_files = TRUE;
 		} else { /* Probably FUSE option. */
 			strcat(ret, opt);
 			if (val) {
@@ -730,7 +777,7 @@ static void usage(void)
 	Eprintf("Possible options are:\n\tdefault_permissions\n\tallow_other\n"
 		"\tkernel_cache\n\tlarge_read\n\tdirect_io\n\tmax_read\n\t"
 		"fsname\n\tro\n\tno_def_opts\n\tumask\n\tfmask\n\tdmask\n\t"
-		"uid\n\tgid\n\tshow_system_files\n\tdev\n\n");
+		"uid\n\tgid\n\tshow_sys_files\n\tdev\n\n");
 	Eprintf("Default options are: \"%sfsname=ntfs#device\".\n", def_opts);
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.3,1.4

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
Use gete{u,g}id instead of get{u,g}id.  (Thanks to Anton for suggestion.)


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ntfsmount.c	3 Jul 2005 12:14:57 -0000	1.3
+++ ntfsmount.c	3 Jul 2005 13:07:15 -0000	1.4
@@ -598,8 +598,8 @@ static int ntfs_fuse_init(void)
 	}
 	*ctx = (ntfs_fuse_context_t) {
 		.state = NF_FreeClustersOutdate | NF_FreeMFTOutdate,
-		.uid = getuid(),
-		.gid = getgid(),
+		.uid = geteuid(),
+		.gid = getegid(),
 		.fmask = 0111,
 	};
 	return 0;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.2,1.3

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
- Change default fsname to "ntfs#device". (Suggested by Miklos Szeredi)
- Fix error handling when no dev option given.


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ntfsmount.c	3 Jul 2005 01:49:17 -0000	1.2
+++ ntfsmount.c	3 Jul 2005 12:14:57 -0000	1.3
@@ -640,11 +640,12 @@ static char *parse_options(char *options
 	
 	*device = NULL;
 	/*
-	 * +10 for different in length of "fsname=... (ntfs)" and "dev=...".
+	 * +8 for different in length of "fsname=ntfs#..." and "dev=...".
+	 * +1 for comma
 	 * +1 for null-terminator.
-	 * Total: +11
+	 * Total: +10
 	 */
-	ret = malloc(strlen(def_opts) + strlen(options) + 11);
+	ret = malloc(strlen(def_opts) + strlen(options) + 10);
 	if (!ret) {
 		perror("malloc failed");
 		return NULL;
@@ -701,12 +702,13 @@ static char *parse_options(char *options
 			strcat(ret, ",");
 		}
 	}
+	if (!*device)
+		goto err_exit;
 	if (!no_def_opts) {
 		strcat(ret, def_opts);
 		if (!no_fsname) {
-			strcat(ret, "fsname=");
+			strcat(ret, "fsname=ntfs#");
 			strcat(ret, *device);
-			strcat(ret, " (ntfs)");
 		}
 	}
 exit:
@@ -729,7 +731,7 @@ static void usage(void)
 		"\tkernel_cache\n\tlarge_read\n\tdirect_io\n\tmax_read\n\t"
 		"fsname\n\tro\n\tno_def_opts\n\tumask\n\tfmask\n\tdmask\n\t"
 		"uid\n\tgid\n\tshow_system_files\n\tdev\n\n");
-	Eprintf("Default options are: \"%sfsname=device (ntfs)\".\n", def_opts);
+	Eprintf("Default options are: \"%sfsname=ntfs#device\".\n", def_opts);
 }
 
 int main(int argc, char *argv[])
@@ -760,15 +762,15 @@ int main(int argc, char *argv[])
 	ntfs_fuse_init();
 	/* Parse options. */
 	parsed_options = parse_options(options, &device);
-	if (!parsed_options) {
-		ntfs_fuse_destroy();
-		return 6;
-	}
 	if (!device) {
 		Eprintf("dev option is mandatory.\n");
 		ntfs_fuse_destroy();
 		return 5;
 	}
+	if (!parsed_options) {
+		ntfs_fuse_destroy();
+		return 6;
+	}
 
 	/* Create filesystem. */
 	ffd = fuse_mount(mnt_point, parsed_options);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.1,1.2

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
ntfsmount: it's not a error when file didn't contain unnamed data attribute. E.g. $Secure.


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ntfsmount.c	3 Jul 2005 00:35:48 -0000	1.1
+++ ntfsmount.c	3 Jul 2005 01:49:17 -0000	1.2
@@ -211,6 +211,9 @@ static int ntfs_fuse_getattr(const char 
 				stbuf->st_blocks = na->allocated_size >>
 					vol->sector_size_bits;
 				ntfs_attr_close(na);
+			} else {
+				stbuf->st_size = 0;
+				stbuf->st_blocks = 0;
 			}
 		} else {
 			stbuf->st_mode = S_IFREG | (0777 & ~ctx->fmask);
@@ -220,8 +223,10 @@ static int ntfs_fuse_getattr(const char 
 				stbuf->st_blocks = na->allocated_size >>
 					vol->sector_size_bits;
 				ntfs_attr_close(na);
-			} else 
-				res = -errno;
+			} else {
+				stbuf->st_size = 0;
+				stbuf->st_blocks = 0;
+			}
 		}
 		stbuf->st_uid = ctx->uid;
 		stbuf->st_gid = ctx->gid;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,NONE,1.1

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Added Files:
	ntfsmount.c 
Log Message:
Forgot to commit ntfsmount itself. :-)


--- NEW FILE ---
/**
 * ntfsfuse - Part of the Linux-NTFS project.
 *
 * Copyright (c) 2005 Yura Pakhuchiy
 *
 * NTFS module for FUSE.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program (in the main directory of the Linux-NTFS
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include "config.h"

#include <fuse.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <locale.h>
#include <signal.h>

#ifdef HAVE_SETXATTR
#include <sys/xattr.h>
#endif

#include "attrib.h"
#include "inode.h"
#include "volume.h"
#include "dir.h"
#include "unistr.h"
#include "layout.h"

typedef struct {
	fuse_fill_dir_t filler;
	void *buf;
} ntfs_fuse_fill_context_t;

typedef struct {
	ntfs_volume *vol;
	int state;
	long free_clusters;
	long free_mft;
	uid_t uid;
	gid_t gid;
	mode_t fmask;
	mode_t dmask;
	BOOL ro;
	BOOL show_system_files;
} ntfs_fuse_context_t;

typedef enum {
	NF_FreeClustersOutdate	= (1 << 0),  /* Information about amount of
						free clusters is outdated. */
	NF_FreeMFTOutdate	= (1 << 1),  /* Information about amount of
						free MFT records is outdated. */
} ntfs_fuse_state_bits;

static const char *EXEC_NAME = "ntfsmount";
static char def_opts[] = "default_permissions,kernel_cache,allow_other,";
static ntfs_fuse_context_t *ctx;

#define Eprintf(arg...) fprintf(stderr, ##arg)

static long ntfs_fuse_get_nr_free_mft_records(ntfs_volume *vol)
{
	u8 *buf;
	long nr_free = 0;
	s64 br, total = 0;
	
	if (!(ctx->state & NF_FreeMFTOutdate))
		return ctx->free_mft;
	buf = malloc(NTFS_BUF_SIZE);
	if (!buf)
		return -ENOMEM;
	while (1) {
		int i, j;

		br = ntfs_attr_pread(vol->mftbmp_na, total,
				NTFS_BLOCK_SIZE, buf);
		if (!br)
			break;
		total += br;
		for (i = 0; i < NTFS_BLOCK_SIZE; i++)
			for (j = 0; j < 8; j++)
				if (!((buf[i] >> j) & 1))
					nr_free++;
	}
	free(buf);
	if (!total)
		return -errno;
	ctx->free_mft = nr_free;
	ctx->state &= ~(NF_FreeMFTOutdate);
	return nr_free;
}

static long ntfs_fuse_get_nr_free_clusters(ntfs_volume *vol)
{
	u8 *buf;
	long nr_free = 0;
	s64 br, total = 0;

	if (!(ctx->state & NF_FreeClustersOutdate))
		return ctx->free_clusters;
	buf = malloc(NTFS_BUF_SIZE);
	if (!buf)
		return -ENOMEM;
	while (1) {
		int i, j;

		br = ntfs_attr_pread(vol->lcnbmp_na, total,
				NTFS_BLOCK_SIZE, buf);
		if (!br)
			break;
		total += br;
		for (i = 0; i < NTFS_BLOCK_SIZE; i++)
			for (j = 0; j < 8; j++)
				if (!((buf[i] >> j) & 1))
					nr_free++;
	}
	free(buf);
	if (!total)
		return -errno;
	ctx->free_clusters = nr_free;
	ctx->state &= ~(NF_FreeClustersOutdate);
	return nr_free;
}

/**
 * ntfs_fuse_statfs - return information about mounted NTFS volume
 * @path:	ignored (but fuse requires it)
 * @sfs:	statfs structure in which to return the information
 *
 * Return information about the mounted NTFS volume @sb in the statfs structure
 * pointed to by @sfs (this is initialized with zeros before ntfs_statfs is
 * called). We interpret the values to be correct of the moment in time at
 * which we are called. Most values are variable otherwise and this isn't just
 * the free values but the totals as well. For example we can increase the
 * total number of file nodes if we run out and we can keep doing this until
 * there is no more space on the volume left at all.
 *
 * This code based on ntfs_statfs from ntfs kernel driver.
 *
 * Return 0 on success or -errno on error.
 */
static int ntfs_fuse_statfs(const char *path __attribute__((unused)),
		struct statfs *sfs)
{
	long size;
	ntfs_volume *vol;

	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	/* Type of filesystem. */
	sfs->f_type = NTFS_SB_MAGIC;
	/* Optimal transfer block size. */
	sfs->f_bsize = NTFS_BLOCK_SIZE;
	/*
	 * Total data blocks in file system in units of f_bsize and since
	 * inodes are also stored in data blocs ($MFT is a file) this is just
	 * the total clusters.
	 */
	sfs->f_blocks = vol->nr_clusters;
	/* Free data blocks in file system in units of f_bsize. */
	size = ntfs_fuse_get_nr_free_clusters(vol);
	if (size < 0)
		size = 0;
	/* Free blocks avail to non-superuser, same as above on NTFS. */
	sfs->f_bavail = sfs->f_bfree = size;
	/* Number of inodes in file system (at this point in time). */
	sfs->f_files = vol->mft_na->data_size >> vol->mft_record_size_bits;
	/* Free inodes in fs (based on current total count). */
	size = ntfs_fuse_get_nr_free_mft_records(vol);
	if (size < 0)
		size = 0;
	sfs->f_ffree = size;
	/* Maximum length of filenames. */
	sfs->f_namelen = NTFS_MAX_NAME_LEN;
	return 0;
}

static int ntfs_fuse_getattr(const char *path, struct stat *stbuf)
{
	int res = 0;
	ntfs_inode *ni;
	ntfs_attr *na;
	ntfs_volume *vol;

	vol = ctx->vol;
	memset(stbuf, 0, sizeof(struct stat));
	if ((ni = ntfs_pathname_to_inode(vol, NULL, path))) {
		if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) {
			stbuf->st_mode = S_IFDIR | (0777 & ~ctx->dmask);
			na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, I30, 0);
			if (na) {
				stbuf->st_size = na->data_size;
				stbuf->st_blocks = na->allocated_size >>
					vol->sector_size_bits;
				ntfs_attr_close(na);
			}
		} else {
			stbuf->st_mode = S_IFREG | (0777 & ~ctx->fmask);
			na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
			if (na) {
				stbuf->st_size = na->data_size;
				stbuf->st_blocks = na->allocated_size >>
					vol->sector_size_bits;
				ntfs_attr_close(na);
			} else 
				res = -errno;
		}
		stbuf->st_uid = ctx->uid;
		stbuf->st_gid = ctx->gid;
		stbuf->st_ino = ni->mft_no;
		stbuf->st_nlink = le16_to_cpu(ni->mrec->link_count);
		/*
		 * TODO: Need support in libntfs for this.
		 * stbuf->st_atime = 
		 * stbuf->st_ctime = 
		 * stbuf->st_mtime = 
		 */
		ntfs_inode_close(ni);
	} else
		res = -ENOENT;
	return res;
}

static int ntfs_fuse_filler(ntfs_fuse_fill_context_t *fill_ctx,
		const ntfschar *name, const int name_len, const int name_type,
		const s64 pos __attribute__((unused)), const MFT_REF mref,
		const unsigned dt_type __attribute__((unused)))
{
	char *filename;
	int err = 0;

	if (name_type == FILE_NAME_DOS)
		return 0;
	filename = malloc(name_len + 1);
	if (!filename)
		return -errno;
	if (ntfs_ucstombs(name, name_len, &filename, name_len + 1) < 0) {
		err = -errno;
		free(filename);
		return err;
	}
	if (MREF(mref) >= FILE_first_user || ctx->show_system_files)
		fill_ctx->filler(fill_ctx->buf, filename, NULL, 0);
	free(filename);
	return err;
}

static int ntfs_fuse_readdir(const char *path, void *buf,
		fuse_fill_dir_t filler, off_t offset __attribute__((unused)),
		struct fuse_file_info *fi __attribute__((unused)))
{
	ntfs_fuse_fill_context_t fill_ctx;
	ntfs_volume *vol;
	ntfs_inode *ni;
	s64 pos = 0;

	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	fill_ctx.filler = filler;
	fill_ctx.buf = buf;
	ni = ntfs_pathname_to_inode(vol, NULL, path);
	if (!ni)
		return -errno;
	ntfs_readdir(ni, &pos, &fill_ctx, (ntfs_filldir_t)ntfs_fuse_filler);
	ntfs_inode_close(ni);
	return 0;
}

static int ntfs_fuse_open(const char *path,
		struct fuse_file_info *fi __attribute__((unused)))
{
	ntfs_volume *vol;
	ntfs_inode *ni;
	
	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	ni = ntfs_pathname_to_inode(vol, NULL, path);
	if (!ni)
		return -errno;
	ntfs_inode_close(ni);
	return 0;
}

static int ntfs_fuse_read(const char *path, char *buf, size_t size,
		off_t offset, struct fuse_file_info *fi __attribute__((unused)))
{
	ntfs_volume *vol;
	ntfs_inode *ni;
	ntfs_attr *na;
	int res;
	
	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	ni = ntfs_pathname_to_inode(vol, NULL, path);
	if (!ni)
		return -errno;
	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
	if (!na)
		return -errno;
	res = ntfs_attr_pread(na, offset, size, buf);
	ntfs_attr_close(na);
	if (ntfs_inode_close(ni))
		perror("Failed to close inode");
	return res;
}

static int ntfs_fuse_write(const char *path, const char *buf, size_t size,
		off_t offset, struct fuse_file_info *fi __attribute__((unused)))
{
	ntfs_volume *vol;
	ntfs_inode *ni;
	ntfs_attr *na;
	int res;
	
	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	ni = ntfs_pathname_to_inode(vol, NULL, path);
	if (!ni)
		return -errno;
	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
	if (!na)
		return -errno;
	res = ntfs_attr_pwrite(na, offset, size,  buf);
	ntfs_attr_close(na);
	if (ntfs_inode_close(ni))
		perror("Failed to close inode");
	ctx->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate);
	return res;
}

static int ntfs_fuse_truncate(const char *path, off_t size)
{
	ntfs_volume *vol;
	ntfs_inode *ni;
	ntfs_attr *na;
	int res;
	
	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	ni = ntfs_pathname_to_inode(vol, NULL, path);
	if (!ni)
		return -errno;
	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
	if (!na)
		return -errno;
	res = ntfs_attr_truncate(na, size);
	ntfs_attr_close(na);
	if (ntfs_inode_close(ni))
		perror("Failed to close inode");
	ctx->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate);
	return res;
}

static int ntfs_fuse_chmod(const char *path __attribute__((unused)),
		mode_t mode __attribute__((unused)))
{
	return 0;
}

#ifdef HAVE_SETXATTR
static int ntfs_fuse_listxattr(const char *path, char *list, size_t size)
{
	ntfs_attr_search_ctx *actx = NULL;
	ntfs_volume *vol;
	ntfs_inode *ni;
	char *to = list;
	int ret = 0;

	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	ni = ntfs_pathname_to_inode(vol, NULL, path);
	if (!ni)
		return -errno;
	actx = ntfs_attr_get_search_ctx(ni, NULL);
	if (!actx) {
		ret = -errno;
		ntfs_inode_close(ni);
		goto exit;
	}
	while (!ntfs_attr_lookup(AT_DATA, NULL, 0, CASE_SENSITIVE,
				0, NULL, 0, actx)) {
		if (!actx->attr->name_length)
			continue;
		ret += actx->attr->name_length + 6; /* 5 bytes for 'user.',
						      1 byte for terminator. */
		if (size && (size_t)ret <= size) {
			strcpy(to, "user.");
			to += 5;
			if (ntfs_ucstombs((ntfschar *)((u8*)actx->attr +
					le16_to_cpu(actx->attr->name_offset)),
					actx->attr->name_length, &to,
					actx->attr->name_length + 1) < 0) {
				ret = -errno;
				goto exit;
			}
			to += actx->attr->name_length + 1;
		}
	}
	if (errno != ENOENT)
		ret = -errno;
exit:
	if (actx)
		ntfs_attr_put_search_ctx(actx);
	ntfs_inode_close(ni);
	fprintf(stderr, "return %d\n", ret);
	return ret;
}

static int ntfs_fuse_getxattr(const char *path, const char *name,
				char *value, size_t size)
{
	ntfs_volume *vol;
	ntfs_inode *ni;
	ntfs_attr *na = NULL;
	int res;
	ntfschar *lename = NULL;

	if (strncmp(name, "user.", 5))
		return -ENODATA;
	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	ni = ntfs_pathname_to_inode(vol, NULL, path);
	if (!ni)
		return -errno;
	if (ntfs_mbstoucs(name + 5, &lename, 0) == -1) {
		res = -errno;
		goto exit;
	}
	na = ntfs_attr_open(ni, AT_DATA, lename, strlen(name) - 5);
	if (!na) {
		res = -ENODATA;
		goto exit;
	}
	if (size) {
		if (size >= na->data_size) {
			res = ntfs_attr_pread(na, 0, na->data_size, value);
			if (res != na->data_size)
				res = -errno;
		} else
			res = -ERANGE;
	} else
		res = na->data_size;
exit:
	if (na)
		ntfs_attr_close(na);
	if (lename)
		free(lename);
	if (ntfs_inode_close(ni))
		perror("Failed to close inode");
	return res;
}

static int ntfs_fuse_setxattr(const char *path, const char *name,
				const char *value, size_t size, int flags)
{
	ntfs_volume *vol;
	ntfs_inode *ni;
	ntfs_attr *na = NULL;
	int res;
	ntfschar *lename = NULL;

	if (strncmp(name, "user.", 5))
		return -EACCES;
	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	ni = ntfs_pathname_to_inode(vol, NULL, path);
	if (!ni)
		return -errno;
	if (ntfs_mbstoucs(name + 5, &lename, 0) == -1) {
		res = -errno;
		goto exit;
	}
	na = ntfs_attr_open(ni, AT_DATA, lename, strlen(name) - 5);
	if (na && flags == XATTR_CREATE) {
		res = -EEXIST;
		goto exit;
	}
	if (!na) {
		if (flags == XATTR_REPLACE) {
			res = -ENODATA;
			goto exit;
		}
		na = ntfs_attr_add(ni, AT_DATA, lename, strlen(name) - 5, 0);
		if (!na) {
			res = -errno;
			goto exit;
		}
	}
	res = ntfs_attr_pwrite(na, 0, size, value);
	if (res != (s64) size)
		res = -errno;
	else
		res = 0;
exit:
	if (na)
		ntfs_attr_close(na);
	if (lename)
		free(lename);
	if (ntfs_inode_close(ni))
		perror("Failed to close inode");
	return res;
}

static int ntfs_fuse_removexattr(const char *path, const char *name)
{
	ntfs_volume *vol;
	ntfs_inode *ni;
	ntfs_attr *na = NULL;
	int res = 0;
	ntfschar *lename = NULL;

	if (strncmp(name, "user.", 5) || strlen(name) == 5)
		return -ENODATA;
	vol = ctx->vol;
	if (!vol)
		return -ENODEV;
	ni = ntfs_pathname_to_inode(vol, NULL, path);
	if (!ni)
		return -errno;
	if (ntfs_mbstoucs(name + 5, &lename, 0) == -1) {
		res = -errno;
		goto exit;
	}
	na = ntfs_attr_open(ni, AT_DATA, lename, strlen(name) - 5);
	if (!na) {
		res = -ENODATA;
		goto exit;
	}
	if (ntfs_attr_rm(na))
		res = -errno;
	else
		na = NULL;
exit:
	if (na)
		ntfs_attr_close(na);
	if (lename)
		free(lename);
	if (ntfs_inode_close(ni))
		perror("Failed to close inode");
	return res;
}
#endif

static struct fuse_operations ntfs_fuse_oper = {
	.getattr	= ntfs_fuse_getattr,
	.readdir	= ntfs_fuse_readdir,
	.open		= ntfs_fuse_open,
	.read		= ntfs_fuse_read,
	.write		= ntfs_fuse_write,
	.truncate	= ntfs_fuse_truncate,
	.statfs		= ntfs_fuse_statfs,
	.chmod		= ntfs_fuse_chmod,
#ifdef HAVE_SETXATTR
	.listxattr	= ntfs_fuse_listxattr,
	.getxattr	= ntfs_fuse_getxattr,
	.setxattr	= ntfs_fuse_setxattr,
	.removexattr	= ntfs_fuse_removexattr,
#endif	
};

static int ntfs_fuse_init(void)
{
	ctx = malloc(sizeof(ntfs_fuse_context_t));
	if (!ctx) {
		perror("malloc failed");
		return -1;
	}
	*ctx = (ntfs_fuse_context_t) {
		.state = NF_FreeClustersOutdate | NF_FreeMFTOutdate,
		.uid = getuid(),
		.gid = getgid(),
		.fmask = 0111,
	};
	return 0;
}

static int ntfs_fuse_mount(const char *device)
{
	ntfs_volume *vol;

	vol = ntfs_mount(device, (ctx->ro) ? MS_RDONLY : 0);
	if (!vol) {
		perror("Mount failed");
		return -1;
	}
	ctx->vol = vol;
	return 0;
}

static void ntfs_fuse_destroy(void)
{
	if (ctx->vol) {
		printf("Unmounting: %s\n", ctx->vol->vol_name);
		if (ntfs_umount(ctx->vol, FALSE))
			perror("Failed to unmount volume");
	}
	free(ctx);
}

static void signal_handler(int arg __attribute__((unused)))
{
	fuse_exit((fuse_get_context())->fuse);
}

static char *parse_options(char *options, char **device)
{
	char *opts, *s, *opt, *val, *ret;
	BOOL no_def_opts = FALSE, no_fsname = FALSE;
	
	*device = NULL;
	/*
	 * +10 for different in length of "fsname=... (ntfs)" and "dev=...".
	 * +1 for null-terminator.
	 * Total: +11
	 */
	ret = malloc(strlen(def_opts) + strlen(options) + 11);
	if (!ret) {
		perror("malloc failed");
		return NULL;
	}
	*ret = 0;
	opts = strdup(options);
	if (!opts) {
		perror("strdump failed");
		return NULL;
	}
	s = opts;
	while ((val = strsep(&s, ","))) {
		opt = strsep(&val, "=");
		if (!strcmp(opt, "dev")) { /* Device to mount. */
			if (!val) {
				Eprintf("dev option should have value.\n");
				goto err_exit;
			}
			*device = malloc(strlen(val) + 1);
			strcpy(*device, val);
		} else if (!strcmp(opt, "ro")) { /* Read-only mount. */
			ctx->ro =TRUE;
			strcat(ret, "ro,");
		} else if (!strcmp(opt, "fsname")) { /* Filesystem name. */
			if (!val) {
				Eprintf("fsname option should have value.\n");
				goto err_exit;
			}
			no_fsname = TRUE;
			strcat(ret, "fsname=");
			strcat(ret, val);
			strcat(ret, ",");
		} else if (!strcmp(opt, "no_def_opts")) {
			no_def_opts = TRUE; /* Don't add default options. */
		} else if (!strcmp(opt, "umask")) {
			sscanf(val, "%i", &ctx->fmask);
			ctx->dmask = ctx->fmask;
		} else if (!strcmp(opt, "fmask")) {
			sscanf(val, "%i", &ctx->fmask);
		} else if (!strcmp(opt, "dmask")) {
			sscanf(val, "%i", &ctx->dmask);
		} else if (!strcmp(opt, "uid")) {
			sscanf(val, "%i", &ctx->uid);
		} else if (!strcmp(opt, "gid")) {
			sscanf(val, "%i", &ctx->gid);
		} else if (!strcmp(opt, "show_system_files")) {
			ctx->show_system_files = TRUE;
		} else { /* Probably FUSE option. */
			strcat(ret, opt);
			if (val) {
				strcat(ret, "=");
				strcat(ret, val);
			}
			strcat(ret, ",");
		}
	}
	if (!no_def_opts) {
		strcat(ret, def_opts);
		if (!no_fsname) {
			strcat(ret, "fsname=");
			strcat(ret, *device);
			strcat(ret, " (ntfs)");
		}
	}
exit:
	free(opts);
	return ret;
err_exit:
	free(ret);
	ret = NULL;
	goto exit;
}

static void usage(void)
{
	Eprintf("\n%s v%s - NTFS module for FUSE.\n\n",
			EXEC_NAME, VERSION);
	Eprintf("Copyright (c) 2005 Yura Pakhuchiy\n\n");
	Eprintf("usage:  %s mount_point -o dev=device[,other_options]\n\n",
			EXEC_NAME);
	Eprintf("Possible options are:\n\tdefault_permissions\n\tallow_other\n"
		"\tkernel_cache\n\tlarge_read\n\tdirect_io\n\tmax_read\n\t"
		"fsname\n\tro\n\tno_def_opts\n\tumask\n\tfmask\n\tdmask\n\t"
		"uid\n\tgid\n\tshow_system_files\n\tdev\n\n");
	Eprintf("Default options are: \"%sfsname=device (ntfs)\".\n", def_opts);
}

int main(int argc, char *argv[])
{
	char *options, *parsed_options, *mnt_point, *device;
	struct fuse *fh;
	int ffd;

	setlocale(LC_ALL, "");
	signal(SIGINT, signal_handler);
	signal(SIGTERM, signal_handler);

	/* Simple arguments parse code. */
	if (argc != 4) {
		usage();
		return 1;
	}
	if (!strcmp(argv[1], "-o")) {
		options = argv[2];
		mnt_point = argv[3];
	} else if (!strcmp(argv[2], "-o")) {
		options = argv[3];
		mnt_point = argv[1];
	} else {
		usage();
		return 1;
	}
	ntfs_fuse_init();
	/* Parse options. */
	parsed_options = parse_options(options, &device);
	if (!parsed_options) {
		ntfs_fuse_destroy();
		return 6;
	}
	if (!device) {
		Eprintf("dev option is mandatory.\n");
		ntfs_fuse_destroy();
		return 5;
	}

	/* Create filesystem. */
	ffd = fuse_mount(mnt_point, parsed_options);
	if (ffd == -1) {
		Eprintf("fuse_mount failed.\n");
		return 2;
	}
	free(parsed_options);
#ifndef DEBUG
	fh = fuse_new(ffd, "use_ino", &ntfs_fuse_oper, sizeof(ntfs_fuse_oper));
#else
	fh = fuse_new(ffd, "debug,use_ino", &ntfs_fuse_oper,
			sizeof(ntfs_fuse_oper));
#endif
	if (!fh) {
		Eprintf("fuse_new failed.\n");
		close(ffd);
		fuse_unmount(mnt_point);
		return 3;
	}
	/* Mount volume. */
	if (ntfs_fuse_mount(device)) {
		fuse_destroy(fh);
		close(ffd);
		fuse_unmount(mnt_point);
		return 4;
	}
#ifndef DEBUG
	if (daemon(0, 0))
		Eprintf("Failed to daemonize.\n");
#endif
	printf("Mounted: %s\n", ctx->vol->vol_name);
	/* Main loop. */
	if (fuse_loop(fh))
		Eprintf("fuse_loop failed.\n");
	/* Destroy. */
	fuse_destroy(fh);
	close(ffd);
	fuse_unmount(mnt_point);
	ntfs_fuse_destroy();
	return 0;
}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.32,1.33 Makefile.in,1.71,1.72

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	Makefile.am Makefile.in 
Log Message:
- Add new utility - ntfsmount. It's a FUSE module that rely on libntfs. So,
you need FUSE to compile it, xattr is also highly recommended. This module
support file overwrite changing it size and can list/read/write/add/remove
named data streams via xattr interface.
- Update auto{make,conf} stuff respectively.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- Makefile.am	19 Feb 2005 19:34:37 -0000	1.32
+++ Makefile.am	3 Jul 2005 00:18:41 -0000	1.33
@@ -26,6 +26,10 @@ CLEANFILES		= $(EXTRA_PROGRAMS)
 
 linux_ntfsincludedir	= -I$(top_srcdir)/include/ntfs
 
+if ENABLE_FUSE_MODULE
+bin_PROGRAMS		+= ntfsmount
+endif
+
 # Set the include path.
 AM_CPPFLAGS		= -I$(top_srcdir)/include/ntfs $(all_includes)
 
@@ -73,6 +77,13 @@ ntfscp_SOURCES		= ntfscp.c utils.c utils
 ntfscp_LDADD		= $(AM_LIBS)
 ntfscp_LDFLAGS		= $(AM_LFLAGS)
 
+if ENABLE_FUSE_MODULE
+ntfsmount_SOURCES	= ntfsmount.c
+ntfsmount_LDADD		= $(AM_LIBS) $(FUSE_MODULE_LIBS)
+ntfsmount_LDFLAGS	= $(AM_LFLAGS)
+ntfsmount_CFLAGS	= $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=22
+endif
+
 # We don't distribute these
 
 ntfsrm_SOURCES		= ntfsrm.c ntfsrm.h utils.c utils.h

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.in,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- Makefile.in	20 Jun 2005 14:31:59 -0000	1.71
+++ Makefile.in	3 Jul 2005 00:18:41 -0000	1.72
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-SOURCES = $(mkntfs_SOURCES) $(ntfscat_SOURCES) $(ntfsclone_SOURCES) $(ntfscluster_SOURCES) $(ntfscp_SOURCES) $(ntfsdump_logfile_SOURCES) $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(ntfslabel_SOURCES) $(ntfsls_SOURCES) $(ntfsmftalloc_SOURCES) $(ntfsmove_SOURCES) $(ntfsresize_SOURCES) $(ntfsrm_SOURCES) $(ntfstruncate_SOURCES) $(ntfsundelete_SOURCES) $(ntfswipe_SOURCES)
+SOURCES = $(mkntfs_SOURCES) $(ntfscat_SOURCES) $(ntfsclone_SOURCES) $(ntfscluster_SOURCES) $(ntfscp_SOURCES) $(ntfsdump_logfile_SOURCES) $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(ntfslabel_SOURCES) $(ntfsls_SOURCES) $(ntfsmftalloc_SOURCES) $(ntfsmount_SOURCES) $(ntfsmove_SOURCES) $(ntfsresize_SOURCES) $(ntfsrm_SOURCES) $(ntfstruncate_SOURCES) $(ntfsundelete_SOURCES) $(ntfswipe_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -40,13 +40,14 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) ntfscluster$(EXEEXT) \
-	ntfsls$(EXEEXT) ntfscat$(EXEEXT)
+	ntfsls$(EXEEXT) ntfscat$(EXEEXT) $(am__EXEEXT_1)
 sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT) \
 	ntfsundelete$(EXEEXT) ntfsresize$(EXEEXT) ntfsclone$(EXEEXT) \
 	ntfscp$(EXEEXT)
 EXTRA_PROGRAMS = ntfsdump_logfile$(EXEEXT) ntfswipe$(EXEEXT) \
 	ntfstruncate$(EXEEXT) ntfsmove$(EXEEXT) ntfsrm$(EXEEXT) \
 	ntfsmftalloc$(EXEEXT)
+@ENABLE_FUSE_MODULE_TRUE@am__append_1 = ntfsmount
 subdir = ntfsprogs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/mkntfs.8.in $(srcdir)/ntfscat.8.in \
@@ -64,6 +65,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = mkntfs.8 ntfscat.8 ntfsclone.8 ntfscluster.8 \
 	ntfscp.8 ntfsfix.8 ntfsinfo.8 ntfslabel.8 ntfsls.8 ntfsprogs.8 \
 	ntfsresize.8 ntfsundelete.8
+@ENABLE_FUSE_MODULE_TRUE@am__EXEEXT_1 = ntfsmount$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
 	"$(DESTDIR)$(man8dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -108,6 +110,14 @@ ntfsls_DEPENDENCIES = $(am__DEPENDENCIES
 am_ntfsmftalloc_OBJECTS = ntfsmftalloc.$(OBJEXT) utils.$(OBJEXT)
 ntfsmftalloc_OBJECTS = $(am_ntfsmftalloc_OBJECTS)
 ntfsmftalloc_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__ntfsmount_SOURCES_DIST = ntfsmount.c
+@ENABLE_FUSE_MODULE_TRUE@am_ntfsmount_OBJECTS =  \
+@ENABLE_FUSE_MODULE_TRUE@	ntfsmount-ntfsmount.$(OBJEXT)
+ntfsmount_OBJECTS = $(am_ntfsmount_OBJECTS)
+am__DEPENDENCIES_2 =
+@ENABLE_FUSE_MODULE_TRUE@ntfsmount_DEPENDENCIES =  \
+@ENABLE_FUSE_MODULE_TRUE@	$(am__DEPENDENCIES_1) \
+@ENABLE_FUSE_MODULE_TRUE@	$(am__DEPENDENCIES_2)
 am_ntfsmove_OBJECTS = ntfsmove.$(OBJEXT) utils.$(OBJEXT)
 ntfsmove_OBJECTS = $(am_ntfsmove_OBJECTS)
 ntfsmove_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -140,16 +150,16 @@ SOURCES = $(mkntfs_SOURCES) $(ntfscat_SO
 	$(ntfscluster_SOURCES) $(ntfscp_SOURCES) \
 	$(ntfsdump_logfile_SOURCES) $(ntfsfix_SOURCES) \
 	$(ntfsinfo_SOURCES) $(ntfslabel_SOURCES) $(ntfsls_SOURCES) \
-	$(ntfsmftalloc_SOURCES) $(ntfsmove_SOURCES) \
-	$(ntfsresize_SOURCES) $(ntfsrm_SOURCES) \
+	$(ntfsmftalloc_SOURCES) $(ntfsmount_SOURCES) \
+	$(ntfsmove_SOURCES) $(ntfsresize_SOURCES) $(ntfsrm_SOURCES) \
 	$(ntfstruncate_SOURCES) $(ntfsundelete_SOURCES) \
 	$(ntfswipe_SOURCES)
 DIST_SOURCES = $(mkntfs_SOURCES) $(ntfscat_SOURCES) \
 	$(ntfsclone_SOURCES) $(ntfscluster_SOURCES) $(ntfscp_SOURCES) \
 	$(ntfsdump_logfile_SOURCES) $(ntfsfix_SOURCES) \
 	$(ntfsinfo_SOURCES) $(ntfslabel_SOURCES) $(ntfsls_SOURCES) \
-	$(ntfsmftalloc_SOURCES) $(ntfsmove_SOURCES) \
-	$(ntfsresize_SOURCES) $(ntfsrm_SOURCES) \
+	$(ntfsmftalloc_SOURCES) $(am__ntfsmount_SOURCES_DIST) \
+	$(ntfsmove_SOURCES) $(ntfsresize_SOURCES) $(ntfsrm_SOURCES) \
 	$(ntfstruncate_SOURCES) $(ntfsundelete_SOURCES) \
 	$(ntfswipe_SOURCES)
 man8dir = $(mandir)/man8
@@ -185,11 +195,15 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_FUSE_MODULE_FALSE = @ENABLE_FUSE_MODULE_FALSE@
+ENABLE_FUSE_MODULE_TRUE = @ENABLE_FUSE_MODULE_TRUE@
 ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
 ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+FUSE_MODULE_CFLAGS = @FUSE_MODULE_CFLAGS@
+FUSE_MODULE_LIBS = @FUSE_MODULE_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -225,6 +239,7 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -320,6 +335,10 @@ ntfscat_LDFLAGS = $(AM_LFLAGS)
 ntfscp_SOURCES = ntfscp.c utils.c utils.h
 ntfscp_LDADD = $(AM_LIBS)
 ntfscp_LDFLAGS = $(AM_LFLAGS)
+@ENABLE_FUSE_MODULE_TRUE@ntfsmount_SOURCES = ntfsmount.c
+@ENABLE_FUSE_MODULE_TRUE@ntfsmount_LDADD = $(AM_LIBS) $(FUSE_MODULE_LIBS)
+@ENABLE_FUSE_MODULE_TRUE@ntfsmount_LDFLAGS = $(AM_LFLAGS)
+@ENABLE_FUSE_MODULE_TRUE@ntfsmount_CFLAGS = $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=22
 
 # We don't distribute these
 ntfsrm_SOURCES = ntfsrm.c ntfsrm.h utils.c utils.h
@@ -486,6 +505,9 @@ ntfsls$(EXEEXT): $(ntfsls_OBJECTS) $(ntf
 ntfsmftalloc$(EXEEXT): $(ntfsmftalloc_OBJECTS) $(ntfsmftalloc_DEPENDENCIES) 
 	@rm -f ntfsmftalloc$(EXEEXT)
 	$(LINK) $(ntfsmftalloc_LDFLAGS) $(ntfsmftalloc_OBJECTS) $(ntfsmftalloc_LDADD) $(LIBS)
+ntfsmount$(EXEEXT): $(ntfsmount_OBJECTS) $(ntfsmount_DEPENDENCIES) 
+	@rm -f ntfsmount$(EXEEXT)
+	$(LINK) $(ntfsmount_LDFLAGS) $(ntfsmount_OBJECTS) $(ntfsmount_LDADD) $(LIBS)
 ntfsmove$(EXEEXT): $(ntfsmove_OBJECTS) $(ntfsmove_DEPENDENCIES) 
 	@rm -f ntfsmove$(EXEEXT)
 	$(LINK) $(ntfsmove_LDFLAGS) $(ntfsmove_OBJECTS) $(ntfsmove_LDADD) $(LIBS)
@@ -525,6 +547,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfslabel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsmftalloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsmount-ntfsmount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsmove.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsresize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsrm.Po@am__quote@
@@ -556,6 +579,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+ntfsmount-ntfsmount.o: ntfsmount.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfsmount_CFLAGS) $(CFLAGS) -MT ntfsmount-ntfsmount.o -MD -MP -MF "$(DEPDIR)/ntfsmount-ntfsmount.Tpo" -c -o ntfsmount-ntfsmount.o `test -f 'ntfsmount.c' || echo '$(srcdir)/'`ntfsmount.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ntfsmount-ntfsmount.Tpo" "$(DEPDIR)/ntfsmount-ntfsmount.Po"; else rm -f "$(DEPDIR)/ntfsmount-ntfsmount.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ntfsmount.c' object='ntfsmount-ntfsmount.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfsmount_CFLAGS) $(CFLAGS) -c -o ntfsmount-ntfsmount.o `test -f 'ntfsmount.c' || echo '$(srcdir)/'`ntfsmount.c
+
+ntfsmount-ntfsmount.obj: ntfsmount.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfsmount_CFLAGS) $(CFLAGS) -MT ntfsmount-ntfsmount.obj -MD -MP -MF "$(DEPDIR)/ntfsmount-ntfsmount.Tpo" -c -o ntfsmount-ntfsmount.obj `if test -f 'ntfsmount.c'; then $(CYGPATH_W) 'ntfsmount.c'; else $(CYGPATH_W) '$(srcdir)/ntfsmount.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ntfsmount-ntfsmount.Tpo" "$(DEPDIR)/ntfsmount-ntfsmount.Po"; else rm -f "$(DEPDIR)/ntfsmount-ntfsmount.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ntfsmount.c' object='ntfsmount-ntfsmount.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfsmount_CFLAGS) $(CFLAGS) -c -o ntfsmount-ntfsmount.obj `if test -f 'ntfsmount.c'; then $(CYGPATH_W) 'ntfsmount.c'; else $(CYGPATH_W) '$(srcdir)/ntfsmount.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs Makefile.in,1.21,1.22

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	Makefile.in 
Log Message:
- Add new utility - ntfsmount. It's a FUSE module that rely on libntfs. So,
you need FUSE to compile it, xattr is also highly recommended. This module
support file overwrite changing it size and can list/read/write/add/remove
named data streams via xattr interface.
- Update auto{make,conf} stuff respectively.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- Makefile.in	20 Jun 2005 14:31:57 -0000	1.21
+++ Makefile.in	3 Jul 2005 00:18:40 -0000	1.22
@@ -88,11 +88,15 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_FUSE_MODULE_FALSE = @ENABLE_FUSE_MODULE_FALSE@
+ENABLE_FUSE_MODULE_TRUE = @ENABLE_FUSE_MODULE_TRUE@
 ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
 ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+FUSE_MODULE_CFLAGS = @FUSE_MODULE_CFLAGS@
+FUSE_MODULE_LIBS = @FUSE_MODULE_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -128,6 +132,7 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@