linux-ntfs-cvs Mailing List for Linux NTFS file system support (Page 19)

Development moved to https://sourceforge.net/projects/ntfs-3g/

Brought to you by: antona, cha0smaster

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

You can subscribe to this list here.

2001	_Jan (38)	_Feb (25)	_Mar (37)	_Apr (50)	_May	_Jun (156)	_Jul (174)	_Aug (94)	_Sep (107)	_Oct (18)	_Nov (153)	_Dec (91)
2002	_Jan (79)	_Feb (117)	_Mar (39)	_Apr (164)	_May (12)	_Jun (64)	_Jul (138)	_Aug (43)	_Sep	_Oct	_Nov	_Dec
2005	_Jan	_Feb	_Mar	_Apr (1)	_May (17)	_Jun (100)	_Jul (210)	_Aug (127)	_Sep (89)	_Oct (214)	_Nov (176)	_Dec (20)
2006	_Jan (29)	_Feb (85)	_Mar (45)	_Apr (54)	_May (9)	_Jun (7)	_Jul (28)	_Aug (65)	_Sep (3)	_Oct (62)	_Nov (68)	_Dec (52)
2007	_Jan (6)	_Feb	_Mar (8)	_Apr	_May	_Jun (2)	_Jul (4)	_Aug	_Sep	_Oct (2)	_Nov	_Dec

Flat | Threaded

<< < 1 .. 17 18 19 20 21 .. 124 > >> (Page 19 of 124)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.73,1.74

From: Szabolcs S. <sz...@us...> - 2006-02-06 22:17:32

Changes by: szaka

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

Modified Files:
	ntfsclone.c 
