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

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog, 1.386, 1.387 configure.ac, 1.107, 1.108

[Anton A. <ai...@de...>]

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv27569

Modified Files:
	ChangeLog configure.ac 
Log Message:
The 1.13.1 release is here!


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- ChangeLog	15 Jun 2006 18:43:24 -0000	1.386
+++ ChangeLog	21 Jun 2006 09:40:17 -0000	1.387
@@ -1,4 +1,4 @@
-xx/xx/2006 - 1.13.1-WIP
+21/06/2006 - 1.13.1 - Various fixes.
 
 	- Fix bug in ntfs_attr_pwrite() when we sometimes lose current run in
 	  the runlist.  (Yura)

Index: configure.ac
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- configure.ac	16 May 2006 11:58:23 -0000	1.107
+++ configure.ac	21 Jun 2006 09:40:17 -0000	1.108
@@ -22,7 +22,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([ntfsprogs],[1.13.1-WIP],[lin...@li...])
+AC_INIT([ntfsprogs],[1.13.1],[lin...@li...])
 
 #
 # Before making a release, the LTVERSION string should be modified.

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.79,1.80

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv2313/ntfsprogs

Modified Files:
	ntfsclone.c 
Log Message:
fix 64 bit destination size calculation on Mac OS X


Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- ntfsclone.c	5 Apr 2006 12:43:07 -0000	1.79
+++ ntfsclone.c	15 Jun 2006 18:43:25 -0000	1.80
@@ -1621,11 +1621,14 @@ static void check_dest_free_space(u64 sr
 		return;
 	}
 
-	dest_bytes = stvfs.f_bsize * stvfs.f_bfree;
-
+	dest_bytes = (u64)stvfs.f_frsize * stvfs.f_bfree;
+	if (!dest_bytes)
+		dest_bytes = (u64)stvfs.f_bsize * stvfs.f_bfree;
+	
 	if (dest_bytes < src_bytes)