Log Message:
Wiped timestamp data stats were off by 5% in general


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- ntfsclone.c	6 Feb 2006 20:51:17 -0000	1.73
+++ ntfsclone.c	6 Feb 2006 22:17:24 -0000	1.74
@@ -729,6 +729,8 @@ static void wipe_index_root_timestamps(A
 			entry->key.file_name.last_data_change_time = timestamp;
 			entry->key.file_name.last_mft_change_time = timestamp;
 
+			wiped_timestamp_data += 32;
+
 		} else if (ntfs_names_are_equal(NTFS_INDEX_Q,
 				sizeof(NTFS_INDEX_Q) / 2 - 1,
 				(ntfschar *)((char *)attr +
@@ -740,11 +742,14 @@ static void wipe_index_root_timestamps(A
 			quota_q = (QUOTA_CONTROL_ENTRY *)((u8 *)entry +
 							  entry->data_offset);
 			/*
-			 *  FIXME: no guarantee it's indeed /$Extend/$Quota:$Q
-			 *  till we only check for quota version 2 ...
+			 *  FIXME: no guarantee it's indeed /$Extend/$Quota:$Q.
+			 *  For now, as a minimal safeguard, we check only for
+			 *  quota version 2 ...
 			 */
-			if (le32_to_cpu(quota_q->version) == 2)
+			if (le32_to_cpu(quota_q->version) == 2) {
 				quota_q->change_time = timestamp;
+				wiped_timestamp_data += 4;
+			}
 		}
 
 		entry = (INDEX_ENTRY*)((u8*)entry + le16_to_cpu(entry->length));

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.72,1.73

From: Szabolcs S. <sz...@us...> - 2006-02-06 20:51:28

Changes by: szaka

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

Modified Files:
	ntfsclone.c 
Log Message:
--metadata sets timestamps to the Epoch time as mkntfs does with -T. This 
increases the compressed image sizes by only 0.3-0.8% but ntfsclone creates
now the exact same metadata images as mkntfs, which fact can be used for QA.


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- ntfsclone.c	5 Feb 2006 22:10:01 -0000	1.72
+++ ntfsclone.c	6 Feb 2006 20:51:17 -0000	1.73
@@ -68,6 +68,7 @@
 #include "inode.h"
 #include "dir.h"
 #include "runlist.h"
+#include "ntfstime.h"
 #include "utils.h"
 #include "version.h"
 
@@ -710,7 +711,7 @@ static void restore_image(void)
 	}
 }
 
-static void wipe_index_root_timestamps(ATTR_RECORD *attr)
+static void wipe_index_root_timestamps(ATTR_RECORD *attr, s64 timestamp)
 {
 	INDEX_ENTRY *entry;
 	INDEX_ROOT *iroot;
@@ -723,10 +724,10 @@ static void wipe_index_root_timestamps(A
 
 		if (iroot->type == AT_FILE_NAME) {
 
-			entry->key.file_name.creation_time = 0;
-			entry->key.file_name.last_access_time = 0;
-			entry->key.file_name.last_data_change_time = 0;
-			entry->key.file_name.last_mft_change_time = 0;
+			entry->key.file_name.creation_time = timestamp;
+			entry->key.file_name.last_access_time = timestamp;
+			entry->key.file_name.last_data_change_time = timestamp;
+			entry->key.file_name.last_mft_change_time = timestamp;
 
 		} else if (ntfs_names_are_equal(NTFS_INDEX_Q,
 				sizeof(NTFS_INDEX_Q) / 2 - 1,
@@ -743,22 +744,22 @@ static void wipe_index_root_timestamps(A
 			 *  till we only check for quota version 2 ...
 			 */
 			if (le32_to_cpu(quota_q->version) == 2)
-				quota_q->change_time = 0;
+				quota_q->change_time = timestamp;
 		}
 
 		entry = (INDEX_ENTRY*)((u8*)entry + le16_to_cpu(entry->length));
 	}
 }
 
-#define WIPE_TIMESTAMPS(atype, attr)				\
+#define WIPE_TIMESTAMPS(atype, attr, timestamp)			\
 do {								\
 	atype *ats;						\
 	ats = (atype *)((char *)(attr) + (attr)->value_offset);	\
 								\
-	ats->creation_time = 0;					\
-	ats->last_data_change_time = 0;				\
-	ats->last_mft_change_time= 0;				\
-	ats->last_access_time = 0;				\
+	ats->creation_time = (timestamp);	       		\
+	ats->last_data_change_time = (timestamp);		\
+	ats->last_mft_change_time= (timestamp);			\
+	ats->last_access_time = (timestamp);			\
 								\
 	wiped_timestamp_data += 32;				\
 								\
@@ -767,15 +768,16 @@ do {								\
 static void wipe_timestamps(ntfs_walk_clusters_ctx *image)
 {
 	ATTR_RECORD *a = image->ctx->attr;
+	s64 timestamp = utc2ntfs(0);
 
 	if (a->type == AT_FILE_NAME)
-		WIPE_TIMESTAMPS(FILE_NAME_ATTR, a);
+		WIPE_TIMESTAMPS(FILE_NAME_ATTR, a, timestamp);
 
 	else if (a->type == AT_STANDARD_INFORMATION)
-		WIPE_TIMESTAMPS(STANDARD_INFORMATION, a);
+		WIPE_TIMESTAMPS(STANDARD_INFORMATION, a, timestamp);
 	
 	else if (a->type == AT_INDEX_ROOT)
-		wipe_index_root_timestamps(a);
+		wipe_index_root_timestamps(a, timestamp);
 }
 
 static void wipe_resident_data(ntfs_walk_clusters_ctx *image)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.8.in,1.24,1.25 ntfscat.8.in,1.13,1.14 ntfsclone.8.in,1.28,1.29 ntfscluster.8.in,1.13,1.14 ntfscp.8.in,1.12,1.13 ntfsfix.8.in,1.14,1.15 ntfsinfo.8.in,1.14,1.15 ntfslabel.8.in,1.10,1.11 ntfsls.8.in,1.13,1.14 ntfsmount.8.in,1.23,1.24 ntfsprogs.8.in,1.18,1.19 ntfsresize.8.in,1.34,1.35 ntfsundelete.8.in,1.20,1.21

From: Szabolcs S. <sz...@us...> - 2006-02-06 01:05:16

Changes by: szaka

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

Modified Files:
	mkntfs.8.in ntfscat.8.in ntfsclone.8.in ntfscluster.8.in 
	ntfscp.8.in ntfsfix.8.in ntfsinfo.8.in ntfslabel.8.in 
	ntfsls.8.in ntfsmount.8.in ntfsprogs.8.in ntfsresize.8.in 
	ntfsundelete.8.in 
Log Message:
Shorten 'ntfsprogs version @VERSION@' to only 'ntfsprogs @VERSION@' in the 
headers so it won't overwrite/overlap so easily with the update time in the
center if the @VERSION@ is too long (e.g. <VERSION>-WIP-<DATE>-<TIME>)


Index: mkntfs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.8.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- mkntfs.8.in	4 Feb 2006 23:21:49 -0000	1.24
+++ mkntfs.8.in	6 Feb 2006 01:05:01 -0000	1.25
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2005\-2006 Szabolcs Szakacsits.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH MKNTFS 8 "January 2006" "ntfsprogs version @VERSION@"
+.TH MKNTFS 8 "January 2006" "ntfsprogs @VERSION@"
 .SH NAME
 mkntfs \- create an NTFS file system
 .SH SYNOPSIS

Index: ntfscat.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.8.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ntfscat.8.in	8 Jan 2006 21:01:23 -0000	1.13
+++ ntfscat.8.in	6 Feb 2006 01:05:01 -0000	1.14
@@ -1,7 +1,7 @@
 .\" Copyright (c) 2003\-2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCAT 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSCAT 8 "November 2005" "ntfsprogs @VERSION@"
 .SH NAME
 ntfscat \- print NTFS files and streams on the standard output
 .SH SYNOPSIS

Index: ntfsclone.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.8.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntfsclone.8.in	6 Feb 2006 00:48:23 -0000	1.28
+++ ntfsclone.8.in	6 Feb 2006 01:05:01 -0000	1.29
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2004 Per Olofsson.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCLONE 8 "January 2006" "ntfsprogs version @VERSION@"
+.TH NTFSCLONE 8 "February 2006" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsclone \- Efficiently clone, image, restore or rescue an NTFS
 .SH SYNOPSIS
@@ -93,11 +93,10 @@ writing large amount of zeros to the dis
 can't create an archive from the standard input, you can't do this
 in\-place by just reading
 .BR ntfsclone
-standard output. Even more sadly, using this \-S option results 
+standard output. Even more sadly, using the \-S option results 
 serious data loss since the end of 2004 and the GNU
 .BR tar
-maintainers don't care about releasing fixed versions until the
-present day.
+maintainers didn't release fixed versions until the present day.
 .SS The Special Image Format
 It's also possible, actually it's recommended, to save an NTFS filesystem
 to a special image format.

Index: ntfscluster.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.8.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ntfscluster.8.in	8 Jan 2006 21:01:23 -0000	1.13
+++ ntfscluster.8.in	6 Feb 2006 01:05:01 -0000	1.14
@@ -1,7 +1,7 @@
 .\" Copyright (c) 2003\-2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCLUSTER 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSCLUSTER 8 "November 2005" "ntfsprogs @VERSION@"
 .SH NAME
 ntfscluster \- identify files in a specified region of an NTFS volume.
 .SH SYNOPSIS

Index: ntfscp.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.8.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ntfscp.8.in	8 Jan 2006 21:01:23 -0000	1.12
+++ ntfscp.8.in	6 Feb 2006 01:05:01 -0000	1.13
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCP 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSCP 8 "November 2005" "ntfsprogs @VERSION@"
 .SH NAME
 ntfscp \- overwrite file on an NTFS volume.
 .SH SYNOPSIS

Index: ntfsfix.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.8.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ntfsfix.8.in	8 Jan 2006 21:01:23 -0000	1.14
+++ ntfsfix.8.in	6 Feb 2006 01:05:01 -0000	1.15
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSFIX 8 "January 2006" "ntfsprogs version @VERSION@"
+.TH NTFSFIX 8 "January 2006" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsfix \- fix common errors and force Windows to check NTFS
 .SH SYNOPSIS

Index: ntfsinfo.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.8.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ntfsinfo.8.in	8 Jan 2006 21:01:23 -0000	1.14
+++ ntfsinfo.8.in	6 Feb 2006 01:05:01 -0000	1.15
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSINFO 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSINFO 8 "November 2005" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsinfo \- dump a file's attributes
 .SH SYNOPSIS

Index: ntfslabel.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.8.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfslabel.8.in	8 Jan 2006 21:01:23 -0000	1.10
+++ ntfslabel.8.in	6 Feb 2006 01:05:01 -0000	1.11
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSLABEL 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSLABEL 8 "November 2005" "ntfsprogs @VERSION@"
 .SH NAME
 ntfslabel \- display/change the label on an ntfs file system
 .SH SYNOPSIS

Index: ntfsls.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.8.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ntfsls.8.in	8 Jan 2006 21:01:23 -0000	1.13
+++ ntfsls.8.in	6 Feb 2006 01:05:01 -0000	1.14
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSLS 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSLS 8 "November 2005" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsls \- list directory contents on an NTFS filesystem
 .SH SYNOPSIS

Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ntfsmount.8.in	30 Jan 2006 21:53:42 -0000	1.23
+++ ntfsmount.8.in	6 Feb 2006 01:05:01 -0000	1.24
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSMOUNT 8 "January 2006" "ntfsprogs version @VERSION@"
+.TH NTFSMOUNT 8 "January 2006" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsmount \- NTFS module for FUSE.
 .SH SYNOPSIS

Index: ntfsprogs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsprogs.8.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ntfsprogs.8.in	8 Jan 2006 21:01:23 -0000	1.18
+++ ntfsprogs.8.in	6 Feb 2006 01:05:01 -0000	1.19
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2005 Szabolcs Szakacsits.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSPROGS 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSPROGS 8 "November 2005" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsprogs \- several tools for doing neat things with NTFS partitions
 .SH OVERVIEW

Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ntfsresize.8.in	8 Jan 2006 21:01:23 -0000	1.34
+++ ntfsresize.8.in	6 Feb 2006 01:05:01 -0000	1.35
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSRESIZE 8 "January 2006" "ntfsprogs version @VERSION@"
+.TH NTFSRESIZE 8 "January 2006" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsresize \- resize an NTFS filesystem without data loss
 .SH SYNOPSIS

Index: ntfsundelete.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.8.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ntfsundelete.8.in	8 Jan 2006 21:01:23 -0000	1.20
+++ ntfsundelete.8.in	6 Feb 2006 01:05:01 -0000	1.21
@@ -1,7 +1,7 @@
 .\" Copyright (c) 2002\-2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSUNDELETE 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSUNDELETE 8 "November 2005" "ntfsprogs @VERSION@"
 .SH NAME
 ntfsundelete \- recover a deleted file from an NTFS volume.
 .SH SYNOPSIS

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.8.in,1.27,1.28

From: Szabolcs S. <sz...@us...> - 2006-02-06 00:48:30

Changes by: szaka

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

Modified Files:
	ntfsclone.8.in 
Log Message:
Note tar brokenness, update examples


Index: ntfsclone.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.8.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ntfsclone.8.in	8 Jan 2006 21:01:23 -0000	1.27
+++ ntfsclone.8.in	6 Feb 2006 00:48:23 -0000	1.28
@@ -78,7 +78,7 @@ of view.
 
 At present the most efficient way, both speed and space\-wise, to
 compress and uncompress large sparse files by common tools
-is using
+would be using
 .BR tar (1)
 with the options
 .B \-S
@@ -93,7 +93,11 @@ writing large amount of zeros to the dis
 can't create an archive from the standard input, you can't do this
 in\-place by just reading
 .BR ntfsclone
-standard output.
+standard output. Even more sadly, using this \-S option results 
+serious data loss since the end of 2004 and the GNU
+.BR tar
+maintainers don't care about releasing fixed versions until the
+present day.
 .SS The Special Image Format
 It's also possible, actually it's recommended, to save an NTFS filesystem
 to a special image format.
@@ -129,7 +133,7 @@ mountable. In this case all non\-metadat
 reading them back will result always zeros.
 
 The metadata\-only image can be compressed very
-well, usually to not more than 1\-3 MB thus it's relatively easy to transfer
+well, usually to not more than 1\-8 MB thus it's easy to transfer
 for investigation, troubleshooting.
 
 In this mode of ntfsclone,
@@ -212,25 +216,31 @@ Show a list of options with a brief desc
 .SH EXIT CODES
 The exit code is 0 on success, non\-zero otherwise.
 .SH EXAMPLES
-Save an NTFS to a file in the special image format
+Clone NTFS on /dev/hda1 to /dev/hdc1:
+.RS
+.sp
+.B ntfsclone \-\-overwrite /dev/hdc1 /dev/hda1
+.sp
+.RE
+Save an NTFS to a file in the special image format:
 .RS
 .sp
 .B ntfsclone \-\-save\-image \-\-output backup.img /dev/hda1
 .sp
 .RE
-Restore an NTFS from a special image file to its original partition
+Restore an NTFS from a special image file to its original partition:
 .RS
 .sp
 .B ntfsclone \-\-restore\-image \-\-overwrite /dev/hda1 backup.img
 .sp
 .RE
-Save an NTFS into a compressed image.
+Save an NTFS into a compressed image file:
 .RS
 .sp
 .B ntfsclone \-\-save\-image \-o \- /dev/hda1 | gzip \-c > backup.img.gz
 .sp
 .RE
-Restore an NTFS volume from a compressed image file
+Restore an NTFS volume from a compressed image file:
 .RS
 .sp
 .B gunzip \-c backup.img.gz | \\\\
@@ -238,7 +248,8 @@ Restore an NTFS volume from a compressed
 .B ntfsclone \-\-restore\-image \-\-overwrite /dev/hda1 \-
 .sp
 .RE
-Backup an NTFS volume to a remote host, using ssh.
+Backup an NTFS volume to a remote host, using ssh. Please note, that 
+ssh may ask for a password!
 .RS
 .sp
 .B ntfsclone \-\-save\-image \-\-output \- /dev/hda1 | \\\\
@@ -246,7 +257,8 @@ Backup an NTFS volume to a remote host, 
 .B gzip \-c | ssh host 'cat > backup.img.gz'
 .sp
 .RE
-Restore an NTFS volume from a remote host via ssh.
+Restore an NTFS volume from a remote host via ssh. Please note, that 
+ssh may ask for a password!
 .RS
 .sp
 .B ssh host 'cat backup.img.gz' | gunzip \-c | \\\\
@@ -254,7 +266,7 @@ Restore an NTFS volume from a remote hos
 .B ntfsclone \-\-restore\-image \-\-overwrite /dev/hda1 \-
 .sp
 .RE
-Stream an image from a web server and restore it to a partition
+Stream an image file from a web server and restore it to a partition:
 .RS
 .sp
 .B wget \-qO \- http://server/backup.img | \\\\
@@ -262,18 +274,28 @@ Stream an image from a web server and re
 .B ntfsclone \-\-restore\-image \-\-overwrite /dev/hda1 \-
 .sp
 .RE
-Clone an NTFS volume to a non\-existent file
+Clone an NTFS volume to a non\-existent file:
 .RS
 .sp
 .B ntfsclone \-\-output ntfs\-clone.img /dev/hda1
 .sp
 .RE
-Pack NTFS metadata for NTFS experts
+Pack NTFS metadata for NTFS experts. Please note that bzip2 runs
+very long but results usually at least 10 times smaller archives 
+than gzip.
 .RS
 .sp
 .B ntfsclone \-\-metadata \-\-output ntfsmeta.img /dev/hda1
 .br
-.B tar \-cjSf ntfsmeta.img.tar.bz2 ntfsmeta.img
+.B bzip2 ntfsmeta.img
+.sp
+.RE
+Unpacking NTFS metadata into a sparse file:
+.RS
+.sp
+.B bunzip2 \-c ntfsmeta.img.bz2 | \\\\
+.br
+.B cp \-\-sparse=always /proc/self/fd/0 ntfsmeta.img
 .sp
 .RE
 .SH KNOWN ISSUES
@@ -281,7 +303,6 @@ There are no known problems with
 .BR ntfsclone .
 If you think you have found a problem then please send an email describing it
 to the development team:
-.br
 .nh
 linux\-ntfs\-de...@li...
 .hy

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.71,1.72

From: Szabolcs S. <sz...@us...> - 2006-02-05 22:10:15

Changes by: szaka

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

Modified Files:
	ntfsclone.c 
Log Message:
Explain dirty volume


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- ntfsclone.c	5 Feb 2006 19:35:20 -0000	1.71
+++ ntfsclone.c	5 Feb 2006 22:10:01 -0000	1.72
@@ -88,6 +88,10 @@ static const char *bad_sectors_warning_m
 "* Use the --rescue option to efficiently save as much data as possible! *\n"
 "*************************************************************************\n";
 
+static const char *dirty_volume_msg =
+"Volume '%s' is scheduled for a check or it was shutdown \n"
+"uncleanly. Please boot Windows or use the --force option to progress.\n";
+
 struct {
 	int verbose;
 	int quiet;
@@ -1215,8 +1219,7 @@ static void mount_volume(unsigned long n
 
 	if (vol->flags & VOLUME_IS_DIRTY)
 		if (opt.force-- <= 0)
-			err_exit("Volume is dirty. Run chkdsk and "
-				 "please try again (or see -f option).\n");
+			err_exit(dirty_volume_msg, opt.volume);
 
 	if (NTFS_MAX_CLUSTER_SIZE < vol->cluster_size)
 		err_exit("Cluster size %u is too large!\n",

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.70,1.71

From: Szabolcs S. <sz...@us...> - 2006-02-05 19:35:28

Changes by: szaka

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

Modified Files:
	ntfsclone.c 
Log Message:
Write MFT records with the same USN during metadata cloning. This eases 
ntfsclone self-regression, which itself is going to validate other codes


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- ntfsclone.c	5 Feb 2006 16:39:35 -0000	1.70
+++ ntfsclone.c	5 Feb 2006 19:35:20 -0000	1.71
@@ -1006,6 +1006,19 @@ static void wipe_unused_mft(ntfs_inode *
 	wiped_unused_mft += wipe_data((char *)m, sizeof(MFT_RECORD), unused);
 }
 
+static void mft_record_write_with_same_usn(ntfs_volume *volume, ntfs_inode *ni)
+{
+	u16 usn, *usnp;
+	
+	usnp = (u16 *)((char *)ni->mrec + le16_to_cpu(ni->mrec->usa_ofs));
+	usn = le16_to_cpup(usnp);
+	if (usn-- <= 1)
+		usn = 0xfffe;
+	*usnp = cpu_to_le16(usn);
+	
+	if (ntfs_mft_record_write(volume, ni->mft_no, ni->mrec))
+		perr_exit("ntfs_mft_record_write");
+}
 
 static int walk_clusters(ntfs_volume *volume, struct ntfs_walk_cluster *walk)
 {
@@ -1049,8 +1062,7 @@ static int walk_clusters(ntfs_volume *vo
 			if (wipe) {
 				wipe_unused_mft(ni);
 				wipe_unused_mft_data(ni);
-				if (ntfs_mft_record_write(volume, ni->mft_no, ni->mrec))
-					perr_exit("ntfs_mft_record_write");
+				mft_record_write_with_same_usn(volume, ni);
 			}
 		}
 
@@ -1079,8 +1091,7 @@ static int walk_clusters(ntfs_volume *vo
 out:
 		if (wipe) {
 			wipe_unused_mft_data(ni);
-			if (ntfs_mft_record_write(volume, ni->mft_no, ni->mrec))
-				perr_exit("ntfs_mft_record_write");
+			mft_record_write_with_same_usn(volume, ni);
 		}
 
 		if (ntfs_inode_close(ni))

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.105,1.106

From: Szabolcs S. <sz...@us...> - 2006-02-05 18:56:18

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
Dump MFT Record Header fields which weren't yet


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- ntfsinfo.c	3 Feb 2006 18:44:13 -0000	1.105
+++ ntfsinfo.c	5 Feb 2006 18:56:04 -0000	1.106
@@ -2046,14 +2046,20 @@ static void ntfs_dump_inode_general_info
 
 	printf("Dumping Inode #%llu\n",(long long)inode->mft_no);
 
+	printf("Update Sequence Offset:\t %hu\n",
+		le16_to_cpu(inode->mrec->usa_ofs));
 	printf("Update Sequence Array Count:\t %hu\n",
 		le16_to_cpu(inode->mrec->usa_count));
-	printf("$LogFile seqNum for this Inode:\t 0x%llx\n",
+	printf("Update Sequence Number:\t %hu\n",
+		*(u16*)((u8*)inode->mrec + le16_to_cpu(inode->mrec->usa_ofs)));
+	printf("$LogFile Sequence Number:\t 0x%llx\n",
 		(signed long long int)sle64_to_cpu(inode->mrec->lsn));
-	printf("Number of times reused:\t\t %hu\n",
+	printf("MFT Record Sequence Number:\t %hu\n",
 		(short unsigned int)le16_to_cpu(inode->mrec->sequence_number));
 	printf("Number of hard links:\t\t %hu\n",
 		le16_to_cpu(inode->mrec->link_count));
+	printf("First attribute offset:\t %hu\n",
+		le16_to_cpu(inode->mrec->attrs_offset));
 
 	printf("MFT record Flags:\t\t ");
 	if (inode_flags) {
@@ -2090,7 +2096,7 @@ static void ntfs_dump_inode_general_info
 		printf("base MFT record:\t\t %llu\n",
 			MREF_LE(inode->mrec->base_mft_record));
 	}
-	printf("Next Attribute Instance Num\t %hu\n",
+	printf("Next Attribute Instance:\t %hu\n",
 		le16_to_cpu(inode->mrec->next_attr_instance));
 }

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.353,1.354

From: Szabolcs S. <sz...@us...> - 2006-02-05 16:39:44

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
ntfsresize, ntfsclone: always use MS_NOATIME


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -p -r1.353 -r1.354
--- ChangeLog	4 Feb 2006 22:56:13 -0000	1.353
+++ ChangeLog	5 Feb 2006 16:39:35 -0000	1.354
@@ -115,6 +115,7 @@
 	  record size to be below or equal to the system page size which we
 	  determine using sysconf()).  (Anton)
 	- Fix tons of big-endian bugs in mkntfs.  (Anton)
+	- ntfsresize, ntfsclone: always use MS_NOATIME.  (Szaka)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.69,1.70 ntfsresize.c,1.108,1.109

From: Szabolcs S. <sz...@us...> - 2006-02-05 16:39:43

Changes by: szaka

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

Modified Files:
	ntfsclone.c ntfsresize.c 
Log Message:
ntfsresize, ntfsclone: always use MS_NOATIME


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- ntfsclone.c	27 Nov 2005 12:31:39 -0000	1.69
+++ ntfsclone.c	5 Feb 2006 16:39:35 -0000	1.70
@@ -1603,7 +1603,7 @@ int main(int argc, char **argv)
 	/* 'force' again mount for dirty volumes (e.g. after resize).
 	   FIXME: use mount flags to avoid potential side-effects in future */
 	opt.force++;
-	mount_volume(0);
+	mount_volume(MS_NOATIME);
 
 	free(lcn_bitmap.bm);
 	setup_lcn_bitmap();

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- ntfsresize.c	4 Feb 2006 13:39:19 -0000	1.108
+++ ntfsresize.c	5 Feb 2006 16:39:35 -0000	1.109
@@ -2251,7 +2251,7 @@ static ntfs_volume *mount_volume(void)
 				 "You must 'umount' it first.\n", opt.volume);
 	}
 
-	if (!(vol = ntfs_mount(opt.volume, opt.ro_flag))) {
+	if (!(vol = ntfs_mount(opt.volume, opt.ro_flag | MS_NOATIME))) {
 
 		int err = errno;

[Linux-NTFS-cvs] CVS: ntfsprogs CREDITS,1.24,1.25

From: Szabolcs S. <sz...@us...> - 2006-02-04 23:22:00

Changes by: szaka

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

Modified Files:
	CREDITS 
Log Message:
Credit Erik Sornes for implementing NTFS 3.x version support for mkntfs


Index: CREDITS
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/CREDITS,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- CREDITS	6 Apr 2005 15:57:09 -0000	1.24
+++ CREDITS	4 Feb 2006 23:21:48 -0000	1.25
@@ -29,7 +29,8 @@ Per Olofsson <pe...@ds...>
 Yura Pakhuchiy <pak...@gm...>
 Yuri Per <yu...@ac...>
 Richard Russon <nt...@fl...>
-Szakacsits Szabolcs <sz...@si...>
+Erik Sørnes <ers...@ya...>
+Szabolcs Szakacsits <sz...@si...>
 
 Also, various code snippets and especially the autoconf/automake automated
 configuration, compilation and installation system have been ripped shamelessly

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.8.in,1.23,1.24

From: Szabolcs S. <sz...@us...> - 2006-02-04 23:22:00

Changes by: szaka

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

Modified Files:
	mkntfs.8.in 
Log Message:
Credit Erik Sornes for implementing NTFS 3.x version support for mkntfs


Index: mkntfs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.8.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mkntfs.8.in	3 Feb 2006 22:19:20 -0000	1.23
+++ mkntfs.8.in	4 Feb 2006 23:21:49 -0000	1.24
@@ -279,8 +279,7 @@ linux\-ntfs\-de...@li...
 .hy
 .SH AUTHORS
 .B mkntfs
-was written by Anton Altaparmakov, Richard Russon and Szabolcs Szakacsits, with
-contributions from Erik Sornes.
+was written by Anton Altaparmakov, Richard Russon, Erik Sornes and Szabolcs Szakacsits.
 .SH AVAILABILITY
 .B mkntfs
 is part of the

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.352,1.353

From: Szabolcs S. <sz...@us...> - 2006-02-04 22:56:22

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
Explain the tons of mkntfs bugs


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -p -r1.352 -r1.353
--- ChangeLog	4 Feb 2006 05:42:59 -0000	1.352
+++ ChangeLog	4 Feb 2006 22:56:13 -0000	1.353
@@ -114,7 +114,7 @@
 	  mountable by the kernel driver (it requires mft record size and index
 	  record size to be below or equal to the system page size which we
 	  determine using sysconf()).  (Anton)
-	- Fix tons of bugs in mkntfs.  (Anton)
+	- Fix tons of big-endian bugs in mkntfs.  (Anton)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.135,1.136

From: Szabolcs S. <sz...@us...> - 2006-02-04 19:53:30

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Remove old, redundant g_mft_size calculation


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- mkntfs.c	4 Feb 2006 05:42:59 -0000	1.135
+++ mkntfs.c	4 Feb 2006 19:53:22 -0000	1.136
@@ -3794,8 +3794,6 @@ static BOOL mkntfs_initialize_bitmaps(vo
 	else
 		g_mft_size = 16;
 	g_mft_size *= g_vol->mft_record_size;
-	g_mft_size = ((16 + 11 * (g_vol->major_ver >= 3)) *
-			g_vol->mft_record_size);
 	if (g_mft_size < (s32)g_vol->cluster_size)
 		g_mft_size = g_vol->cluster_size;
 	ntfs_log_debug("MFT size = %i (0x%x) bytes\n", g_mft_size, g_mft_size);

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs device.c,1.27,1.28

From: Szabolcs S. <sz...@us...> - 2006-02-04 19:24:21

Changes by: szaka

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

Modified Files:
	device.c 
Log Message:
fix ntfs_device_sector_size_get() description


Index: device.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/device.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- device.c	3 Feb 2006 23:55:40 -0000	1.27
+++ device.c	4 Feb 2006 19:24:14 -0000	1.28
@@ -692,8 +692,8 @@ int ntfs_device_sector_size_get(struct n
  *
  * The following error codes are defined:
  *	EINVAL		Input parameter error
- *	EOPNOTSUPP	System does not support HDIO_GETGEO ioctl
- *	ENOTTY		@dev is a file or a device not supporting HDIO_GETGEO
+ *	EOPNOTSUPP	System does not support BLKBSZSET ioctl
+ *	ENOTTY		@dev is a file or a device not supporting BLKBSZSET
  */
 int ntfs_device_block_size_set(struct ntfs_device *dev,
 		int block_size __attribute__((unused)))

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.107,1.108

From: Szabolcs S. <sz...@us...> - 2006-02-04 13:39:30

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Fix typo


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- ntfsresize.c	4 Feb 2006 13:34:37 -0000	1.107
+++ ntfsresize.c	4 Feb 2006 13:39:19 -0000	1.108
@@ -104,7 +104,7 @@ static const char *unclean_journal_msg =
 "using this software! Note, if you have run chkdsk previously then boot\n"
 "Windows again which will automatically initialize the journal correctly.\n";
 
-static const char *opened_volue_msg =
+static const char *opened_volume_msg =
 "This software has detected that the NTFS volume is already opened by another\n"
 "software thus it refuses to progress to preserve data consistency.\n";
 
@@ -2265,7 +2265,7 @@ static ntfs_volume *mount_volume(void)
 		else if (err == EOPNOTSUPP)
 			printf("%s", unclean_journal_msg);
 		else if (err == EBUSY)
-			printf("%s", opened_volue_msg);
+			printf("%s", opened_volume_msg);
 		exit(1);
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.106,1.107

From: Szabolcs S. <sz...@us...> - 2006-02-04 13:34:44

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Explain EBUSY if volume opening failed


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- ntfsresize.c	18 Dec 2005 16:27:21 -0000	1.106
+++ ntfsresize.c	4 Feb 2006 13:34:37 -0000	1.107
@@ -104,6 +104,10 @@ static const char *unclean_journal_msg =
 "using this software! Note, if you have run chkdsk previously then boot\n"
 "Windows again which will automatically initialize the journal correctly.\n";
 
+static const char *opened_volue_msg =
+"This software has detected that the NTFS volume is already opened by another\n"
+"software thus it refuses to progress to preserve data consistency.\n";
+
 static const char *bad_sectors_warning_msg =
 "****************************************************************************\n"
 "* WARNING: The disk has bad sector. This means physical damage on the disk *\n"
@@ -2260,6 +2264,8 @@ static ntfs_volume *mount_volume(void)
 			printf("%s", hibernated_volume_msg);
 		else if (err == EOPNOTSUPP)
 			printf("%s", unclean_journal_msg);
+		else if (err == EBUSY)
+			printf("%s", opened_volue_msg);
 		exit(1);
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs upcase.c,1.11,1.12

From: Anton A. <an...@us...> - 2006-02-04 06:11:37

Changes by: antona

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

Modified Files:
	upcase.c 
Log Message:
Don't do it at the end and do it as we go along instead as I am already doing
in the kernel driver.


Index: upcase.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/upcase.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- upcase.c	4 Feb 2006 06:06:04 -0000	1.11
+++ upcase.c	4 Feb 2006 06:11:28 -0000	1.12
@@ -75,18 +75,16 @@ void init_upcase_table(ntfschar *uc, u32
 
 	memset(uc, 0, uc_len);
 	uc_len >>= 1;
-	/* Generate the upcase table in cpu byte order. */
+	/* Generate the little endian Unicode upcase table used by ntfs. */
 	for (i = 0; (u32)i < uc_len; i++)
-		uc[i] = i;
+		uc[i] = cpu_to_le16(i);
 	for (r = 0; uc_run_table[r][0]; r++)
 		for (i = uc_run_table[r][0]; i < uc_run_table[r][1]; i++)
-			uc[i] += uc_run_table[r][2];
+			uc[i] = cpu_to_le16(le16_to_cpu(uc[i]) +
+					uc_run_table[r][2]);
 	for (r = 0; uc_dup_table[r][0]; r++)
 		for (i = uc_dup_table[r][0]; i < uc_dup_table[r][1]; i += 2)
-			uc[i + 1]--;
+			uc[i + 1] = cpu_to_le16(le16_to_cpu(uc[i + 1]) - 1);
 	for (r = 0; uc_byte_table[r][0]; r++)
-		uc[uc_byte_table[r][0]] = uc_byte_table[r][1];
-	/* Convert the upcase table from cpu byte order to little endian. */
-	for (i = 0; (u32)i < uc_len; i++)
-		uc[i] = cpu_to_le16(uc[i]);
+		uc[uc_byte_table[r][0]] = cpu_to_le16(uc_byte_table[r][1]);
 }

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs upcase.c,1.10,1.11

From: Anton A. <an...@us...> - 2006-02-04 06:06:13

Changes by: antona

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

Modified Files:
	upcase.c 
Log Message:
Fix upcase table to be little endian.  With this bug fixed the volumes produced
by mkntfs on little and big endian machines are identical (except for the
volume serial number - probably ought to standardize that when using the -T
switch).


Index: upcase.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/upcase.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- upcase.c	21 Oct 2005 18:05:14 -0000	1.10
+++ upcase.c	4 Feb 2006 06:06:04 -0000	1.11
@@ -2,9 +2,7 @@
  * upcase - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2001 Richard Russon
- * Copyright (c) 2001-2004 Anton Altaparmakov
- *
- * Modified for mkntfs inclusion 9 June 2001 by Anton Altaparmakov.
+ * Copyright (c) 2001-2006 Anton Altaparmakov
  *
  * 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
@@ -28,6 +26,7 @@
 #include <string.h>
 #endif
 
+#include "endians.h"
 #include "types.h"
 #include "upcase.h"
 
@@ -74,8 +73,9 @@ void init_upcase_table(ntfschar *uc, u32
 	};
 	int i, r;
 
-	memset((char*)uc, 0, uc_len);
+	memset(uc, 0, uc_len);
 	uc_len >>= 1;
+	/* Generate the upcase table in cpu byte order. */
 	for (i = 0; (u32)i < uc_len; i++)
 		uc[i] = i;
 	for (r = 0; uc_run_table[r][0]; r++)
@@ -86,5 +86,7 @@ void init_upcase_table(ntfschar *uc, u32
 			uc[i + 1]--;
 	for (r = 0; uc_byte_table[r][0]; r++)
 		uc[uc_byte_table[r][0]] = uc_byte_table[r][1];
+	/* Convert the upcase table from cpu byte order to little endian. */
+	for (i = 0; (u32)i < uc_len; i++)
+		uc[i] = cpu_to_le16(uc[i]);
 }
-

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.134,1.135 sd.c,1.12,1.13

From: Anton A. <an...@us...> - 2006-02-04 05:43:08

Changes by: antona

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

Modified Files:
	mkntfs.c sd.c 
Log Message:
Tons of bug fixes to mkntfs.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- mkntfs.c	3 Feb 2006 23:52:55 -0000	1.134
+++ mkntfs.c	4 Feb 2006 05:42:59 -0000	1.135
@@ -791,6 +791,9 @@ static void dump_resident_attr_val(ATTR_
 		return;
 	case AT_INDEX_ROOT:
 		/* TODO */
+		printf("collation_rule %u\n", le32_to_cpu(((INDEX_ROOT*)val)->collation_rule));
+		printf("index.entries_offset %u\n", le32_to_cpu(((INDEX_ROOT*)val)->index.entries_offset));
+		printf("index.index_length %u\n", le32_to_cpu(((INDEX_ROOT*)val)->index.index_length));
 		printf("%s\n", todo);
 		return;
 	case AT_INDEX_ALLOCATION:
@@ -909,7 +912,7 @@ static void dump_attr_record(ATTR_RECORD
 	printf("-- Beginning dump of attribute record. --\n");
 	if (a->type == AT_END) {
 		printf("Attribute type = 0x%x ($END)\n",
-				(unsigned int)le32_to_cpu(AT_END));
+				(unsigned int)const_le32_to_cpu(AT_END));
 		u = le32_to_cpu(a->length);
 		printf("Length of resident part = %u (0x%x)\n", u, u);
 		return;
@@ -1959,8 +1962,8 @@ static int insert_resident_attr_in_mft_r
 	a->length = cpu_to_le32(asize);
 	a->non_resident = 0;
 	a->name_length = name_len;
-	a->name_offset = cpu_to_le16(24);
-	a->flags = cpu_to_le16(flags);
+	a->name_offset = const_cpu_to_le16(24);
+	a->flags = flags;
 	a->instance = m->next_attr_instance;
 	m->next_attr_instance = cpu_to_le16((le16_to_cpu(m->next_attr_instance)
 			+ 1) & 0xffff);
@@ -2305,24 +2308,24 @@ static int add_attr_index_root(MFT_RECOR
 				opts.sector_size;
 	}
 	memset(&r->reserved, 0, sizeof(r->reserved));
-	r->index.entries_offset = cpu_to_le32(sizeof(INDEX_HEADER));
-	r->index.index_length = cpu_to_le32(sizeof(INDEX_HEADER) +
+	r->index.entries_offset = const_cpu_to_le32(sizeof(INDEX_HEADER));
+	r->index.index_length = const_cpu_to_le32(sizeof(INDEX_HEADER) +
 			sizeof(INDEX_ENTRY_HEADER));
 	r->index.allocated_size = r->index.index_length;
 	r->index.flags = SMALL_INDEX;
 	memset(&r->index.reserved, 0, sizeof(r->index.reserved));
-	e = (INDEX_ENTRY_HEADER*)((char*)&r->index +
+	e = (INDEX_ENTRY_HEADER*)((u8*)&r->index +
 			le32_to_cpu(r->index.entries_offset));
 	/*
 	 * No matter whether this is a file index or a view as this is a
 	 * termination entry, hence no key value / data is associated with it
 	 * at all. Thus, we just need the union to be all zero.
 	 */
-	e->indexed_file = cpu_to_le64(0LL);
-	e->length = cpu_to_le16(sizeof(INDEX_ENTRY_HEADER));
-	e->key_length = cpu_to_le16(0);
+	e->indexed_file = const_cpu_to_le64(0LL);
+	e->length = const_cpu_to_le16(sizeof(INDEX_ENTRY_HEADER));
+	e->key_length = const_cpu_to_le16(0);
 	e->flags = INDEX_ENTRY_END;
-	e->reserved = cpu_to_le16(0);
+	e->reserved = const_cpu_to_le16(0);
 	err = insert_resident_attr_in_mft_record(m, AT_INDEX_ROOT, name,
 				name_len, ic, 0, 0, (u8*)r, val_len);
 	free(r);
@@ -2620,80 +2623,72 @@ static int make_room_for_index_entry_in_
  * not all types of COLLATION_RULES supported yet...
  * added as needed.. (remove this comment when all are added)
  */
-static int ntfs_index_keys_compare(char *key1, char *key2,
-				   int key1_length,int key2_length,
-				   COLLATION_RULES collation_rule)
+static int ntfs_index_keys_compare(u8 *key1, u8 *key2, int key1_length,
+		int key2_length, COLLATION_RULES collation_rule)
 {
-	int i = 0;
-	int j = 0;
+	u32 u1, u2;
+	int i;
 
 	if (collation_rule == COLLATION_NTOFS_ULONG) {
 		/* i.e. $SII or $QUOTA-$Q */
-		while ((j < min(key1_length, key2_length)) && (i == 0)) {
-			if (*(u32*)(key1 + j) < *(u32*)(key2 + j))
-				i = -1;
-			if (*(u32*)(key1 + j) > *(u32*)(key2 + j))
-				i = +1;
-			if (*(u32*)(key1 + j) == *(u32*)(key2 + j)) {
-				i = 0;
-				j += 4;
-			}
-		}
-		if ((i == 0) && (key1_length > key2_length))
-			i = -1;
-		if ((i == 0) && (key1_length < key2_length))
-			i = +1;
-
-		return i;
+		u1 = le32_to_cpup(key1);
+		u2 = le32_to_cpup(key2);
+		if (u1 < u2)
+			return -1;
+		if (u1 > u2)
+			return 1;
+		/* u1 == u2 */
+		return 0;
 	}
-
 	if (collation_rule == COLLATION_NTOFS_ULONGS) {
 		/* i.e $OBJID-$O */
-		while ((j < min(key1_length, key2_length)) && (i == 0)) {
-			if (bswap_32(*(u32*)(key1 + j)) < bswap_32(*(u32*)(key1 + j)))
-				i = -1;
-			if (bswap_32(*(u32*)(key1 + j)) > bswap_32(*(u32*)(key1 + j)))
-				i = +1;
-			if (bswap_32(*(u32*)(key1 + j)) == bswap_32(*(u32*)(key1 + j))) {
-				i = 0;
-				j += 4;
-			}
+		i = 0;
+		while (i < min(key1_length, key2_length)) {
+			u1 = le32_to_cpup(key1 + i);
+			u2 = le32_to_cpup(key2 + i);
+			if (u1 < u2)
+				return -1;
+			if (u1 > u2)
+				return 1;
+			/* u1 == u2 */
+			i += sizeof(u32);
 		}
-		if ((i == 0) && (key1_length > key2_length))
-			i = -1;
-		if ((i == 0) && (key1_length < key2_length))
-			i = +1;
-
-		return i;
+		if (key1_length < key2_length)
+			return -1;
+		if (key1_length > key2_length)
+			return 1;
+		return 0;
 	}
 	if (collation_rule == COLLATION_NTOFS_SECURITY_HASH) {
 		/* i.e. $SDH */
-		if (((SDH_INDEX_KEY*)key1)->hash < ((SDH_INDEX_KEY*)key2)->hash)
-			i = -1;
-		if (((SDH_INDEX_KEY*)key1)->hash > ((SDH_INDEX_KEY*)key2)->hash)
-			i = +1;
-		if (((SDH_INDEX_KEY*)key1)->hash == ((SDH_INDEX_KEY*)key2)->hash) {
-			if (((SDH_INDEX_KEY*)key1)->security_id < ((SDH_INDEX_KEY*)key2)->security_id)
-				i = -1;
-			if (((SDH_INDEX_KEY*)key1)->security_id > ((SDH_INDEX_KEY*)key2)->security_id)
-				i = +1;
-			if (((SDH_INDEX_KEY*)key1)->security_id == ((SDH_INDEX_KEY*)key2)->security_id)
-				i = 0;
-		}
-		return i;
+		u1 = le32_to_cpu(((SDH_INDEX_KEY*)key1)->hash);
+		u2 = le32_to_cpu(((SDH_INDEX_KEY*)key2)->hash);
+		if (u1 < u2)
+			return -1;
+		if (u1 > u2)
+			return 1;
+		/* u1 == u2 */
+		u1 = le32_to_cpu(((SDH_INDEX_KEY*)key1)->security_id);
+		u2 = le32_to_cpu(((SDH_INDEX_KEY*)key2)->security_id);
+		if (u1 < u2)
+			return -1;
+		if (u1 > u2)
+			return 1;
+		return 0;
 	}
 	if (collation_rule == COLLATION_NTOFS_SID) {
 		/* i.e. $QUOTA-O */
 		i = memcmp(key1, key2, min(key1_length, key2_length));
-		if ((i == 0) && (key1_length > key2_length))
-			i = -1;
-		if ((i == 0) && (key1_length < key2_length))
-			i = +1;
-
+		if (!i) {
+			if (key1_length < key2_length)
+				return -1;
+			if (key1_length > key2_length)
+				return 1;
+		}
 		return i;
 	}
 	ntfs_log_critical("ntfs_index_keys_compare called without supported "
-		"collation rule.\n");
+			"collation rule.\n");
 	return 0;	/* Claim they're equal.  What else can we do? */
 }
 
@@ -2703,9 +2698,8 @@ static int ntfs_index_keys_compare(char 
  * i.e. insert an index_entry in some named index_root
  * simplified search method, works for mkntfs
  */
-static int insert_index_entry_in_res_dir_index(INDEX_ENTRY *idx,
-		u32 idx_size, MFT_RECORD *m, ntfschar *name, u32 name_size,
-		ATTR_TYPES type)
+static int insert_index_entry_in_res_dir_index(INDEX_ENTRY *idx, u32 idx_size,
+		MFT_RECORD *m, ntfschar *name, u32 name_size, ATTR_TYPES type)
 {
 	ntfs_attr_search_ctx *ctx;
 	INDEX_HEADER *idx_header;
@@ -2716,43 +2710,42 @@ static int insert_index_entry_in_res_dir
 
 	err = 0;
 	/* does it fit ?*/
-	if (g_vol->mft_record_size > idx_size + m->bytes_allocated)
+	if (g_vol->mft_record_size > idx_size + le32_to_cpu(m->bytes_allocated))
 		return -ENOSPC;
-
 	/* find the INDEX_ROOT attribute:*/
 	ctx = ntfs_attr_get_search_ctx(NULL, m);
-		if (!ctx) {
-		ntfs_log_error("Failed to allocate attribute search context.\n");
+	if (!ctx) {
+		ntfs_log_error("Failed to allocate attribute search "
+				"context.\n");
 		err = -ENOMEM;
 		goto err_out;
 	}
-	if (mkntfs_attr_lookup(AT_INDEX_ROOT, name, name_size, 0, 0,
-		NULL, 0, ctx)) {
-		err = EEXIST;
+	if (mkntfs_attr_lookup(AT_INDEX_ROOT, name, name_size, 0, 0, NULL, 0,
+			ctx)) {
+		err = -EEXIST;
 		goto err_out;
 	}
 	/* found attribute */
 	a = (ATTR_RECORD*)ctx->attr;
-	collation_rule = ((INDEX_ROOT*)((char*)a +
-		le16_to_cpu(a->value_offset)))->collation_rule;
-	idx_header = (INDEX_HEADER*)((char*)a + le16_to_cpu(a->value_offset)
-		+ le16_to_cpu(0x10));
-	idx_entry = (INDEX_ENTRY*)((char*)idx_header +
-		le16_to_cpu((idx_header)->entries_offset));
-	idx_end = (INDEX_ENTRY*)((char*)idx_entry +
-		le32_to_cpu(idx_header->index_length));
+	collation_rule = ((INDEX_ROOT*)((u8*)a +
+			le16_to_cpu(a->value_offset)))->collation_rule;
+	idx_header = (INDEX_HEADER*)((u8*)a + le16_to_cpu(a->value_offset)
+			+ 0x10);
+	idx_entry = (INDEX_ENTRY*)((u8*)idx_header +
+			le32_to_cpu(idx_header->entries_offset));
+	idx_end = (INDEX_ENTRY*)((u8*)idx_entry +
+			le32_to_cpu(idx_header->index_length));
 	/*
 	 * Loop until we exceed valid memory (corruption case) or until we
 	 * reach the last entry.
 	 */
-
 	if (type == AT_FILE_NAME) {
-		 while ((char*)idx_entry < (char*)idx_end &&
-				!(idx_entry->flags & INDEX_ENTRY_END)) {
-			i = ntfs_file_values_compare(
-				(FILE_NAME_ATTR*)&idx->key.file_name,
-				(FILE_NAME_ATTR*)&idx_entry->key.file_name, 1,
-				IGNORE_CASE, g_vol->upcase, g_vol->upcase_len);
+		 while (((u8*)idx_entry < (u8*)idx_end) &&
+				 !(idx_entry->flags & INDEX_ENTRY_END)) {
+			i = ntfs_file_values_compare(&idx->key.file_name,
+					&idx_entry->key.file_name, 1,
+					IGNORE_CASE, g_vol->upcase,
+					g_vol->upcase_len);
 			/*
 			 * If @file_name collates before ie->key.file_name,
 			 * there is no matching index entry.
@@ -2762,55 +2755,53 @@ static int insert_index_entry_in_res_dir
 			/* If file names are not equal, continue search. */
 			if (i)
 				goto do_next;
-			if (((FILE_NAME_ATTR*)&idx->key.file_name)->
-				file_name_type != FILE_NAME_POSIX ||
-				idx_entry->key.file_name.file_name_type
-				!= FILE_NAME_POSIX)
-					return -EEXIST;
-
-			i = ntfs_file_values_compare((FILE_NAME_ATTR*)&idx->
-				key.file_name,
-				(FILE_NAME_ATTR*)&idx_entry->key.file_name, 1,
-				CASE_SENSITIVE, g_vol->upcase, g_vol->upcase_len);
-			if (i == -1)
-				break;
-			/* Complete match. Bugger. Can't insert. */
-#if 0
+			if (idx->key.file_name.file_name_type !=
+					FILE_NAME_POSIX ||
+					idx_entry->key.file_name.file_name_type
+					!= FILE_NAME_POSIX)
+				return -EEXIST;
+			i = ntfs_file_values_compare(&idx->key.file_name,
+					&idx_entry->key.file_name, 1,
+					CASE_SENSITIVE, g_vol->upcase,
+					g_vol->upcase_len);
 			if (!i)
 				return -EEXIST;
-#endif
+			if (i == -1)
+				break;
 do_next:
-			idx_entry = (INDEX_ENTRY*)((char*)idx_entry +
-				le16_to_cpu(idx_entry->length));
+			idx_entry = (INDEX_ENTRY*)((u8*)idx_entry +
+					le16_to_cpu(idx_entry->length));
 		}
 	} else if (type == AT_UNUSED) {  /* case view */
-		while ((char*)idx_entry < (char*)idx_end && !(idx_entry->flags
-				& INDEX_ENTRY_END)) {
-			i = ntfs_index_keys_compare((char*)idx_entry + 0x10,
-				(char*)idx + 0x10,
-				idx_entry->key_length, idx->key_length, collation_rule);
+		while (((u8*)idx_entry < (u8*)idx_end) &&
+				!(idx_entry->flags & INDEX_ENTRY_END)) {
+			i = ntfs_index_keys_compare((u8*)idx + 0x10,
+					(u8*)idx_entry + 0x10,
+					le16_to_cpu(idx->key_length),
+					le16_to_cpu(idx_entry->key_length),
+					collation_rule);
 			if (!i)
 				return -EEXIST;
-			if (i == 1)
+			if (i == -1)
 				break;
-			idx_entry = (INDEX_ENTRY*)((char*)idx_entry +
-				le16_to_cpu(idx_entry->length));
+			idx_entry = (INDEX_ENTRY*)((u8*)idx_entry +
+					le16_to_cpu(idx_entry->length));
 		}
 	} else {
-		return EINVAL;
+		return -EINVAL;
 	}
-
-	memmove((char*)idx_entry + idx_size, (char*)idx_entry,
-		(char*)m + g_vol->mft_record_size -
-		((char*)idx_entry + idx_size));
-	memcpy((char*)idx_entry, (char*)idx, idx_size);
-	/* adjusting various offsets etc... */
-	m->bytes_in_use += idx_size;
-	a->length += idx_size;
-	a->value_length += idx_size;
-	((INDEX_HEADER*)idx_header)->index_length += idx_size;
-	((INDEX_HEADER*)idx_header)->allocated_size += idx_size;
-
+	memmove((u8*)idx_entry + idx_size, (u8*)idx_entry,
+			le32_to_cpu(m->bytes_in_use) -
+			((u8*)idx_entry - (u8*)m));
+	memcpy((u8*)idx_entry, (u8*)idx, idx_size);
+	/* Adjust various offsets, etc... */
+	m->bytes_in_use = cpu_to_le32(le32_to_cpu(m->bytes_in_use) + idx_size);
+	a->length = cpu_to_le32(le32_to_cpu(a->length) + idx_size);
+	a->value_length = cpu_to_le32(le32_to_cpu(a->value_length) + idx_size);
+	idx_header->index_length = cpu_to_le32(
+			le32_to_cpu(idx_header->index_length) + idx_size);
+	idx_header->allocated_size = cpu_to_le32(
+			le32_to_cpu(idx_header->allocated_size) + idx_size);
 err_out:
 	if (ctx)
 		ntfs_attr_put_search_ctx(ctx);
@@ -2849,55 +2840,49 @@ static int initialize_secure(char *sds, 
 		if (!sds_header->length)
 			break;
 		/* SDH index entry */
-		idx_entry_sdh->data_offset = cpu_to_le16(0x18);
-		idx_entry_sdh->data_length = cpu_to_le16(0x14);
-		idx_entry_sdh->reservedV = cpu_to_le32(0x00);
-		idx_entry_sdh->length = cpu_to_le16(0x30);
-		idx_entry_sdh->key_length = cpu_to_le16(0x08);
-		idx_entry_sdh->flags = cpu_to_le16(0x00);
-		idx_entry_sdh->reserved = cpu_to_le16(0x00);
+		idx_entry_sdh->data_offset = const_cpu_to_le16(0x18);
+		idx_entry_sdh->data_length = const_cpu_to_le16(0x14);
+		idx_entry_sdh->reservedV = const_cpu_to_le32(0x00);
+		idx_entry_sdh->length = const_cpu_to_le16(0x30);
+		idx_entry_sdh->key_length = const_cpu_to_le16(0x08);
+		idx_entry_sdh->flags = const_cpu_to_le16(0x00);
+		idx_entry_sdh->reserved = const_cpu_to_le16(0x00);
 		idx_entry_sdh->key.sdh.hash = sds_header->hash;
 		idx_entry_sdh->key.sdh.security_id = sds_header->security_id;
-		sdh_data = (SDH_INDEX_DATA*)((char*)idx_entry_sdh +
-			idx_entry_sdh->data_offset);
+		sdh_data = (SDH_INDEX_DATA*)((u8*)idx_entry_sdh +
+				le16_to_cpu(idx_entry_sdh->data_offset));
 		sdh_data->hash = sds_header->hash;
 		sdh_data->security_id = sds_header->security_id;
-
 		sdh_data->offset = sds_header->offset;
-
 		sdh_data->length = sds_header->length;
-		sdh_data->reserved_II =  cpu_to_le32(0x00490049);
+		sdh_data->reserved_II = const_cpu_to_le32(0x00490049);
 
 		/* SII index entry */
-		idx_entry_sii->data_offset = cpu_to_le16(0x14);
-		idx_entry_sii->data_length = cpu_to_le16(0x14);
-		idx_entry_sii->reservedV = cpu_to_le32(0x00);
-		idx_entry_sii->length = cpu_to_le16(0x28);
-		idx_entry_sii->key_length = cpu_to_le16(0x04);
-		idx_entry_sii->flags = cpu_to_le16(0x00);
-		idx_entry_sii->reserved = cpu_to_le16(0x00);
+		idx_entry_sii->data_offset = const_cpu_to_le16(0x14);
+		idx_entry_sii->data_length = const_cpu_to_le16(0x14);
+		idx_entry_sii->reservedV = const_cpu_to_le32(0x00);
+		idx_entry_sii->length = const_cpu_to_le16(0x28);
+		idx_entry_sii->key_length = const_cpu_to_le16(0x04);
+		idx_entry_sii->flags = const_cpu_to_le16(0x00);
+		idx_entry_sii->reserved = const_cpu_to_le16(0x00);
 		idx_entry_sii->key.sii.security_id = sds_header->security_id;
-		sii_data = (SII_INDEX_DATA*)((char*)idx_entry_sii +
-			idx_entry_sii->data_offset);
+		sii_data = (SII_INDEX_DATA*)((u8*)idx_entry_sii +
+				le16_to_cpu(idx_entry_sii->data_offset));
 		sii_data->hash = sds_header->hash;
 		sii_data->security_id = sds_header->security_id;
 		sii_data->offset = sds_header->offset;
 		sii_data->length = sds_header->length;
 		if ((err = insert_index_entry_in_res_dir_index(idx_entry_sdh,
-			sdh_size, m, NTFS_INDEX_SDH, 4, AT_UNUSED)))
+				sdh_size, m, NTFS_INDEX_SDH, 4, AT_UNUSED)))
 			break;
-
 		if ((err = insert_index_entry_in_res_dir_index(idx_entry_sii,
-			sii_size, m, NTFS_INDEX_SII, 4, AT_UNUSED)))
+				sii_size, m, NTFS_INDEX_SII, 4, AT_UNUSED)))
 			break;
-		sds_header = (SECURITY_DESCRIPTOR_HEADER*)((char*)sds_header +
-				(cpu_to_le32(sds_header->length + 0x0F) &
-					~cpu_to_le32(0x0F)));
+		sds_header = (SECURITY_DESCRIPTOR_HEADER*)((u8*)sds_header +
+				((le32_to_cpu(sds_header->length) + 15) & ~15));
 	}
-
 	free(idx_entry_sdh);
 	free(idx_entry_sii);
-
 	return err;
 }
 
@@ -2914,112 +2899,100 @@ static int initialize_quota(MFT_RECORD *
 	QUOTA_CONTROL_ENTRY *idx_entry_q1_data, *idx_entry_q2_data;
 	
 	err = 0;
-	
 	/* q index entry num 1 */
-	q1_size = cpu_to_le32(0x48);
+	q1_size = 0x48;
 	idx_entry_q1 = ntfs_calloc(1, q1_size);
 	if (!idx_entry_q1)
 		return errno;
-	
-	idx_entry_q1->data_offset = cpu_to_le16(0x14);
-	idx_entry_q1->data_length = cpu_to_le16(0x30);
-	idx_entry_q1->reservedV = cpu_to_le32(0x00);
-	idx_entry_q1->length = cpu_to_le16(0x48);
-	idx_entry_q1->key_length = cpu_to_le16(0x04);
-	idx_entry_q1->flags = cpu_to_le16(0x00);
-	idx_entry_q1->reserved = cpu_to_le16(0x00);
-	idx_entry_q1->key.owner_id = cpu_to_le32(0x01);
+	idx_entry_q1->data_offset = const_cpu_to_le16(0x14);
+	idx_entry_q1->data_length = const_cpu_to_le16(0x30);
+	idx_entry_q1->reservedV = const_cpu_to_le32(0x00);
+	idx_entry_q1->length = const_cpu_to_le16(0x48);
+	idx_entry_q1->key_length = const_cpu_to_le16(0x04);
+	idx_entry_q1->flags = const_cpu_to_le16(0x00);
+	idx_entry_q1->reserved = const_cpu_to_le16(0x00);
+	idx_entry_q1->key.owner_id = const_cpu_to_le32(0x01);
 	idx_entry_q1_data = (QUOTA_CONTROL_ENTRY*)((char*)idx_entry_q1
-			+ idx_entry_q1->data_offset);
-	idx_entry_q1_data->version = cpu_to_le32(0x02);
+			+ le16_to_cpu(idx_entry_q1->data_offset));
+	idx_entry_q1_data->version = const_cpu_to_le32(0x02);
 	idx_entry_q1_data->flags = QUOTA_FLAG_DEFAULT_LIMITS;
 	if (g_vol->minor_ver == 0)
 		idx_entry_q1_data->flags |= QUOTA_FLAG_OUT_OF_DATE;
-	idx_entry_q1_data->bytes_used = cpu_to_le64(0x00);
+	idx_entry_q1_data->bytes_used = const_cpu_to_le64(0x00);
 	idx_entry_q1_data->change_time = utc2ntfs(mkntfs_time());
-	idx_entry_q1_data->threshold = cpu_to_sle64(-0x01);
-	idx_entry_q1_data->limit = cpu_to_sle64(-0x01);
-	idx_entry_q1_data->exceeded_time = cpu_to_sle64(0x00);
-
-	err = insert_index_entry_in_res_dir_index(idx_entry_q1,
-		q1_size, m,
-		NTFS_INDEX_Q, 2, AT_UNUSED);
+	idx_entry_q1_data->threshold = const_cpu_to_le64((s64)-1);
+	idx_entry_q1_data->limit = const_cpu_to_le64((s64)-1);
+	idx_entry_q1_data->exceeded_time = const_cpu_to_le64(0x00);
+	err = insert_index_entry_in_res_dir_index(idx_entry_q1, q1_size, m,
+			NTFS_INDEX_Q, 2, AT_UNUSED);
 	free(idx_entry_q1);
 	if (err)
 		return err;
-
 	/* q index entry num 2 */
-	q2_size = cpu_to_le32(0x58);
+	q2_size = 0x58;
 	idx_entry_q2 = ntfs_calloc(1, q2_size);
 	if (!idx_entry_q2)
 		return errno;
-	
-	idx_entry_q2->data_offset = cpu_to_le16(0x14);
-	idx_entry_q2->data_length = cpu_to_le16(0x40);
-	idx_entry_q2->reservedV = cpu_to_le32(0x00);
-	idx_entry_q2->length = cpu_to_le16(0x58);
-	idx_entry_q2->key_length = cpu_to_le16(0x04);
-	idx_entry_q2->flags = cpu_to_le16(0x00);
-	idx_entry_q2->reserved = cpu_to_le16(0x00);
+	idx_entry_q2->data_offset = const_cpu_to_le16(0x14);
+	idx_entry_q2->data_length = const_cpu_to_le16(0x40);
+	idx_entry_q2->reservedV = const_cpu_to_le32(0x00);
+	idx_entry_q2->length = const_cpu_to_le16(0x58);
+	idx_entry_q2->key_length = const_cpu_to_le16(0x04);
+	idx_entry_q2->flags = const_cpu_to_le16(0x00);
+	idx_entry_q2->reserved = const_cpu_to_le16(0x00);
 	idx_entry_q2->key.owner_id = QUOTA_FIRST_USER_ID;
 	idx_entry_q2_data = (QUOTA_CONTROL_ENTRY*)((char*)idx_entry_q2
-			+ idx_entry_q2->data_offset);
-	idx_entry_q2_data->version = cpu_to_le32(0x02);
+			+ le16_to_cpu(idx_entry_q2->data_offset));
+	idx_entry_q2_data->version = const_cpu_to_le32(0x02);
 	idx_entry_q2_data->flags = QUOTA_FLAG_DEFAULT_LIMITS;
-	idx_entry_q2_data->bytes_used = cpu_to_le64(0x00);
+	idx_entry_q2_data->bytes_used = const_cpu_to_le64(0x00);
 	idx_entry_q2_data->change_time = utc2ntfs(mkntfs_time());;
-	idx_entry_q2_data->threshold = cpu_to_sle64(-0x01);
-	idx_entry_q2_data->limit = cpu_to_sle64(-0x01);
-	idx_entry_q2_data->exceeded_time = cpu_to_sle64(0x00);
+	idx_entry_q2_data->threshold = const_cpu_to_le64((s64)-1);
+	idx_entry_q2_data->limit = const_cpu_to_le64((s64)-1);
+	idx_entry_q2_data->exceeded_time = const_cpu_to_le64(0x00);
 	idx_entry_q2_data->sid.revision = 1;
 	idx_entry_q2_data->sid.sub_authority_count = 2;
 	idx_entry_q2_data->sid.identifier_authority.high_part =
-		cpu_to_le16(0x0000);
+			const_cpu_to_le16(0x0000);
 	idx_entry_q2_data->sid.identifier_authority.low_part =
-		cpu_to_le32(0x05000000);
+			const_cpu_to_le32(0x05000000);
 	idx_entry_q2_data->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+			const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	idx_entry_q2_data->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
-
-	err = insert_index_entry_in_res_dir_index(idx_entry_q2,
-		q2_size, m,
-		NTFS_INDEX_Q, 2, AT_UNUSED);
+			const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+	err = insert_index_entry_in_res_dir_index(idx_entry_q2, q2_size, m,
+			NTFS_INDEX_Q, 2, AT_UNUSED);
 	free(idx_entry_q2);
 	if (err)
 		return err;
-
-	o_size = cpu_to_le32(0x28);
+	o_size = 0x28;
 	idx_entry_o = ntfs_calloc(1, o_size);
 	if (!idx_entry_o)
 		return errno;
-
-	idx_entry_o->data_offset = cpu_to_le16(0x20);
-	idx_entry_o->data_length = cpu_to_le16(0x04);
-	idx_entry_o->reservedV = cpu_to_le32(0x00);
-	idx_entry_o->length = cpu_to_le16(0x28);
-	idx_entry_o->key_length = cpu_to_le16(0x10);
-	idx_entry_o->flags = cpu_to_le16(0x00);
-	idx_entry_o->reserved = cpu_to_le16(0x00);
+	idx_entry_o->data_offset = const_cpu_to_le16(0x20);
+	idx_entry_o->data_length = const_cpu_to_le16(0x04);
+	idx_entry_o->reservedV = const_cpu_to_le32(0x00);
+	idx_entry_o->length = const_cpu_to_le16(0x28);
+	idx_entry_o->key_length = const_cpu_to_le16(0x10);
+	idx_entry_o->flags = const_cpu_to_le16(0x00);
+	idx_entry_o->reserved = const_cpu_to_le16(0x00);
 	idx_entry_o->key.sid.revision = 0x01;
 	idx_entry_o->key.sid.sub_authority_count = 0x02;
 	idx_entry_o->key.sid.identifier_authority.high_part =
-		cpu_to_le16(0x0000);
+			const_cpu_to_le16(0x0000);
 	idx_entry_o->key.sid.identifier_authority.low_part =
-		cpu_to_le32(0x05000000);
+			const_cpu_to_le32(0x05000000);
 	idx_entry_o->key.sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+			const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	idx_entry_o->key.sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+			const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 	idx_entry_o_data = (QUOTA_O_INDEX_DATA*)((char*)idx_entry_o
-			+ idx_entry_o->data_offset);
+			+ le16_to_cpu(idx_entry_o->data_offset));
 	idx_entry_o_data->owner_id  = QUOTA_FIRST_USER_ID;
 	/* 20 00 00 00 padding after here on ntfs 3.1. 3.0 is unchecked. */
-	idx_entry_o_data->unknown = cpu_to_le32(32);
-
-	err = insert_index_entry_in_res_dir_index(idx_entry_o,
-		o_size, m,
-		NTFS_INDEX_O, 2, AT_UNUSED);
+	idx_entry_o_data->unknown = const_cpu_to_le32(32);
+	err = insert_index_entry_in_res_dir_index(idx_entry_o, o_size, m,
+			NTFS_INDEX_O, 2, AT_UNUSED);
 	free(idx_entry_o);
 
 	return err;
@@ -3238,11 +3211,11 @@ static int create_hardlink_res(MFT_RECOR
 	if (!idx_entry_new)
 		return -errno;
 	idx_entry_new->indexed_file = ref_file;
-	idx_entry_new->length = idx_size + 0x10;
-	idx_entry_new->key_length = fn_size;
-	memcpy((char*)idx_entry_new+0x10, (char*)fn, fn_size);
+	idx_entry_new->length = cpu_to_le16(idx_size + 0x10);
+	idx_entry_new->key_length = cpu_to_le16(fn_size);
+	memcpy((u8*)idx_entry_new + 0x10, (u8*)fn, fn_size);
 	i = insert_index_entry_in_res_dir_index(idx_entry_new, idx_size + 0x10,
-		m_parent, NTFS_INDEX_I30, 4, AT_FILE_NAME);
+			m_parent, NTFS_INDEX_I30, 4, AT_FILE_NAME);
 	if (i < 0) {
 		ntfs_log_error("create_hardlink failed inserting index entry: %s\n",
 				strerror(-i));
@@ -4754,7 +4727,6 @@ static BOOL mkntfs_create_root_structure
 
 	/* dump_mft_record(m); */
 	/* create $Quota (1.2) or $Secure (3.0+) */
-
 	if (g_vol->major_ver < 3) {
 		ntfs_log_verbose("Creating $Quota (mft record 9)\n");
 		m = (MFT_RECORD*)(g_buf + 9 * g_vol->mft_record_size);
@@ -4799,22 +4771,22 @@ static BOOL mkntfs_create_root_structure
 					return FALSE;
 				init_secure_31(buf_sds_init);
 			}
-			buf_sds = ntfs_calloc(1,buf_sds_size);
+			buf_sds = ntfs_calloc(1, buf_sds_size);
 			if (!buf_sds) {
 				free(buf_sds_init);
 				return FALSE;
 			}
 			memcpy(buf_sds, buf_sds_init, buf_sds_first_size);
 			memcpy(buf_sds + 0x40000, buf_sds_init,
-				buf_sds_first_size);
+					buf_sds_first_size);
 			err = add_attr_data(m, "$SDS", 4, 0, 0, (u8*)buf_sds,
-				buf_sds_size);
+					buf_sds_size);
 			free(buf_sds);
 		}
 		/* FIXME: This should be IGNORE_CASE */
 		if (!err)
 			err = add_attr_index_root(m, "$SDH", 4, 0, AT_UNUSED,
-				COLLATION_NTOFS_SECURITY_HASH ,
+				COLLATION_NTOFS_SECURITY_HASH,
 				g_vol->indx_record_size);
 		/* FIXME: This should be IGNORE_CASE */
 		if (!err)
@@ -4981,7 +4953,6 @@ static BOOL mkntfs_create_root_structure
 	return TRUE;
 }
 
-
 /**
  * mkntfs_redirect
  */

Index: sd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/sd.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sd.c	15 Jan 2006 12:55:04 -0000	1.12
+++ sd.c	4 Feb 2006 05:42:59 -0000	1.13
@@ -48,15 +48,15 @@ void init_system_file_sd(int sys_file_no
 	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
 	if (sys_file_no == FILE_root) {
 		*sd_val_len = 0x50;
-		sd->owner = cpu_to_le32(0x30);
-		sd->group = cpu_to_le32(0x40);
+		sd->owner = const_cpu_to_le32(0x30);
+		sd->group = const_cpu_to_le32(0x40);
 	} else {
 		*sd_val_len = 0x68;
-		sd->owner = cpu_to_le32(0x48);
-		sd->group = cpu_to_le32(0x58);
+		sd->owner = const_cpu_to_le32(0x48);
+		sd->group = const_cpu_to_le32(0x58);
 	}
-	sd->sacl = cpu_to_le32(0);
-	sd->dacl = cpu_to_le32(0x14);
+	sd->sacl = const_cpu_to_le32(0);
+	sd->dacl = const_cpu_to_le32(0x14);
 	/*
 	 * Now at offset 0x14, as specified in the security descriptor, we have
 	 * the DACL.
@@ -65,13 +65,13 @@ void init_system_file_sd(int sys_file_no
 	acl->revision = 2;
 	acl->alignment1 = 0;
 	if (sys_file_no == FILE_root) {
-		acl->size = cpu_to_le16(0x1c);
-		acl->ace_count = cpu_to_le16(1);
+		acl->size = const_cpu_to_le16(0x1c);
+		acl->ace_count = const_cpu_to_le16(1);
 	} else {
-		acl->size = cpu_to_le16(0x34);
-		acl->ace_count = cpu_to_le16(2);
+		acl->size = const_cpu_to_le16(0x34);
+		acl->ace_count = const_cpu_to_le16(2);
 	}
-	acl->alignment2 = cpu_to_le16(0);
+	acl->alignment2 = const_cpu_to_le16(0);
 	/*
 	 * Now at offset 0x1c, just after the DACL's ACL, we have the first
 	 * ACE of the DACL. The type of the ACE is access allowed.
@@ -82,7 +82,7 @@ void init_system_file_sd(int sys_file_no
 		aa_ace->flags = CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE;
 	else
 		aa_ace->flags = 0;
-	aa_ace->size = cpu_to_le16(0x14);
+	aa_ace->size = const_cpu_to_le16(0x14);
 	switch (sys_file_no) {
 	case FILE_MFT:		case FILE_MFTMirr:	case FILE_LogFile:
 	case FILE_AttrDef:	case FILE_Bitmap:	case FILE_Boot:
@@ -115,13 +115,13 @@ void init_system_file_sd(int sys_file_no
 		/* SECURITY_WORLD_SID_AUTHORITY (S-1-1) */
 		aa_ace->sid.identifier_authority.value[5] = 1;
 		aa_ace->sid.sub_authority[0] =
-				cpu_to_le32(SECURITY_WORLD_RID);
+				const_cpu_to_le32(SECURITY_WORLD_RID);
 		/* This is S-1-1-0, the WORLD_SID. */
 	} else {
 		/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
 		aa_ace->sid.identifier_authority.value[5] = 5;
 		aa_ace->sid.sub_authority[0] =
-				cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+				const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 	}
 	/*
 	 * Now at offset 0x30 within security descriptor, just after the first
@@ -134,7 +134,7 @@ void init_system_file_sd(int sys_file_no
 				le16_to_cpu(aa_ace->size));
 		aa_ace->type = ACCESS_ALLOWED_ACE_TYPE;
 		aa_ace->flags = 0;
-		aa_ace->size = cpu_to_le16(0x18);
+		aa_ace->size = const_cpu_to_le16(0x18);
 		switch (sys_file_no) {
 		case FILE_MFT:		case FILE_MFTMirr:
 		case FILE_LogFile:	case FILE_AttrDef:
@@ -163,9 +163,9 @@ void init_system_file_sd(int sys_file_no
 		aa_ace->sid.identifier_authority.value[4] = 0;
 		aa_ace->sid.identifier_authority.value[5] = 5;
 		aa_ace->sid.sub_authority[0] =
-				cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+				const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 		aa_ace->sid.sub_authority[1] =
-				cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+				const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 		/* Now at offset 0x48 into the security descriptor. */
 	}
 	/* As specified in the security descriptor, we now have the owner SID.*/
@@ -179,8 +179,8 @@ void init_system_file_sd(int sys_file_no
 	sid->identifier_authority.value[3] = 0;
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
-	sid->sub_authority[0] = cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
-	sid->sub_authority[1] = cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+	sid->sub_authority[0] = const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+	sid->sub_authority[1] = const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 	/*
 	 * Now at offset 0x40 or 0x58 (root directory and the other system
 	 * files, respectively) into the security descriptor, as specified in
@@ -196,18 +196,18 @@ void init_system_file_sd(int sys_file_no
 	sid->identifier_authority.value[3] = 0;
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
-	sid->sub_authority[0] = cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
-	sid->sub_authority[1] = cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+	sid->sub_authority[0] = const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+	sid->sub_authority[1] = const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 }
 
 /**
  * init_root_sd_31 (ERSO)
  * creates the security_descriptor for the root folder on ntfs 3.1.
- * It is very long ; lot's av ACE's at first, then large pieces of zero's
+ * It is very long; lots of ACE's at first, then large pieces of zeroes;
  * the owner user/group is near the end. On a partition created with
  * w2k3 the owner user/group at the end is surrounded by 'garbage', which I
  * yet do not understand. Here I have replaced the 'garbage' with
- * zero's, which seems to work. Chkdsk does not add the 'garbage', nor alter
+ * zeros, which seems to work. Chkdsk does not add the 'garbage', nor alter
  * this security descriptor in any way.
  */
 void init_root_sd_31(u8 **sd_val, int *sd_val_len)
@@ -222,28 +222,28 @@ void init_root_sd_31(u8 **sd_val, int *s
 	*sd_val = (u8*)&sd_array;
 
 	//security descriptor relative
-	sd = (SECURITY_DESCRIPTOR_RELATIVE*)&sd_array;
+	sd = (SECURITY_DESCRIPTOR_RELATIVE*)sd_array;
 	sd->revision = 0x01;
 	sd->alignment = 0x00;
 	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x1014);
-	sd->group = cpu_to_le32(0x1024);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
+	sd->owner = const_cpu_to_le32(0x1014);
+	sd->group = const_cpu_to_le32(0x1024);
+	sd->sacl = const_cpu_to_le32(0x00);
+	sd->dacl = const_cpu_to_le32(0x14);
 
 	//acl
-	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
+	acl = (ACL*)((u8*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
 	acl->revision = 0x02;
 	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x1000);
-	acl->ace_count = cpu_to_le16(0x07);
-	acl->alignment2 = cpu_to_le16(0x00);
+	acl->size = const_cpu_to_le16(0x1000);
+	acl->ace_count = const_cpu_to_le16(0x07);
+	acl->alignment2 = const_cpu_to_le16(0x00);
 
 	//ace1
-	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
+	ace = (ACCESS_ALLOWED_ACE*)((u8*)acl + sizeof(ACL));
 	ace->type = 0x00;
 	ace->flags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE;
-	ace->size = cpu_to_le16(0x18);
+	ace->size = const_cpu_to_le16(0x18);
 	ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
 			 FILE_LIST_DIRECTORY | FILE_WRITE_DATA |
 			 FILE_ADD_SUBDIRECTORY | FILE_READ_EA | FILE_WRITE_EA |
@@ -260,15 +260,15 @@ void init_root_sd_31(u8 **sd_val, int *s
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+			const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+			const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//ace2
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le32_to_cpu(ace->size));
+	ace = (ACCESS_ALLOWED_ACE*)((u8*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE;
-	ace->size = cpu_to_le16(0x14);
+	ace->size = const_cpu_to_le16(0x14);
 	ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
 			 FILE_LIST_DIRECTORY | FILE_WRITE_DATA |
 			 FILE_ADD_SUBDIRECTORY | FILE_READ_EA | FILE_WRITE_EA |
@@ -284,15 +284,15 @@ void init_root_sd_31(u8 **sd_val, int *s
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+			const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 
 	//ace3
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le32_to_cpu(ace->size));
+	ace = (ACCESS_ALLOWED_ACE*)((u8*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE |
-		INHERIT_ONLY_ACE;
-	ace->size = cpu_to_le16(0x14);
-	ace->mask = cpu_to_le32(0x10000000);
+			INHERIT_ONLY_ACE;
+	ace->size = const_cpu_to_le16(0x14);
+	ace->mask = const_cpu_to_le32(0x10000000);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x01;
 	/* SECURITY_CREATOR_SID_AUTHORITY (S-1-3) */
@@ -303,14 +303,14 @@ void init_root_sd_31(u8 **sd_val, int *s
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 3;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_CREATOR_OWNER_RID);
+			const_cpu_to_le32(SECURITY_CREATOR_OWNER_RID);
 
 	//ace4
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le32_to_cpu(ace->size));
+	ace = (ACCESS_ALLOWED_ACE*)((u8*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE;
-	ace->size = cpu_to_le16(0x18);
-	ace->mask = cpu_to_le32(0x1200A9);
+	ace->size = const_cpu_to_le16(0x18);
+	ace->mask = const_cpu_to_le32(0x1200A9);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x02;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -321,16 +321,16 @@ void init_root_sd_31(u8 **sd_val, int *s
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+			const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_USERS);
+			const_cpu_to_le32(DOMAIN_ALIAS_RID_USERS);
 
 	//ace5
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le32_to_cpu(ace->size));
+	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = CONTAINER_INHERIT_ACE;
-	ace->size = cpu_to_le16(0x18);
-	ace->mask = cpu_to_le32(0x04);
+	ace->size = const_cpu_to_le16(0x18);
+	ace->mask = const_cpu_to_le32(0x04);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x02;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -341,16 +341,16 @@ void init_root_sd_31(u8 **sd_val, int *s
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+			const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_USERS);
+			const_cpu_to_le32(DOMAIN_ALIAS_RID_USERS);
 
 	//ace6
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le32_to_cpu(ace->size));
+	ace = (ACCESS_ALLOWED_ACE*)((u8*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE;
-	ace->size = cpu_to_le16(0x18);
-	ace->mask = cpu_to_le32(0x02);
+	ace->size = const_cpu_to_le16(0x18);
+	ace->mask = const_cpu_to_le32(0x02);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x02;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -361,16 +361,16 @@ void init_root_sd_31(u8 **sd_val, int *s
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+			const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_USERS);
+			const_cpu_to_le32(DOMAIN_ALIAS_RID_USERS);
 
 	//ace7
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le32_to_cpu(ace->size));
+	ace = (ACCESS_ALLOWED_ACE*)((u8*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x14);
-	ace->mask = cpu_to_le32(0x1200A9);
+	ace->size = const_cpu_to_le16(0x14);
+	ace->mask = const_cpu_to_le32(0x1200A9);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x01;
 	/* SECURITY_WORLD_SID_AUTHORITY (S-1-1) */
@@ -381,7 +381,7 @@ void init_root_sd_31(u8 **sd_val, int *s
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 1;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_WORLD_RID);
+			const_cpu_to_le32(SECURITY_WORLD_RID);
 
 	//owner sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
@@ -395,9 +395,9 @@ void init_root_sd_31(u8 **sd_val, int *s
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+			const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+			const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//group sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
@@ -411,8 +411,7 @@ void init_root_sd_31(u8 **sd_val, int *s
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
-
+			const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 }
 
 /**
@@ -436,35 +435,35 @@ void init_secure_30(char *sd_val)
  */
 	//header
 	sds = (SECURITY_DESCRIPTOR_HEADER*)((char*)sd_val);
-	sds->hash = cpu_to_le32(0xF80312F0);
-	sds->security_id = cpu_to_le32(0x0100);
-	sds->offset = cpu_to_le64(0x00);
-	sds->length = cpu_to_le32(0x7C);
+	sds->hash = const_cpu_to_le32(0xF80312F0);
+	sds->security_id = const_cpu_to_le32(0x0100);
+	sds->offset = const_cpu_to_le64(0x00);
+	sds->length = const_cpu_to_le32(0x7C);
 	//security descriptor relative
 	sd = (SECURITY_DESCRIPTOR_RELATIVE*)((char*)sds +
 		sizeof(SECURITY_DESCRIPTOR_HEADER));
 	sd->revision = 0x01;
 	sd->alignment = 0x00;
 	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x48);
-	sd->group = cpu_to_le32(0x58);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
+	sd->owner = const_cpu_to_le32(0x48);
+	sd->group = const_cpu_to_le32(0x58);
+	sd->sacl = const_cpu_to_le32(0x00);
+	sd->dacl = const_cpu_to_le32(0x14);
 
 	//acl
 	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
 	acl->revision = 0x02;
 	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x34);
-	acl->ace_count = cpu_to_le16(0x02);
+	acl->size = const_cpu_to_le16(0x34);
+	acl->ace_count = const_cpu_to_le16(0x02);
 	acl->alignment2 = 0x00;
 
 	//ace1
 	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x14);
-	ace->mask = cpu_to_le32(0x120089);
+	ace->size = const_cpu_to_le16(0x14);
+	ace->mask = const_cpu_to_le32(0x120089);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x01;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -475,14 +474,14 @@ void init_secure_30(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+		const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 
 	//ace2
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le32_to_cpu(ace->size));
+	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x18);
-	ace->mask = cpu_to_le32(0x120089);
+	ace->size = const_cpu_to_le16(0x18);
+	ace->mask = const_cpu_to_le32(0x120089);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x02;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -493,9 +492,9 @@ void init_secure_30(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//owner sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
@@ -509,9 +508,9 @@ void init_secure_30(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//group sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
@@ -525,19 +524,19 @@ void init_secure_30(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 /*
  * security descriptor #2
  */
 	//header
 	sds = (SECURITY_DESCRIPTOR_HEADER*)((char*)sd_val + 0x80);
-	sds->hash = cpu_to_le32(0xB32451);
-	sds->security_id = cpu_to_le32(0x0101);
-	sds->offset = cpu_to_le64(0x80);
-	sds->length = cpu_to_le32(0x7C);
+	sds->hash = const_cpu_to_le32(0xB32451);
+	sds->security_id = const_cpu_to_le32(0x0101);
+	sds->offset = const_cpu_to_le64(0x80);
+	sds->length = const_cpu_to_le32(0x7C);
 
 	//security descriptor relative
 	sd = (SECURITY_DESCRIPTOR_RELATIVE*)((char*)sds +
@@ -545,25 +544,25 @@ void init_secure_30(char *sd_val)
 	sd->revision = 0x01;
 	sd->alignment = 0x00;
 	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x48);
-	sd->group = cpu_to_le32(0x58);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
+	sd->owner = const_cpu_to_le32(0x48);
+	sd->group = const_cpu_to_le32(0x58);
+	sd->sacl = const_cpu_to_le32(0x00);
+	sd->dacl = const_cpu_to_le32(0x14);
 
 	//acl
 	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
 	acl->revision = 0x02;
 	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x34);
-	acl->ace_count = cpu_to_le16(0x02);
+	acl->size = const_cpu_to_le16(0x34);
+	acl->ace_count = const_cpu_to_le16(0x02);
 	acl->alignment2 = 0x00;
 
 	//ace1
 	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x14);
-	ace->mask = cpu_to_le32(0x12019F);
+	ace->size = const_cpu_to_le16(0x14);
+	ace->mask = const_cpu_to_le32(0x12019F);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x01;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -574,14 +573,14 @@ void init_secure_30(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+		const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 
 	//ace2
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + ace->size);
+	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x18);
-	ace->mask = cpu_to_le32(0x12019F);
+	ace->size = const_cpu_to_le16(0x18);
+	ace->mask = const_cpu_to_le32(0x12019F);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x02;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -592,9 +591,9 @@ void init_secure_30(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//owner sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
@@ -608,9 +607,9 @@ void init_secure_30(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//group sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
@@ -624,19 +623,19 @@ void init_secure_30(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 /*
  * security descriptor #3
  */
 	//header
 	sds = (SECURITY_DESCRIPTOR_HEADER*)((char*)sd_val + 0x80 + 0x80);
-	sds->hash = cpu_to_le32(0x0A9F9562);
-	sds->security_id = cpu_to_le32(0x0102);
-	sds->offset = cpu_to_le64(0x0100);
-	sds->length = cpu_to_le32(0x60);
+	sds->hash = const_cpu_to_le32(0x0A9F9562);
+	sds->security_id = const_cpu_to_le32(0x0102);
+	sds->offset = const_cpu_to_le64(0x0100);
+	sds->length = const_cpu_to_le32(0x60);
 
 	//security descriptor relative
 	sd = (SECURITY_DESCRIPTOR_RELATIVE*)((char*)sds +
@@ -644,24 +643,24 @@ void init_secure_30(char *sd_val)
 	sd->revision = 0x01;
 	sd->alignment = 0x00;
 	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x30);
-	sd->group = cpu_to_le32(0x40);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
+	sd->owner = const_cpu_to_le32(0x30);
+	sd->group = const_cpu_to_le32(0x40);
+	sd->sacl = const_cpu_to_le32(0x00);
+	sd->dacl = const_cpu_to_le32(0x14);
 
 	//acl
 	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
 	acl->revision = 0x02;
 	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x1C);
-	acl->ace_count = cpu_to_le16(0x01);
+	acl->size = const_cpu_to_le16(0x1C);
+	acl->ace_count = const_cpu_to_le16(0x01);
 	acl->alignment2 = 0x00;
 
 	//ace1
 	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x14);
+	ace->size = const_cpu_to_le16(0x14);
 	ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
 			 FILE_LIST_DIRECTORY | FILE_WRITE_DATA |
 			 FILE_ADD_SUBDIRECTORY | FILE_READ_EA | FILE_WRITE_EA |
@@ -677,7 +676,7 @@ void init_secure_30(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+		const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 
 	//owner sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
@@ -691,9 +690,9 @@ void init_secure_30(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 	//group sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
 	sid->revision = 0x01;
@@ -706,17 +705,17 @@ void init_secure_30(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+		const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 
 /*
  * security descriptor #4
  */
 	//header
 	sds = (SECURITY_DESCRIPTOR_HEADER*)((char*)sd_val + 0x80 + 0x80 + 0x60);
-	sds->hash = cpu_to_le32(0x453F0A2E);
-	sds->security_id = cpu_to_le32(0x0103);
-	sds->offset = cpu_to_le64(0x0160);
-	sds->length = cpu_to_le32(0x78);
+	sds->hash = const_cpu_to_le32(0x453F0A2E);
+	sds->security_id = const_cpu_to_le32(0x0103);
+	sds->offset = const_cpu_to_le64(0x0160);
+	sds->length = const_cpu_to_le32(0x78);
 
 	//security descriptor relative
 	sd = (SECURITY_DESCRIPTOR_RELATIVE*)((char*)sds +
@@ -724,24 +723,24 @@ void init_secure_30(char *sd_val)
 	sd->revision = 0x01;
 	sd->alignment = 0x00;
 	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x48);
-	sd->group = cpu_to_le32(0x58);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
+	sd->owner = const_cpu_to_le32(0x48);
+	sd->group = const_cpu_to_le32(0x58);
+	sd->sacl = const_cpu_to_le32(0x00);
+	sd->dacl = const_cpu_to_le32(0x14);
 
 	//acl
 	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
 	acl->revision = 0x02;
 	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x34);
-	acl->ace_count = cpu_to_le16(0x02);
+	acl->size = const_cpu_to_le16(0x34);
+	acl->ace_count = const_cpu_to_le16(0x02);
 	acl->alignment2 = 0x00;
 
 	//ace1
 	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x18);
+	ace->size = const_cpu_to_le16(0x18);
 	ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
 			 FILE_LIST_DIRECTORY | FILE_WRITE_DATA |
 			 FILE_ADD_SUBDIRECTORY | FILE_READ_EA | FILE_WRITE_EA |
@@ -757,14 +756,14 @@ void init_secure_30(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 	//ace2
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + ace->size);
+	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x14);
+	ace->size = const_cpu_to_le16(0x14);
 	ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
 			 FILE_LIST_DIRECTORY | FILE_WRITE_DATA |
 			 FILE_ADD_SUBDIRECTORY | FILE_READ_EA | FILE_WRITE_EA |
@@ -780,7 +779,7 @@ void init_secure_30(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+		const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 
 	//owner sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
@@ -794,9 +793,9 @@ void init_secure_30(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//group sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
@@ -810,7 +809,7 @@ void init_secure_30(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+		const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 
 	return;
 }
@@ -836,35 +835,35 @@ void init_secure_31(char *sd_val)
  */
 	//header
 	sds = (SECURITY_DESCRIPTOR_HEADER*)((char*)sd_val);
-	sds->hash = cpu_to_le32(0xF80312F0);
-	sds->security_id = cpu_to_le32(0x0100);
-	sds->offset = cpu_to_le64(0x00);
-	sds->length = cpu_to_le32(0x7C);
+	sds->hash = const_cpu_to_le32(0xF80312F0);
+	sds->security_id = const_cpu_to_le32(0x0100);
+	sds->offset = const_cpu_to_le64(0x00);
+	sds->length = const_cpu_to_le32(0x7C);
 	//security descriptor relative
 	sd = (SECURITY_DESCRIPTOR_RELATIVE*)((char*)sds +
-		sizeof(SECURITY_DESCRIPTOR_HEADER));
+			sizeof(SECURITY_DESCRIPTOR_HEADER));
 	sd->revision = 0x01;
 	sd->alignment = 0x00;
 	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x48);
-	sd->group = cpu_to_le32(0x58);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
+	sd->owner = const_cpu_to_le32(0x48);
+	sd->group = const_cpu_to_le32(0x58);
+	sd->sacl = const_cpu_to_le32(0x00);
+	sd->dacl = const_cpu_to_le32(0x14);
 
 	//acl
 	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
 	acl->revision = 0x02;
 	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x34);
-	acl->ace_count = cpu_to_le16(0x02);
+	acl->size = const_cpu_to_le16(0x34);
+	acl->ace_count = const_cpu_to_le16(0x02);
 	acl->alignment2 = 0x00;
 
 	//ace1
 	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x14);
-	ace->mask = cpu_to_le32(0x120089);
+	ace->size = const_cpu_to_le16(0x14);
+	ace->mask = const_cpu_to_le32(0x120089);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x01;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -875,13 +874,13 @@ void init_secure_31(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+			const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 	//ace2
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le32_to_cpu(ace->size));
+	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x18);
-	ace->mask = cpu_to_le32(0x120089);
+	ace->size = const_cpu_to_le16(0x18);
+	ace->mask = const_cpu_to_le32(0x120089);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x02;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -892,9 +891,9 @@ void init_secure_31(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//owner sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
@@ -908,9 +907,9 @@ void init_secure_31(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 	//group sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
 	sid->revision = 0x01;
@@ -923,18 +922,18 @@ void init_secure_31(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 /*
  * security descriptor #2
  */
 	//header
 	sds = (SECURITY_DESCRIPTOR_HEADER*)((char*)sd_val + 0x80);
-	sds->hash = cpu_to_le32(0xB32451);
-	sds->security_id = cpu_to_le32(0x0101);
-	sds->offset = cpu_to_le64(0x80);
-	sds->length = cpu_to_le32(0x7C);
+	sds->hash = const_cpu_to_le32(0xB32451);
+	sds->security_id = const_cpu_to_le32(0x0101);
+	sds->offset = const_cpu_to_le64(0x80);
+	sds->length = const_cpu_to_le32(0x7C);
 
 	//security descriptor relative
 	sd = (SECURITY_DESCRIPTOR_RELATIVE*)((char*)sds +
@@ -942,25 +941,25 @@ void init_secure_31(char *sd_val)
 	sd->revision = 0x01;
 	sd->alignment = 0x00;
 	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x48);
-	sd->group = cpu_to_le32(0x58);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
+	sd->owner = const_cpu_to_le32(0x48);
+	sd->group = const_cpu_to_le32(0x58);
+	sd->sacl = const_cpu_to_le32(0x00);
+	sd->dacl = const_cpu_to_le32(0x14);
 
 	//acl
 	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
 	acl->revision = 0x02;
 	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x34);
-	acl->ace_count = cpu_to_le16(0x02);
+	acl->size = const_cpu_to_le16(0x34);
+	acl->ace_count = const_cpu_to_le16(0x02);
 	acl->alignment2 = 0x00;
 
 	//ace1
 	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x14);
-	ace->mask = cpu_to_le32(0x12019F);
+	ace->size = const_cpu_to_le16(0x14);
+	ace->mask = const_cpu_to_le32(0x12019F);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x01;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -971,13 +970,13 @@ void init_secure_31(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
+		const_cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
 	//ace2
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + ace->size);
+	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + le16_to_cpu(ace->size));
 	ace->type = 0x00;
 	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x18);
-	ace->mask = cpu_to_le32(0x12019F);
+	ace->size = const_cpu_to_le16(0x18);
+	ace->mask = const_cpu_to_le32(0x12019F);
 	ace->sid.revision = 0x01;
 	ace->sid.sub_authority_count = 0x02;
 	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
@@ -988,9 +987,9 @@ void init_secure_31(char *sd_val)
 	ace->sid.identifier_authority.value[4] = 0;
 	ace->sid.identifier_authority.value[5] = 5;
 	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//owner sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
@@ -1004,9 +1003,9 @@ void init_secure_31(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	//group sid
 	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
@@ -1020,10 +1019,9 @@ void init_secure_31(char *sd_val)
 	sid->identifier_authority.value[4] = 0;
 	sid->identifier_authority.value[5] = 5;
 	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
+		const_cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
 	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
+		const_cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
 	return;
 }
-

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.351,1.352

From: Anton A. <an...@us...> - 2006-02-04 05:43:08

Changes by: antona

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

Modified Files:
	ChangeLog 
Log Message:
Tons of bug fixes to mkntfs.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -p -r1.351 -r1.352
--- ChangeLog	3 Feb 2006 22:19:17 -0000	1.351
+++ ChangeLog	4 Feb 2006 05:42:59 -0000	1.352
@@ -101,8 +101,8 @@
 	  which caused bits to not be cleared or set if the first bit in the
 	  run was not a multiple of eight.  (Anton)
 	- Change volume mounting (actually device opening) to happen with
-	  O_EXCL bit set so at least on Linux no one can change the device
-	  block size under our feet.  (Anton)
+	  O_EXCL bit set, but only for r/w opening so at least on Linux no one
+	  can change the device block size under our feet.  (Anton)
 	- Change volume mounting and mkntfs to set the device block size to the
 	  sector size using BLKBSZSET ioctl (Linux only).  This should be
 	  optimal for performance and should fixes the bug of not being able to
@@ -114,6 +114,7 @@
 	  mountable by the kernel driver (it requires mft record size and index
 	  record size to be below or equal to the system page size which we
 	  determine using sysconf()).  (Anton)
+	- Fix tons of bugs in mkntfs.  (Anton)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs unix_io.c,1.11,1.12

From: Anton A. <an...@us...> - 2006-02-04 02:42:52

Changes by: antona

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

Modified Files:
	unix_io.c 
Log Message:
Only use O_EXCL if mounting r/w.


Index: unix_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unix_io.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- unix_io.c	3 Feb 2006 23:11:35 -0000	1.11
+++ unix_io.c	4 Feb 2006 02:42:42 -0000	1.12
@@ -90,9 +90,11 @@ static int ntfs_device_unix_io_open(stru
 		return -1;
 	/*
 	 * Open the device/file obtaining the file descriptor for exclusive
-	 * access.
+	 * access (but only if mounting r/w).
 	 */ 
-	*(int*)dev->d_private = open(dev->d_name, flags | O_EXCL);
+	if ((flags & O_RDWR) == O_RDWR)
+		flags |= O_EXCL;
+	*(int*)dev->d_private = open(dev->d_name, flags);
 	if (*(int*)dev->d_private == -1) {
 		err = errno;
 		goto err_out;

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs layout.h,1.52,1.53

From: Anton A. <an...@us...> - 2006-02-04 02:42:52

Changes by: antona

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

Modified Files:
	layout.h 
Log Message:
Only use O_EXCL if mounting r/w.


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- layout.h	3 Feb 2006 09:23:03 -0000	1.52
+++ layout.h	4 Feb 2006 02:42:42 -0000	1.53
@@ -524,7 +524,7 @@ typedef enum {
  *	unistr.c::ntfs_collate_names() and unistr.c::legal_ansi_char_array[]
  *	for what I mean but COLLATION_UNICODE_STRING would not give any special
  *	treatment to any characters at all, but this is speculation.
- * COLLATION_NTOFS_ULONG - Sorting is done according to ascending u32	key
+ * COLLATION_NTOFS_ULONG - Sorting is done according to ascending u32 key
  *	values. E.g. used for $SII index in FILE_Secure, which sorts by
  *	security_id (u32).
  * COLLATION_NTOFS_SID - Sorting is done according to ascending SID values.

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs device.c,1.26,1.27

From: Anton A. <an...@us...> - 2006-02-03 23:55:47

Changes by: antona

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

Modified Files:
	device.c 
Log Message:
Another fix for OSX.


Index: device.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/device.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- device.c	3 Feb 2006 23:40:39 -0000	1.26
+++ device.c	3 Feb 2006 23:55:40 -0000	1.27
@@ -715,6 +715,9 @@ int ntfs_device_block_size_set(struct nt
 			return 0;
 	}
 #else
+	/* If not a block device, pretend it was successful. */
+	if (!NDevBlock(dev))
+		return 0;
 	errno = EOPNOTSUPP;
 #endif
 	return -1;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.133,1.134

From: Anton A. <an...@us...> - 2006-02-03 23:53:04

Changes by: antona

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

Modified Files:
	mkntfs.c 
Log Message:
Fix a Linux warning after a fix for OSX.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- mkntfs.c	3 Feb 2006 23:40:39 -0000	1.133
+++ mkntfs.c	3 Feb 2006 23:52:55 -0000	1.134
@@ -156,7 +156,7 @@ switch if you want to be able to build t
 /* Page size on ia32. Can change to 8192 on Alpha. */
 #define NTFS_PAGE_SIZE	4096
 
-static char *EXEC_NAME = "mkntfs";
+static char EXEC_NAME[] = "mkntfs";
 
 /**
  * global variables

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.132,1.133

From: Anton A. <an...@us...> - 2006-02-03 23:40:48

Changes by: antona

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

Modified Files:
	mkntfs.c 
Log Message:
Fixes for OSX.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- mkntfs.c	3 Feb 2006 23:25:24 -0000	1.132
+++ mkntfs.c	3 Feb 2006 23:40:39 -0000	1.133
@@ -78,6 +78,9 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#ifdef HAVE_LIBGEN_H
+#include <libgen.h>
+#endif
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
@@ -153,37 +156,37 @@ switch if you want to be able to build t
 /* Page size on ia32. Can change to 8192 on Alpha. */
 #define NTFS_PAGE_SIZE	4096
 
-const char *EXEC_NAME = "mkntfs";
+static char *EXEC_NAME = "mkntfs";
 
 /**
  * global variables
  */
-u8		  *g_buf		  = NULL;
-int		   g_mft_bitmap_byte_size = 0;
-u8		  *g_mft_bitmap		  = NULL;
-int		   g_lcn_bitmap_byte_size = 0;
-u8		  *g_lcn_bitmap		  = NULL;
-runlist		  *g_rl_mft		  = NULL;
-runlist		  *g_rl_mft_bmp		  = NULL;
-runlist		  *g_rl_mftmirr		  = NULL;
-runlist		  *g_rl_logfile		  = NULL;
-runlist		  *g_rl_boot		  = NULL;
-runlist		  *g_rl_bad		  = NULL;
-INDEX_ALLOCATION  *g_index_block	  = NULL;
-ntfs_volume	  *g_vol		  = NULL;
-int		   g_mft_size		  = 0;
-long long	   g_mft_lcn		  = 0;		/* lcn of $MFT, $DATA attribute */
-long long	   g_mftmirr_lcn	  = 0;		/* lcn of $MFTMirr, $DATA */
-long long	   g_logfile_lcn	  = 0;		/* lcn of $LogFile, $DATA */
-int		   g_logfile_size	  = 0;		/* in bytes, determined from volume_size */
-long long	   g_mft_zone_end	  = 0;		/* Determined from volume_size and mft_zone_multiplier, in clusters */
-long long	   g_num_bad_blocks	  = 0;		/* Number of bad clusters */
-long long	  *g_bad_blocks		  = NULL;	/* Array of bad clusters */
+static u8		  *g_buf		  = NULL;
+static int		   g_mft_bitmap_byte_size = 0;
+static u8		  *g_mft_bitmap		  = NULL;
+static int		   g_lcn_bitmap_byte_size = 0;
+static u8		  *g_lcn_bitmap		  = NULL;
+static runlist		  *g_rl_mft		  = NULL;
+static runlist		  *g_rl_mft_bmp		  = NULL;
+static runlist		  *g_rl_mftmirr		  = NULL;
+static runlist		  *g_rl_logfile		  = NULL;
+static runlist		  *g_rl_boot		  = NULL;
+static runlist		  *g_rl_bad		  = NULL;
+static INDEX_ALLOCATION  *g_index_block	  = NULL;
+static ntfs_volume	  *g_vol		  = NULL;
+static int		   g_mft_size		  = 0;
+static long long	   g_mft_lcn		  = 0;		/* lcn of $MFT, $DATA attribute */
+static long long	   g_mftmirr_lcn	  = 0;		/* lcn of $MFTMirr, $DATA */
+static long long	   g_logfile_lcn	  = 0;		/* lcn of $LogFile, $DATA */
+static int		   g_logfile_size	  = 0;		/* in bytes, determined from volume_size */
+static long long	   g_mft_zone_end	  = 0;		/* Determined from volume_size and mft_zone_multiplier, in clusters */
+static long long	   g_num_bad_blocks	  = 0;		/* Number of bad clusters */
+static long long	  *g_bad_blocks		  = NULL;	/* Array of bad clusters */
 
 /**
  * struct mkntfs_options
  */
-struct mkntfs_options {
+static struct mkntfs_options {
 	char *dev_name;			/* Name of the device, or file, to use */
 	BOOL enable_compression;	/* -C, enables compression of all files on the volume by default. */
 	BOOL quick_format;		/* -f or -Q, fast format, don't zero the volume first. */

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 17 18 19 20 21 .. 124 > >> (Page 19 of 124)

2001	Jan (38)	Feb (25)	Mar (37)	Apr (50)	May	Jun (156)	Jul (174)	Aug (94)	Sep (107)	Oct (18)	Nov (153)	Dec (91)
2002	Jan (79)	Feb (117)	Mar (39)	Apr (164)	May (12)	Jun (64)	Jul (138)	Aug (43)	Sep	Oct	Nov	Dec
2005	Jan	Feb	Mar	Apr (1)	May (17)	Jun (100)	Jul (210)	Aug (127)	Sep (89)	Oct (214)	Nov (176)	Dec (20)
2006	Jan (29)	Feb (85)	Mar (45)	Apr (54)	May (9)	Jun (7)	Jul (28)	Aug (65)	Sep (3)	Oct (62)	Nov (68)	Dec (52)
2007	Jan (6)	Feb	Mar (8)	Apr	May	Jun (2)	Jul (4)	Aug	Sep	Oct (2)	Nov	Dec