-		err_exit("Destination has no enough free space: %llu MB < %llu"
-			 " MB\n", rounded_up_division(dest_bytes, NTFS_MBYTE),
+		err_exit("Destination doesn't have enough free space: "
+			 "%llu MB < %llu MB\n",
+			 rounded_up_division(dest_bytes, NTFS_MBYTE),
 			 rounded_up_division(src_bytes,  NTFS_MBYTE));
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.385,1.386

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv2313

Modified Files:
	ChangeLog 
Log Message:
fix 64 bit destination size calculation on Mac OS X


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- ChangeLog	3 Jun 2006 21:37:27 -0000	1.385
+++ ChangeLog	15 Jun 2006 18:43:24 -0000	1.386
@@ -50,6 +50,8 @@ xx/xx/2006 - 1.13.1-WIP
 	- configure.ac fix for Cygwin.  (Yuval)
 	- Fix bug with renaming directories with names in DOS and WIN32
 	  namespaces.  (Yura)
+	- ntfsclone: fix 64 bit destination size calculation on Mac OS X 
+	  (Mike Bombich, Anton, Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.57,1.58

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv13022/libntfs

Modified Files:
	dir.c 
Log Message:
ntfs_link(): prevent creating of recursive directary structure.

FUSE incorrectly handles case insensitive filesystems: when I try to rename
"/Dir" to "/DIR", ntfsmount receive rename("/Dir", "/DIR/Dir") call.
This patch do not fix rename, but prevent fs corruption. I will mail Miklos
about this problem.


Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- dir.c	3 Jun 2006 21:37:27 -0000	1.57
+++ dir.c	3 Jun 2006 22:09:24 -0000	1.58
@@ -1611,7 +1611,8 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
 	int fn_len, err;
 
 	ntfs_log_trace("Entering.\n");
-	if (!ni || !dir_ni || !name || !name_len) {
+	if (!ni || !dir_ni || !name || !name_len ||
+			ni->mft_no == dir_ni->mft_no) {
 		err = errno;
 		ntfs_log_error("Invalid arguments.\n");
 		goto err_out;

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.384,1.385

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv10899

Modified Files:
	ChangeLog 
Log Message:
Fix bug with renaming directories with names in DOS and WIN32 namespaces.


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -p -r1.384 -r1.385
--- ChangeLog	16 May 2006 11:58:22 -0000	1.384
+++ ChangeLog	3 Jun 2006 21:37:27 -0000	1.385
@@ -48,6 +48,8 @@ xx/xx/2006 - 1.13.1-WIP
 	  correct order.  Essential for hunting bugs in directory operations
 	  code...  (Anton)
 	- configure.ac fix for Cygwin.  (Yuval)
+	- Fix bug with renaming directories with names in DOS and WIN32
+	  namespaces.  (Yura)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.56,1.57

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv10899/libntfs

Modified Files:
	dir.c 
Log Message:
Fix bug with renaming directories with names in DOS and WIN32 namespaces.


Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- dir.c	23 Feb 2006 00:29:04 -0000	1.56
+++ dir.c	3 Jun 2006 21:37:27 -0000	1.57
@@ -1471,15 +1471,15 @@ search:
 		}
 		/*
 		 * Do not allow non-empty directory deletion if hard links count
-		 * is 1 or 2 (in case if one of the names in DOS namespace and
-		 * another in WIN32 namespace).
+		 * is 1 (always) or 2 (in case if filename in DOS namespace,
+		 * because we delete it first in filen which have both WIN32 and
+		 * DOS names).
 		 */
 		if ((na->data_size != sizeof(INDEX_ROOT) + sizeof(
 				INDEX_ENTRY_HEADER)) && (le16_to_cpu(
 				ni->mrec->link_count) == 1 ||
 				(le16_to_cpu(ni->mrec->link_count) == 2 &&
-				(fn->file_name_type == FILE_NAME_WIN32 ||
-				fn->file_name_type == FILE_NAME_DOS)))) {
+				fn->file_name_type == FILE_NAME_DOS))) {
 			ntfs_attr_close(na);
 			ntfs_log_error("Directory is not empty.\n");
 			errno = ENOTEMPTY;

[Linux-NTFS-cvs] CVS: ntfsdocs concepts.xml,1.4,1.5

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsdocs
In directory delta357.server4you.de:/tmp/cvs-serv1077

Modified Files:
	concepts.xml 
Log Message:
programlisting conversions, encryption overview, interix special files

Index: concepts.xml
===================================================================
RCS file: /cvs/linux-ntfs/ntfsdocs/concepts.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- concepts.xml	23 Oct 2005 23:03:44 -0000	1.4
+++ concepts.xml	2 Jun 2006 12:12:46 -0000	1.5
@@ -84,6 +84,14 @@
 						</row>
 						<row>
 							<entry>
+								<link linkend="concept_encryption">Encryption</link>
+							</entry>
+							<entry>
+								<link linkend="concept_encryption">Encryption</link>
+							</entry>
+						</row>
+						<row>
+							<entry>
 								<link linkend="concept_file">File</link>
 							</entry>
 							<entry>
@@ -140,6 +148,15 @@
 						</row>
 						<row>
 							<entry>
+								<link linkend="concept_interix_special_files">Interix Special Files</link>
+							</entry>
+							<entry>
+								<link linkend="concept_interix_special_files">FIFOs, sockets, symbolic links, char,
+									block.</link>
+							</entry>
+						</row>
+						<row>
+							<entry>
 								<link linkend="concept_links">Links</link>
 							</entry>
 							<entry>
@@ -245,9 +262,9 @@
 			<table>
 				<title>Layout of an ACE</title>
 				<tgroup cols="3">
-					<colspec colname="Offset"/>
-					<colspec colname="Size"/>
-					<colspec colname="Description"/>
+					<colspec colname="Offset" colwidth="1*"/>
+					<colspec colname="Size" colwidth="1*"/>
+					<colspec colname="Description" colwidth="3*"/>
 					<thead>
 						<row>
 							<entry>Offset</entry>
@@ -285,69 +302,81 @@
 				</tgroup>
 			</table>
 			<section>
-				<title>Types</title>
-				<para>The currently implemented (in NT) Types are:</para>
+				<title>Type</title>
+				<para>The possible ACE Types (in win2k) are:</para>
 				<table>
 					<title>ACE types</title>
-					<tgroup cols="2">
-						<colspec colname="Value"/>
-						<colspec colname="Description"/>
+					<tgroup cols="3">
+						<colspec colname="Value" colwidth="1*"/>
+						<colspec colname="Minimal Version" colwidth="1*"/>
+						<colspec colname="Description" colwidth="3*"/>
 						<thead>
 							<row>
 								<entry>Value</entry>
+								<entry>Minimal ACE Version</entry>
 								<entry>Description</entry>
 							</row>
 						</thead>
 						<tbody>
 							<row>
 								<entry>0x00</entry>
-								<entry>Access Allowed</entry>
+								<entry>2</entry>
+								<entry>Access Allowed (ACCESS_ALLOWED_ACE_TYPE)</entry>
 							</row>
 							<row>
 								<entry>0x01</entry>
-								<entry>Access Denied</entry>
+								<entry>2</entry>
+								<entry>Access Denied (ACCESS_DENIED_ACE_TYPE)</entry>
 							</row>
 							<row>
 								<entry>0x02</entry>
-								<entry>System Audit</entry>
+								<entry>2</entry>
+								<entry>System Audit (SYSTEM_AUDIT_ACE_TYPE)</entry>
+							</row>
+							<row>
+								<entry>0x03</entry>
+								<entry>2</entry>
+								<entry>System Alarm (SYSTEM_ALARM_ACE_TYPE) (a)</entry>
+							</row>
+							<row>
+								<entry>0x04</entry>
+								<entry>3</entry>
+								<entry>Access Allowed (ACCESS_ALLOWED_COMPOUND_ACE_TYPE)</entry>
+							</row>
+							<row>
+								<entry>0x05</entry>
+								<entry>4</entry>
+								<entry>ACCESS_ALLOWED_OBJECT_ACE_TYPE (b)</entry>
+							</row>
+							<row>
+								<entry>0x06</entry>
+								<entry>4</entry>
+								<entry>ACCESS_DENIED_OBJECT_ACE_TYPE (b)</entry>
+							</row>
+							<row>
+								<entry>0x07</entry>
+								<entry>4</entry>
+								<entry>SYSTEM_AUDIT_OBJECT_ACE_TYPE (b)</entry>
+							</row>
+							<row>
+								<entry>0x08</entry>
+								<entry>4</entry>
+								<entry>SYSTEM_ALARM_OBJECT_ACE_TYPE (b)</entry>
 							</row>
 						</tbody>
 					</tgroup>
 				</table>
-				<programlisting>
-    ACE Types
-    ACCESS_MIN_MS_ACE_TYPE           = 0
-    ACCESS_ALLOWED_ACE_TYPE          = 0
-    ACCESS_DENIED_ACE_TYPE           = 1
-    SYSTEM_AUDIT_ACE_TYPE            = 2
-    SYSTEM_ALARM_ACE_TYPE            = 3 Not implemented as of Win2k.
-    ACCESS_MAX_MS_V2_ACE_TYPE        = 3
-
-    ACCESS_ALLOWED_COMPOUND_ACE_TYPE = 4
-    ACCESS_MAX_MS_V3_ACE_TYPE        = 4
-
-    The following are Win2k only.
-    ACCESS_MIN_MS_OBJECT_ACE_TYPE    = 5
-    ACCESS_ALLOWED_OBJECT_ACE_TYPE   = 5
-    ACCESS_DENIED_OBJECT_ACE_TYPE    = 6
-    SYSTEM_AUDIT_OBJECT_ACE_TYPE     = 7
-    SYSTEM_ALARM_OBJECT_ACE_TYPE     = 8
-    ACCESS_MAX_MS_OBJECT_ACE_TYPE    = 8
-
-    ACCESS_MAX_MS_V4_ACE_TYPE        = 8
-
-    This one is for WinNT&amp;2k.
-    ACCESS_MAX_MS_ACE_TYPE           = 8
-				</programlisting>
+				<para>(a) Not implemented as of Win2k</para>
+				<para>(b) Win2k only (maybe Win2k+ ?)</para>
 			</section>
 			<section>
-				<title>Flags</title>
+				<title>Inheritance Flags</title>
 				<para>Flags is a bit field. The possible values of Flags depend on the value of Type. When applied to a directory, Access Allowed or Access Denied can have flags of</para>
 				<table>
-					<title>ACE flags</title>
+					<title>Access Allowed or Access Denied ACE flags</title>
 					<tgroup cols="2">
-						<colspec colname="Value"/>
-						<colspec colname="Description"/>
+						<colspec colname="Value" colwidth="1*"/>
+						<colspec colname="Description" colwidth="4*"/>
 						<thead>
 							<row>
 								<entry>Value</entry>
@@ -357,29 +386,34 @@
 						<tbody>
 							<row>
 								<entry>0x01</entry>
-								<entry>Object inherits ACE</entry>
+								<entry>Object inherits ACE (OBJECT_INHERIT_ACE)</entry>
 							</row>
 							<row>
 								<entry>0x02</entry>
-								<entry>Container inherits ACE</entry>
+								<entry>Container inherits ACE (CONTAINER_INHERIT_ACE)</entry>
 							</row>
 							<row>
 								<entry>0x04</entry>
-								<entry>Don't propagate 'Inherit ACE'</entry>
+								<entry>Don't propagate 'Inherit ACE' (NO_PROPAGATE_INHERIT_ACE)</entry>
 							</row>
 							<row>
 								<entry>0x08</entry>
-								<entry>Inherit only ACE</entry>
+								<entry>Inherit only ACE (INHERIT_ONLY_ACE)</entry>
+							</row>
+							<row>
+								<entry>0x10</entry>
+								<entry>Inherit only ACE (INHERITED_ACE) (a)</entry>
 							</row>
 						</tbody>
 					</tgroup>
 				</table>
-				<para>If the Type is System Audit, then the flags can be</para>
+				<para>(a) Only Win2k (maybe win2k+ ?)</para>
+				<para>If the Type is System Audit or System Alarm, then the flags can be</para>
 				<table>
 					<title>ACE audit flags</title>
 					<tgroup cols="2">
-						<colspec colname="Value"/>
-						<colspec colname="Description"/>
+						<colspec colname="Value" colwidth="1*"/>
+						<colspec colname="Description" colwidth="4*"/>
 						<thead>
 							<row>
 								<entry>Value</entry>
@@ -389,37 +423,15 @@
 						<tbody>
 							<row>
 								<entry>0x40</entry>
-								<entry>Audit on Success</entry>
+								<entry>Audit on Success (SUCCESSFUL_ACCESS_ACE_FLAG). If this flag is set, Each successful access should be logged.</entry>
 							</row>
 							<row>
 								<entry>0x80</entry>
-								<entry>Audit on Failure</entry>
+								<entry>Audit on Failure (FAILED_ACCESS_ACE_FLAG). If this flag is set, Each failed access should be logged.</entry>
 							</row>
 						</tbody>
 					</tgroup>
 				</table>
-				<programlisting>
-    The ACE flags (8-bit) for audit and inheritance
-
-    SUCCESSFUL_ACCESS_ACE_FLAG is only used with system audit and alarm ACE
-    types to indicate that a message is generated (in Windows!) for successful
-    accesses.
-
-    FAILED_ACCESS_ACE_FLAG is only used with system audit and alarm ACE types
-    to indicate that a message is generated (in Windows!) for failed accesses.
-
-    The inheritance flags.
-    OBJECT_INHERIT_ACE           = 0x01
-    CONTAINER_INHERIT_ACE        = 0x02
-    NO_PROPAGATE_INHERIT_ACE     = 0x04
-    INHERIT_ONLY_ACE             = 0x08
-    INHERITED_ACE                = 0x10  Win2k only
-    VALID_INHERIT_FLAGS          = 0x1f
-
-    The audit flags.
-    SUCCESSFUL_ACCESS_ACE_FLAG   = 0x40
-    FAILED_ACCESS_ACE_FLAG       = 0x80
-				</programlisting>
 			</section>
 			<section>
 				<title>Access Mask / Access Rights</title>
@@ -429,7 +441,7 @@
 					<tgroup cols="3">
 						<colspec colname="Bit(Range)" colwidth="1*"/>
 						<colspec colname="Meaning" colwidth="2*"/>
-						<colspec colname="Description / Examples" colwidth="2*"/>
+						<colspec colname="Description / Examples" colwidth="3*"/>
 						<thead>
 							<row>
 								<entry>Bit(Range)</entry>
@@ -529,11 +541,23 @@
     ACL_REVISION3        = 3
     ACL_REVISION4        = 4
     MAX_ACL_REVISION     = 4
+
+    ACE Types
+    ACCESS_MIN_MS_ACE_TYPE = 0
+    ACCESS_MAX_MS_V2_ACE_TYPE = 3
+    ACCESS_MAX_MS_V3_ACE_TYPE = 4
+    The following are Win2k only.
+    ACCESS_MIN_MS_OBJECT_ACE_TYPE = 5
+    ACCESS_MAX_MS_OBJECT_ACE_TYPE = 8
+    ACCESS_MAX_MS_V4_ACE_TYPE = 8
+    ACCESS_MAX_MS_ACE_TYPE = 8
+
+    VALID_INHERIT_FLAGS = 0x1f
 				</programlisting>
 			</section>
 		</section>
 	</section>
-	<section id="concept_attribute_header">
+	<section id="concept_attribute_header"> <!-- todo: unite resident named and unnamed -->
 		<title>Concept - Attribute Header</title>
 		<section>
 			<title>Overview</title>
@@ -741,143 +765,17 @@
 				<para>(c) Rounded up to a multiple of 4 bytes.</para>
 			</section>
 			<section>
-				<title>Non-Resident, No Name</title>
-				<table>
-					<title>Layout of a non-resident unnamed attribute header</title>
-					<tgroup cols="4">
-						<colspec colname="Offset" colwidth="1*"/>
-						<colspec colname="Size" colwidth="1*"/>
-						<colspec colname="Value" colwidth="1*"/>
-						<colspec colname="Description" colwidth="3*"/>
-						<thead>
-							<row>
-								<entry>Offset</entry>
-								<entry>Size</entry>
-								<entry>Value</entry>
-								<entry>Description</entry>
-							</row>
-						</thead>
-						<tbody>
-							<row>
-								<entry>0x00</entry>
-								<entry>4</entry>
-								<entry/>
-								<entry>Attribute Type (e.g. 0x20, 0x80)</entry>
-							</row>
-							<row>
-								<entry>0x04</entry>
-								<entry>4</entry>
-								<entry/>
-								<entry>Length (including this header)</entry>
-							</row>
-							<row>
-								<entry>0x08</entry>
-								<entry>1</entry>
-								<entry>0x01</entry>
-								<entry>Non-resident flag</entry>
-							</row>
-							<row>
-								<entry>0x09</entry>
-								<entry>1</entry>
-								<entry>0x00</entry>
-								<entry>Name length</entry>
-							</row>
-							<row>
-								<entry>0x0A</entry>
-								<entry>2</entry>
-								<entry>0x00</entry>
-								<entry>Offset to the Name</entry>
-							</row>
-							<row>
-								<entry>0x0C</entry>
-								<entry>2</entry>
-								<entry/>
-								<entry>Flags</entry>
-							</row>
-							<row>
-								<entry>0x0E</entry>
-								<entry>2</entry>
-								<entry/>
-								<entry>Attribute Id (a)</entry>
-							</row>
-							<row>
-								<entry>0x10</entry>
-								<entry>8</entry>
-								<entry/>
-								<entry>Starting VCN</entry>
-							</row>
-							<row>
-								<entry>0x18</entry>
-								<entry>8</entry>
-								<entry/>
-								<entry>Last VCN</entry>
-							</row>
-							<row>
-								<entry>0x20</entry>
-								<entry>2</entry>
-								<entry>0x40</entry>
-								<entry>Offset to the Data Runs</entry>
-							</row>
-							<row>
-								<entry>0x22</entry>
-								<entry>2</entry>
-								<entry/>
-								<entry>Compression Unit Size (b)</entry>
-							</row>
-							<row>
-								<entry>0x24</entry>
-								<entry>4</entry>
-								<entry>0x00</entry>
-								<entry>Padding</entry>
-							</row>
-							<row>
-								<entry>0x28</entry>
-								<entry>8</entry>
-								<entry/>
-								<entry>Allocated size of the attribute (c)</entry>
-							</row>
-							<row>
-								<entry>0x30</entry>
-								<entry>8</entry>
-								<entry/>
-								<entry>Real size of the attribute</entry>
-							</row>
-							<row>
-								<entry>0x38</entry>
-								<entry>8</entry>
-								<entry/>
-								<entry>Initialized data size of the stream (d)</entry>
-							</row>
-							<row>
-								<entry>0x40</entry>
-								<entry>...</entry>
-								<entry/>
-								<entry>Data Runs</entry>
-							</row>
-						</tbody>
-					</tgroup>
-				</table>
-				<para>(a) Each attribute has a unique identifier</para>
-				<para>(b) Compression unit size = 2
-					<superscript>x</superscript> clusters. 0 implies uncompressed
-				</para>
-				<para>(c) This is the attribute size rounded up to the cluster size</para>
-				<para>(d) When is this not equal to the allocated size?</para>
-			</section>
-			<section>
-				<title>Non-Resident, Named</title>
+				<title>Non-Resident</title>
 				<table>
 					<title>Layout of a non-resident named attribute header</title>
-					<tgroup cols="4">
+					<tgroup cols="3">
 						<colspec colname="Offset" colwidth="1*"/>
 						<colspec colname="Size" colwidth="1*"/>
-						<colspec colname="Value" colwidth="1*"/>
 						<colspec colname="Description" colwidth="3*"/>
 						<thead>
 							<row>
 								<entry>Offset</entry>
 								<entry>Size</entry>
-								<entry>Value</entry>
 								<entry>Description</entry>
 							</row>
 						</thead>
@@ -885,103 +783,91 @@
 							<row>
 								<entry>0x00</entry>
 								<entry>4</entry>
-								<entry/>
 								<entry>Attribute Type (e.g. 0x80, 0xA0)</entry>
 							</row>
 							<row>
 								<entry>0x04</entry>
 								<entry>4</entry>
-								<entry/>
 								<entry>Length (including this header)</entry>
 							</row>
 							<row>
 								<entry>0x08</entry>
 								<entry>1</entry>
-								<entry>0x01</entry>
-								<entry>Non-resident flag</entry>
+								<entry>Non-resident flag (value is 0x01)</entry>
 							</row>
 							<row>
 								<entry>0x09</entry>
 								<entry>1</entry>
-								<entry>N</entry>
-								<entry>Name length</entry>
+								<entry>Name length (g)</entry>
 							</row>
 							<row>
 								<entry>0x0A</entry>
 								<entry>2</entry>
-								<entry>0x40</entry>
-								<entry>Offset to the Name</entry>
+								<entry>Offset to the Name (g)</entry>
 							</row>
 							<row>
 								<entry>0x0C</entry>
 								<entry>2</entry>
-								<entry/>
 								<entry>Flags</entry>
 							</row>
 							<row>
 								<entry>0x0E</entry>
 								<entry>2</entry>
-								<entry/>
 								<entry>Attribute Id (a)</entry>
 							</row>
 							<row>
 								<entry>0x10</entry>
 								<entry>8</entry>
-								<entry/>
 								<entry>Starting VCN</entry>
 							</row>
 							<row>
 								<entry>0x18</entry>
 								<entry>8</entry>
-								<entry/>
 								<entry>Last VCN</entry>
 							</row>
 							<row>
 								<entry>0x20</entry>
 								<entry>2</entry>
-								<entry>2N+0x40</entry>
 								<entry>Offset to the Data Runs (b)</entry>
 							</row>
 							<row>
 								<entry>0x22</entry>
-								<entry>2</entry>
-								<entry/>
+								<entry>1</entry>
 								<entry>Compression Unit Size (c)</entry>
 							</row>
 							<row>
-								<entry>0x24</entry>
-								<entry>4</entry>
-								<entry>0x00</entry>
-								<entry>Padding</entry>
+								<entry>0x23</entry>
+								<entry>5</entry>
+								<entry>Padding of zeros (align to 8 byte boundary)</entry>
 							</row>
 							<row>
 								<entry>0x28</entry>
 								<entry>8</entry>
-								<entry/>
 								<entry>Allocated size of the attribute (d)</entry>
 							</row>
 							<row>
 								<entry>0x30</entry>
 								<entry>8</entry>
-								<entry/>
-								<entry>Real size of the attribute</entry>
+								<entry>Real size of the attribute. Can be larger than the allocated size if the attribute is compressed or sparse. (TODO: xref)</entry>
 							</row>
 							<row>
 								<entry>0x38</entry>
 								<entry>8</entry>
-								<entry/>
 								<entry>Initialized data size of the stream (e)</entry>
 							</row>
 							<row>
 								<entry>0x40</entry>
+								<entry>8</entry>
+								<entry>Compressed size (f)</entry>
+							</row>
+							<row>
+								<entry>0x40 or 0x48</entry>
 								<entry>2N</entry>
-								<entry>Unicode</entry>
-								<entry>The Attribute's Name</entry>
+								<entry>The Attribute's Name in Unicode. Not null terminated.</entry>
 							</row>
 							<row>
-								<entry>2N+0x40</entry>
+								<entry>2N+(0x40 or 0x48)</entry>
 								<entry>...</entry>
-								<entry/>
 								<entry>Data Runs (b)</entry>
 							</row>
 						</tbody>
@@ -993,7 +879,13 @@
 					<superscript>x</superscript> clusters. 0 implies uncompressed
 				</para>
 				<para>(d) This is the attribute size rounded up to the cluster size</para>
-				<para>(e) When is this not equal to the allocated size?</para>
+				<para>(e) May be smaller than the Real/Allocated sizes if the file was not filled with data yet. For
+					example: after seeking beyond the end of a non-sparse file and not writing anything.</para>
+				<para>(f) Byte size of the attribute value after compression. Only present when compressed. Always is a
+					multiple of the compression unit size (which is a multiple of the cluster size). Represents the
+					actual amount of disk space being used on the disk.</para>
+				<para>(g) The name is not null-terminated. If the attribute is unnamed, both the name length and offset
+					are 0.</para>
 			</section>
 			<section>
 				<title>Flags</title>
@@ -1032,16 +924,6 @@
 				<title>Other Information</title>
 				<para>Only the data attribute can be compressed, or sparse, and only when it is non-resident.</para>
 				<para>Although the compression flag is stored in the header, it does not affect the size of the header.</para>
-				<programlisting>
-    name isn't null terminated
-    
-
-    FIXME
-    0x40 __s64 compressed_size;
-    Byte size of the attribute value after compression.
-    Only present when compressed. Always is a multiple of the cluster
-    size. Represents the actual amount of disk space being used on the disk.
-				</programlisting>
 				<para>FIXME: The indexed flag only appears in the resident attributes. Does this mean you can only index resident attributes?</para>
 			</section>
 		</section>
@@ -2216,20 +2098,17 @@ therefore -10 = 0xF6
 			</section>
 		</section>
 	</section>
-	<section id="concept_encryption">
-		<title>Concept - Encryption</title>
-		<para>TODO</para>
-	</section>
 	<section id="concept_directory">
 		<title>Concept - Directory</title>
 		<section>
 			<title>Overview</title>
-			<para>Under NTFS every object on the volume is a file, even directories. A directory is an index of filenames.</para>
+			<para>A directory is a set of files.</para>
+			<para>On NTFS, A directory is a file record (TODO:xref) with an index of filenames.</para>
 		</section>
 		<section>
-			<title>Attributes</title>
+			<title>Layout of a directory file record</title>
 			<table>
-				<title>A directory record attributes</title>
+				<title>A directory file record attributes</title>
 				<tgroup cols="3">
 					<colspec colname="Type" colwidth="1*"/>
 					<colspec colname="Description" colwidth="2*"/>
@@ -2243,11 +2122,6 @@ therefore -10 = 0xF6
 					</thead>
 					<tbody>
 						<row>
-							<entry>Type</entry>
-							<entry>Description</entry>
-							<entry>Name</entry>
-						</row>
-						<row>
 							<entry>
 								<link linkend="attribute_standard_information">0x10</link>
 							</entry>
@@ -2305,24 +2179,24 @@ therefore -10 = 0xF6
 				</tgroup>
 			</table>
 			<section>
-				<title/>
-				<section>
-					<title>Index Entry</title>
-					<para>An index is a list of index entries. Each entry contains the name of the file, the standard information and a pointer to the security information. The correct starting place is the Index Entry.</para>
-				</section>
-				<section>
-					<title>Index Root</title>
-					<para>This attribute, which is always resident, holds several index entries. It forms the root of the index tree.</para>
-				</section>
-				<section>
-					<title>Index Allocation</title>
-					<para>A set of runs telling the system where the other indexes are. (preposition!)</para>
-				</section>
-				<section>
-					<title>Index Bitmap</title>
-					<para>Which clusters (indexes) are in use.</para>
-					<programlisting>A directory can even have a named data stream</programlisting>
-				</section>
+				<title>Index Entry</title>
+				<para>An index is a list of index entries. Each entry contains the name of the file, the standard
+					information and a pointer to the security information. The correct starting place is the Index
+					Entry.</para>
+			</section>
+			<section>
+				<title>Index Root</title>
+				<para>This attribute, which is always resident, holds several index entries. It forms the root of
+					the index tree.</para>
+			</section>
+			<section>
+				<title>Index Allocation</title>
+				<para>A set of runs telling the system where the other indexes are. (preposition!)</para>
+			</section>
+			<section>
+				<title>Index Bitmap</title>
+				<para>Which clusters (indexes) are in use.</para>
+				<programlisting>A directory can even have a named data stream</programlisting>
 			</section>
 		</section>
 		<section>
@@ -2353,6 +2227,47 @@ therefore -10 = 0xF6
 			<para>In a directory, the three file attributes: index root, index allocation, and bitmap are named "$I30", and a directory is just an Index of file attributes whose type is 30. But NTFS has been thought as a database filesystem, and it can actually create indexes based on any file attribute that is always resident. E.g., you could create a new file attribute labeled "author name", and sort your files according to that criteria.</para>
 		</section>
 	</section>
+	<section id="concept_encryption">
+		<title>Concept - Encryption</title>
+		<section>
+			<title>Overview</title>
+			<para>A special feature of NTFS is the ability to encrypt files. Encrypted files' content is safe from the
+				Administrator too (Unless DRAs are used), as they can not be decrypted without having the key.</para>
+			<para>Each user has his own Private/Public key pair. When an encrypted file is created, the system creates a
+				random file encryption key (FEK) for this file and encrypts the FEK with the user's public key. The file
+				is encrypted with a strong symetric cipher and this FEK.</para>
+			<para>An encrypted file may not be locked only by a single user. Any user that can read the file (can
+				decrypt it), and can alter its permissions (the ACL) may specify additional users to be able to decrypt
+				it. When a new user is specified, the system decrypts the FEK with the adding user's private key,
+				encrypt it with the added user's public key and attaches the new encrypted FEK to the file's
+				metadata.</para>
+			<para>NTFS also supports the concept of Data Recovery Agents (DRAs). An Administrator may specify a specific
+				user/s to function as DRA/s. Any new encrypted file is also attached with a FEK encrypted with each of
+				the current DRAs public keys. This method allows the data to be recovered if the user's private key is
+				lost (Such as when a password reset is performed). There is no fundamental difference between a FEK
+				encrypted with a normal public key and a FEK encrypted with a recovery public key.</para>
+		</section>
+		<section>
+			<title>Disk Layout</title>
+			<para>An encrypted file</para>
+		</section>
+		<section>
+			<title>TODO</title>
+			<para>TODO</para>
+			<programlisting>
+    only files can be encrypted, no dirs.
+    no compression allowed.
+    table of attributes in mft record.
+    DES/DESX/3DES/AES - versions of windows and of NTFS.
+    DESX - detailed.
+    Reference strings.
+    IV for each cipher, and sector.
+    Adding DRAs after the file is touched is not helpful
+    No hardware dongles/smartcards allowed by MS implementetion, it is allowed by disk structures.
+    (No) Padding scheme.
+			</programlisting>
+		</section>
+	</section>
 	<section id="concept_file">
 		<title>Concept - File</title>
 		<section>
@@ -2819,17 +2734,22 @@ therefore -10 = 0xF6
 					</tbody>
 				</tgroup>
 			</table>
-			<para>(a) The offset to these two fields depends on your operating system.</para>
-			<para>$LogFile Sequence Number (LSN)</para>
-			<para>This is changed every time the record is modified.</para>
-			<para>Sequence Number</para>
-			<para>Number of times this mft record has been reused.</para>
-			<para>N.B. The increment (skipping zero) is done when the file is deleted.</para>
-			<para>N.B. If this is set to zero it is left as zero.</para>
-			<para>Hard Link Count</para>
-			<para>Number of hard links, i.e. the number of directory entries referencing this record.</para>
-			<para>N.B. Only used in mft base records.</para>
-			<para>Flags</para>
+			<para>(a) The offset to these two fields depends on the NTFS version.</para>
+			<section>
+				<title>$LogFile Sequence Number (LSN)</title>
+				<para>This is changed every time the record is modified.</para>
+			</section>
+			<section>
+				<title>Sequence Number</title>
+				<para>Number of times this mft record has been reused.</para>
+				<para>N.B. The increment (skipping zero) is done when the file is deleted.</para>
+				<para>N.B. If this is set to zero it is left as zero.</para>
+			</section>
+			<section>
+				<title>Hard Link Count</title>
+				<para>Number of hard links, i.e. the number of directory entries referencing this record.</para>
+				<para>N.B. Only used in mft base records.</para>
+			</section>
 			<table>
 				<title>File record flags</title>
 				<tgroup cols="2">
@@ -2861,17 +2781,31 @@ therefore -10 = 0xF6
 					</tbody>
 				</tgroup>
 			</table>
-			<para>Real / Allocated Size</para>
-			<para>The Allocated Size is how much space the Record takes up on disk. This should be a multiple of the cluster size and should probably be equal to the size of an MFT File Record. The Real Size is a count of how many bytes of the Record are actually used.</para>
-			<para>N.B. The Real Size will be padded to an 8 byte boundary.</para>
-			<para>Base MFT Record</para>
-			<para>This is zero for Base MFT Records. When it is not zero it is a MFT Reference pointing to the Base MFT Record to which this Record belongs. The Base Record contains the information about the Extension Record. This information is stored in an ATTRIBUTE_LIST attribute.</para>
-			<para>Next Attribute Id</para>
-			<para>The Attribute Id that will be assigned to the next Attribute added to this MFT Record.</para>
-			<para>N.B. Incremented each time it is used.</para>
-			<para>N.B. Every time the MFT Record is reused this Id is set to zero.</para>
-			<para>N.B. The first instance number is always 0.</para>
-			<para>The master file table record consists of a header and the attribute list. It has a size of 400 (=1K), or the cluster size (whichever is larger). The header has the following fields:</para>
+			<section>
+				<title>Real / Allocated Size</title>
+				<para>The Allocated Size is how much space the Record takes up on disk. This should be a multiple of the
+					cluster size and should probably be equal to the size of an MFT File Record. The Real Size is a
+					count of
+					how many bytes of the Record are actually used.</para>
+				<para>N.B. The Real Size will be padded to an 8 byte boundary.</para>
+			</section>
+			<section>
+				<title>Base MFT Record</title>
+				<para>This is zero for Base MFT Records. When it is not zero it is a MFT Reference pointing to the Base
+					MFT
+					Record to which this Record belongs. The Base Record contains the information about the Extension
+					Record. This information is stored in an ATTRIBUTE_LIST attribute.</para>
+			</section>
+			<section>
+				<title>Next Attribute Id</title>
+				<para>The Attribute Id that will be assigned to the next Attribute added to this MFT Record.</para>
+				<para>N.B. Incremented each time it is used.</para>
+				<para>N.B. Every time the MFT Record is reused this Id is set to zero.</para>
+				<para>N.B. The first instance number is always 0.</para>
+				<para>The master file table record consists of a header and the attribute list. It has a size of 400
+					(=1K),
+					or the cluster size (whichever is larger). The header has the following fields:</para>
+			</section>
 		</section>
 		<section>
 			<title>Notes</title>
@@ -3847,7 +3781,6 @@ therefore -10 = 0xF6
 			</section>
 		</section>
 	</section>
-
 	<section id="concept_index_record">
 		<title>Concept - Index Record</title>
 		<section>
@@ -4021,6 +3954,74 @@ therefore -10 = 0xF6
 			</section>
 		</section>
 	</section>
+	<section id="concept_interix_special_files">
+		<title>Concept - Interix Special Files</title>
+		<section>
+			<title>Overview</title>
+			<para>Interix is the POSIX subsystem for Windows name.</para>
+			<para>One of Interix's needs is to emulate the POSIX way of accessing the filesystem. And in respect to
+				that, supply POSIX special files on top of the NTFS filesystem.</para>
+			<para>File Types:
+				<itemizedlist>
+					<listitem>
+						<para>Socket</para>
+					</listitem>
+					<listitem>
+						<para>Symbolic Link</para>
+					</listitem>
+					<listitem>
+						<para>Regular File</para>
+					</listitem>
+					<listitem>
+						<para>Block Device</para>
+					</listitem>
+					<listitem>
+						<para>Directory</para>
+					</listitem>
+					<listitem>
+						<para>Character Device</para>
+					</listitem>
+					<listitem>
+						<para>FIFO</para>
+					</listitem>
+				</itemizedlist>
+			</para>
+			<para>Regular Files and Directories are not special, and already described in this documentation.</para>
+		</section>
+		<section>
+			<title>Layout of a special file</title>
+			<para>TODO: 0x10, 0x30, 0x80.</para>
+		</section>
+		<section>
+			<title>Sockets and FIFOs</title>
+			<para>Both sockets and FIFOs are files with the System attribute set. The difference is the file length
+				magic.</para>
+			<para>A FIFO special file is a file with the System attribute set and a 0 bytes length.</para>
+			<para>A socket special file is a file with the System attribute set and a 1 byte length.</para>
+		</section>
+		<section>
+			<title>Block and character devices and Symbolic links</title>
+			<para>Block and character devices and Symbolic links are files with the System attribute set. The difference
+				is their content</para>
+			<para>Block devices start with the 64-bit magic "IntxBLK\0" (that is the null terminated ASCII string
+				"IntxBLK") followed by 2 LE 64-bit integers representing the major and minor nodes.</para>
+			<para>Character devices are exactly like block devices except that they start with the "IntxCHR\0"
+				magic.</para>
+			<para>Symbolic links start with the 64-bit magic "IntxLNK\1" (notice: char 0x01 instead of a
+				null-terminator) followed by the link target name in a UTF-16LE string format. A detailed explanation
+				about Symbolic links can be found in
+				<xref linkend="concept_links"/>
+				.
+			</para>
+			<programlisting>
+    Add a layout table.
+    Offset Length Name
+     0 8 Magic
+     8 8 Major
+    16 8 Minor
+			</programlisting>
+		</section>
+	</section>
 	<section id="concept_links">
 		<title>Concept - Links</title>
 		<section>
@@ -4835,7 +4836,14 @@ Offset(length)         Description
 		<title>Concept - Sparse</title>
 		<section>
 			<title>Overview</title>
-			<para>Sparse files</para>
+			<para>Sparse files are files that are not fully allocated.</para>
+			<para>On Linux, every new file is by default sparse. Windows files on the other hand, needs to be declared
+				specificly as sparse.</para>
+			<para>Once a file is tagged SPARSE on an NTFS volume, Windows is unable to untag it.</para>
+			<para>The SPARSE tagging is done in the DOS Attributes / File Permissions (TODO: link to the table) in both
+				the 0x10 and 0x30 (TODO: xref) attributes.</para>
+			<para>The sparse holes are marked in the runlist (TODO: xref).</para>
+			<para>Example: TODO</para>
 			<programlisting>
     fix the data runs page for NT4 (old style)
     13 b8 ae 04 ff 00     old

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.125,1.126

[Anton A. <ai...@de...>]

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv6382/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
- Fix STUPID vcn printing bug in ntfsinfo that waster over 18 hours of my life
  trying to debug the ntfs driver when it was ntfsinfo that was wrong. )))-:

- Switch vcn output in index listings to show the vcn in hex not decimal.

- Show index block flags for each index block.


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- ntfsinfo.c	23 Apr 2006 11:01:07 -0000	1.125
+++ ntfsinfo.c	20 May 2006 21:27:15 -0000	1.126
@@ -1364,8 +1364,8 @@ static int ntfs_dump_index_entries(INDEX
 			le16_to_cpu(entry->flags));
 
 		if (entry->flags & INDEX_ENTRY_NODE)
-			ntfs_log_verbose("\t\tSubnode VCN:\t\t %lld\n",
-				le64_to_cpu(*((u8*)entry +
+			ntfs_log_verbose("\t\tSubnode VCN:\t\t 0x%llx\n",
+				sle64_to_cpu(*(VCN*)((u8*)entry +
 				le16_to_cpu(entry->length) - sizeof(VCN))));
 		if (entry->flags & INDEX_ENTRY_END)
 			break;
@@ -1575,13 +1575,14 @@ static void ntfs_dump_attr_index_allocat
 			}
 			entry = (INDEX_ENTRY *)((u8 *)tmp_alloc + le32_to_cpu(
 				tmp_alloc->index.entries_offset) + 0x18);
-			ntfs_log_verbose("\tDumping index block (VCN %lld, "
-					"used %u/%u):\n", le64_to_cpu(
-					tmp_alloc->index_block_vcn),
+			ntfs_log_verbose("\tDumping index block (VCN 0x%llx, "
+					"used %u/%u, flags 0x%02x):\n",
+					le64_to_cpu(tmp_alloc->index_block_vcn),
 					(unsigned int)le32_to_cpu(tmp_alloc->
 					index.index_length), (unsigned int)
 					le32_to_cpu(tmp_alloc->index.
-					allocated_size));
+					allocated_size),
+					tmp_alloc->index.flags);
 			if (opts.verbose) {
 				ntfs_dump_usa_lsn("\t\t", 
 						  (MFT_RECORD *)tmp_alloc);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.84,1.85

[Anton A. <ai...@de...>]

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv25815/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
Fix ntfsmount compilation.


Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- ntfsmount.c	15 May 2006 21:35:38 -0000	1.84
+++ ntfsmount.c	19 May 2006 04:22:53 -0000	1.85
@@ -873,7 +873,7 @@ static int ntfs_fuse_symlink(const char 
 {
 	if (ntfs_fuse_is_named_data_stream(from))
 		return -EINVAL; /* n/a for named data streams. */
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 	return ntfs_fuse_create(from, S_IFLNK, 0, to);
 }
 

[Linux-NTFS-cvs] CVS: ntfs-misc AUTHORS,1.1.1.1,1.2

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfs-misc
In directory delta357.server4you.de:/tmp/cvs-serv2321

Modified Files:
	AUTHORS 
Log Message:
test


Index: AUTHORS
===================================================================
RCS file: /cvs/linux-ntfs/ntfs-misc/AUTHORS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- AUTHORS	13 Apr 2005 16:29:19 -0000	1.1.1.1
+++ AUTHORS	18 May 2006 18:36:50 -0000	1.2
@@ -1,4 +1,5 @@
 
+
 Linux-NTFS driver is written by Anton Altparmakov.
 
 Copyright (c) 2001-2005 Anton Altaparmakov <ai...@ca...>.

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.142,1.143

[Yuval <uv...@us...>]

Changes by: uvman

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

Modified Files:
	mkntfs.c 
Log Message:
mkntfs.c refactoring and compile fix for Cygwin

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- mkntfs.c	19 Apr 2006 21:43:11 -0000	1.142
+++ mkntfs.c	16 May 2006 12:12:45 -0000	1.143
@@ -3437,6 +3437,29 @@ done:
 }
 
 /**
+ * mkntfs_get_page_size - detect the system's memory page size.
+ */
+static long mkntfs_get_page_size()
+{
+	long page_size;
+#ifdef _SC_PAGESIZE
+	page_size = sysconf(_SC_PAGESIZE);
+	if (page_size < 0)
+#endif
+#ifdef _SC_PAGE_SIZE
+		page_size = sysconf(_SC_PAGE_SIZE);
+	if (page_size < 0)
+#endif
+	{
+		ntfs_log_warning("Failed to determine system page size.  "
+				"Assuming safe default of 4096 bytes.\n");
+		return 4096;
+	}
+	ntfs_log_debug("System page size is %li bytes.\n", page_size);
+	return page_size;
+}
+
+/**
  * mkntfs_override_vol_params -
  */
 static BOOL mkntfs_override_vol_params(ntfs_volume *vol)
@@ -3678,16 +3701,7 @@ static BOOL mkntfs_override_vol_params(n
 				"of the device will be used.\n");
 		return FALSE;
 	}
-	page_size = sysconf(_SC_PAGESIZE);
-	if (page_size < 0)
-		page_size = sysconf(_SC_PAGE_SIZE);
-	if (page_size >= 0)
-		ntfs_log_debug("System page size is %li bytes.\n", page_size);
-	else {
-		ntfs_log_warning("Failed to determine system page size.  "
-				"Assuming safe default of 4096 bytes.\n");
-		page_size = 4096;
-	}
+	page_size = mkntfs_get_page_size();
 	/*
 	 * Set the mft record size.  By default this is 1024 but it has to be
 	 * at least as big as a sector and not bigger than a page on the system

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.383,1.384 configure.ac,1.106,1.107

[Yuval <uv...@us...>]

Changes by: uvman

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
configure.ac fix for Cygwin

Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- ChangeLog	27 Apr 2006 22:22:02 -0000	1.383
+++ ChangeLog	16 May 2006 11:58:22 -0000	1.384
@@ -47,6 +47,7 @@ xx/xx/2006 - 1.13.1-WIP
 	  attribute completely and index entry (filename) completely and all in
 	  correct order.  Essential for hunting bugs in directory operations
 	  code...  (Anton)
+	- configure.ac fix for Cygwin.  (Yuval)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- configure.ac	18 Apr 2006 21:40:32 -0000	1.106
+++ configure.ac	16 May 2006 11:58:23 -0000	1.107
@@ -192,13 +192,12 @@ compile_gnome_vfs=false
 if test "$enable_gnome_vfs" != "no"; then
 	PKG_CHECK_MODULES(LIBNTFS_GNOMEVFS, [glib-2.0 gthread-2.0 gnome-vfs-module-2.0],
 	[ compile_gnome_vfs=true ],
-	[
 		if test "$enable_gnome_vfs" = "yes"; then
 			AC_MSG_ERROR([Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 libraries.])
 		else
 			AC_MSG_WARN([Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 libraries.])
 		fi
-	])
+	)
 fi
 AM_CONDITIONAL(ENABLE_GNOME_VFS, $compile_gnome_vfs)
 
@@ -208,22 +207,20 @@ if test "$enable_fuse_module" != "no"; t
 	case "$target_os" in
 	linux*)
 		PKG_CHECK_MODULES(FUSE_MODULE, fuse >= 2.3.0, [ compile_fuse_module=true ],
-		[
 			if test "$enable_fuse_module" = "yes"; then
 				AC_MSG_ERROR([ntfsmount requires FUSE version >= 2.3.0.])
 			else
 				AC_MSG_WARN([ntfsmount requires FUSE version >= 2.3.0.])
 			fi
-		]);;
+		);;
 	freebsd*)
 		PKG_CHECK_MODULES(FUSE_MODULE, fuse >= 2.5.0, [ compile_fuse_module=true ],
-		[
 			if test "$enable_fuse_module" = "yes"; then
 				AC_MSG_ERROR([ntfsmount requires FUSE version >= 2.5.0 under FreeBSD.])
 			else
 				AC_MSG_WARN([ntfsmount requires FUSE version >= 2.5.0 under FreeBSD.])
 			fi
-		]);;
+		);;
 	*)
 		if test "$enable_fuse_module" = "yes"; then
 			AC_MSG_ERROR([ntfsmount can be built only under Linux and FreeBSD.])

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.83,1.84

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
vimspell rules


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- ntfsmount.c	27 Apr 2006 22:22:05 -0000	1.83
+++ ntfsmount.c	15 May 2006 21:35:38 -0000	1.84
@@ -121,9 +121,9 @@ static const char *EXEC_NAME = "ntfsmoun
 static char def_opts[] = "default_permissions,allow_other,";
 static ntfs_fuse_context_t *ctx;
 
-static __inline__ void ntfs_fuse_mark_free_space_outdate(void)
+static __inline__ void ntfs_fuse_mark_free_space_outdated(void)
 {
-	/* Mark information about free MFT record and clusters outdate. */
+	/* Mark information about free MFT record and clusters outdated. */
 	ctx->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate);
 }
 
@@ -131,7 +131,7 @@ static __inline__ void ntfs_fuse_mark_fr
  * ntfs_fuse_is_named_data_stream - check path to be to named data stream
  * @path:	path to check
  *
- * Rerturn 1 if path is to named data stream or 0 otherwise.
+ * Returns 1 if path is to named data stream or 0 otherwise.
  */
 static __inline__ int ntfs_fuse_is_named_data_stream(const char *path)
 {
@@ -219,7 +219,7 @@ static long ntfs_fuse_get_nr_free_cluste
  *
  * This code based on ntfs_statfs from ntfs kernel driver.
  *
- * Return 0 on success or -errno on error.
+ * Returns 0 on success or -errno on error.
  */
 static int ntfs_fuse_statfs(const char *path __attribute__((unused)),
 #if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
@@ -358,7 +358,7 @@ static int ntfs_fuse_getattr(const char 
 				stbuf->st_blocks = na->allocated_size >>
 					vol->sector_size_bits;
 			}
-			/* Check whether it's Interix fifo or socket. */
+			/* Check whether it's Interix FIFO or socket. */
 			if (!(ni->flags & FILE_ATTR_HIDDEN) &&
 					!stream_name_len) {
 				/* FIFO. */
@@ -369,7 +369,7 @@ static int ntfs_fuse_getattr(const char 
 					stbuf->st_mode = S_IFSOCK;
 			}
 			/*
-			 * Check wheter it's Interix symbolic link, block or
+			 * Check whether it's Interix symbolic link, block or
 			 * character device.
 			 */
 			if (na->data_size <= sizeof(INTX_FILE_TYPES) + sizeof(
@@ -682,7 +682,7 @@ static int ntfs_fuse_write(const char *o
 	}
 	res = total;
 exit:
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 	if (na)
 		ntfs_attr_close(na);
 	if (ni && ntfs_inode_close(ni))
@@ -718,7 +718,7 @@ static int ntfs_fuse_truncate(const char
 		goto exit;
 	}
 	res = ntfs_attr_truncate(na, size);
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 	ntfs_attr_close(na);
 exit:
 	if (ni && ntfs_inode_close(ni))
@@ -861,7 +861,7 @@ static int ntfs_fuse_mknod(const char *o
 	else
 		res = ntfs_fuse_create_stream(path, stream_name,
 				stream_name_len);
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 exit:
 	free(path);
 	if (stream_name_len)
@@ -915,7 +915,7 @@ static int ntfs_fuse_link(const char *ol
 			res = -EIO;
 		goto exit;
 	}
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 	/* Create hard link. */
 	if (ntfs_link(ni, dir_ni, uname, uname_len))
 		res = -errno;
@@ -1016,7 +1016,7 @@ static int ntfs_fuse_unlink(const char *
 		res = ntfs_fuse_rm(path);
 	else
 		res = ntfs_fuse_rm_stream(path, stream_name, stream_name_len);
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 	free(path);
 	if (stream_name_len)
 		free(stream_name);
@@ -1041,7 +1041,7 @@ static int ntfs_fuse_mkdir(const char *p
 {
 	if (ntfs_fuse_is_named_data_stream(path))
 		return -EINVAL; /* n/a for named data streams. */
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 	return ntfs_fuse_create(path, S_IFDIR, 0, NULL);
 }
 
@@ -1049,7 +1049,7 @@ static int ntfs_fuse_rmdir(const char *p
 {
 	if (ntfs_fuse_is_named_data_stream(path))
 		return -EINVAL; /* n/a for named data streams. */
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 	return ntfs_fuse_rm(path);
 }
 
@@ -1295,7 +1295,7 @@ static int ntfs_fuse_setxattr(const char
 		res = -EEXIST;
 		goto exit;
 	}
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 	if (!na) {
 		if (flags == XATTR_REPLACE) {
 			res = -ENODATA;
@@ -1355,7 +1355,7 @@ static int ntfs_fuse_removexattr(const c
 		res = -ENODATA;
 		goto exit;
 	}
-	ntfs_fuse_mark_free_space_outdate();
+	ntfs_fuse_mark_free_space_outdated();
 	if (ntfs_attr_rm(na))
 		res = -errno;
 	else
@@ -1466,7 +1466,7 @@ static char *parse_mount_options(const c
 	*ret = 0;
 	options = strdup(org_options);
 	if (!options) {
-		ntfs_log_perror("strdump failed");
+		ntfs_log_perror("strdup failed");
 		return NULL;
 	}
 	s = options;
@@ -1641,7 +1641,7 @@ static void usage(void)
 {
 	ntfs_log_info("\n%s v%s (libntfs %s) - NTFS module for FUSE.\n\n",
 			EXEC_NAME, VERSION, ntfs_libntfs_version());
-	ntfs_log_info("Copyright (c) 2005-2006 Yura Pakhuchiy\n\n");
+	ntfs_log_info("Copyright (C) 2005-2006 Yura Pakhuchiy\n\n");
 	ntfs_log_info("usage:  %s device mount_point [-o options]\n\n",
 			EXEC_NAME);
 	ntfs_log_info("ntfsmount options are:\n\tforce\n\tno_def_opts\n\tumask"
@@ -1862,7 +1862,7 @@ int main(int argc, char *argv[])
 			ntfs_log_error("Failed to daemonize.\n");
 		else {
 			ntfs_log_set_handler(ntfs_log_handler_syslog);
-			/* Override default libntfs ident. */
+			/* Override default libntfs identify. */
 			openlog(EXEC_NAME, LOG_PID, LOG_DAEMON);
 		}
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs NEWS,1.32,1.33

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv14908

Modified Files:
	NEWS 
Log Message:
Final test!


Index: NEWS
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/NEWS,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- NEWS	3 Feb 2006 22:19:17 -0000	1.32
+++ NEWS	1 May 2006 17:38:40 -0000	1.33
@@ -1,6 +1,8 @@
 Current news
 ============
 
+Moved CVS to linux-ntfs.org.
+
 mkntfs now creates NTFS 3.1 (Windows XP) volumes by default.  The old NTFS 1.2
 format is now deprecated and whilst it can still be specified using a command
 line option, it will be removed in a future release.

[Linux-NTFS-cvs] ChangeLog

[<yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv13249

Modified Files:
	ChangeLog 
Log Message:

[Linux-NTFS-cvs] CVS: ChangeLog

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv13045

Modified Files:
	ChangeLog 
Log Message:

[Linux-NTFS-cvs] CVS: ChangeLog

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv12062

Modified Files:
	ChangeLog 
Log Message:
test mails

[Linux-NTFS-cvs] CVS: ChangeLog

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv11827

Modified Files:
	ChangeLog 
Log Message:
it works!

[Linux-NTFS-cvs] CVS: ChangeLog

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv11797

Modified Files:
	ChangeLog 
Log Message:

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.375,1.376

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv11705

Modified Files:
	ChangeLog 
Log Message:
test commit to new repo


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -p -r1.375 -r1.376
--- ChangeLog	30 Apr 2006 19:27:09 -0000	1.375
+++ ChangeLog	30 Apr 2006 22:19:01 -0000	1.376
@@ -1,4 +1,4 @@
-xx/xx/2006 - 1.13.1-WIP 
+xx/xx/2006 - 1.13.1-WIP
 
 	- Fix bug in ntfs_attr_pwrite() when we sometimes lose current run in
 	  the runlist.  (Yura)

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.374,1.375

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv6683

Modified Files:
	ChangeLog 
Log Message:
test


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -p -r1.374 -r1.375
--- ChangeLog	30 Apr 2006 19:24:07 -0000	1.374
+++ ChangeLog	30 Apr 2006 19:27:09 -0000	1.375
@@ -1,4 +1,4 @@
-xx/xx/2006 - 1.13.1-WIP
+xx/xx/2006 - 1.13.1-WIP 
 
 	- Fix bug in ntfs_attr_pwrite() when we sometimes lose current run in
 	  the runlist.  (Yura)

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.373,1.374

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv6593

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -p -r1.373 -r1.374
--- ChangeLog	30 Apr 2006 19:18:06 -0000	1.373
+++ ChangeLog	30 Apr 2006 19:24:07 -0000	1.374
@@ -1,4 +1,4 @@
-xx/xx/2006 - 1.13.1-WIP 
+xx/xx/2006 - 1.13.1-WIP
 
 	- Fix bug in ntfs_attr_pwrite() when we sometimes lose current run in
 	  the runlist.  (Yura)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.82,1.83

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
This code should be in fuse, if should exist at all.


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- ntfsmount.c	27 Apr 2006 21:05:38 -0000	1.82
+++ ntfsmount.c	27 Apr 2006 22:22:05 -0000	1.83
@@ -1802,11 +1802,6 @@ int main(int argc, char *argv[])
 		ntfs_fuse_destroy();
 		return 4;
 	}
-
-	/* Libfuse can't always find fusermount, so let's help it. */
-	if (setenv("PATH", ":/bin:/usr/bin:/usr/local/bin", 0) == -1)
-		ntfs_log_perror("WARNING: Failed to set $PATH\n");
-
 	/* Create filesystem. */
 #if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
 	if ((fuse_opt_add_arg(&margs, "") == -1 ||

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.382,1.383

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

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
This code should be in fuse, if should exist at all.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -p -r1.382 -r1.383
--- ChangeLog	27 Apr 2006 21:05:38 -0000	1.382
+++ ChangeLog	27 Apr 2006 22:22:02 -0000	1.383
@@ -47,8 +47,6 @@ xx/xx/2006 - 1.13.1-WIP
 	  attribute completely and index entry (filename) completely and all in
 	  correct order.  Essential for hunting bugs in directory operations
 	  code...  (Anton)
-	- ntfsmount: workaround for libfuse not being able to find fusermount
-	  when user uses mount(8).
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.81,1.82

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

On Fri, 28 Apr 2006, Yura Pakhuchiy wrote:

> I'm against such workarounds in ntfsmount, if this is FUSE problem then
> it should be fixed there. 

I've already sent an email about common fuse problems to Miklos. 

Nevertheless whatever happens whenever, it won't solve the problem with 
old fuse releases and users keep failing to install and use ntfsmount.

> But, I guess this is user settings problem and they should fix their PATH 
> variable in /etc/profile or something.

That won't help because the PATH variable is removed during mount.

	Szaka