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

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsfix.c,1.39,1.40 ntfsresize.c,1.10,1.11

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

Changes by: szaka

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

Modified Files:
	ntfsfix.c ntfsresize.c 
Log Message:
Rewrote $LogFile reset using new inode API and moved it from ntfsfix to
libntfs as ntfs_reset_logfile(). ntfsresize also resets log file.


Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -U2 -r1.39 -r1.40
--- ntfsfix.c	12 Jul 2002 07:10:44 -0000	1.39
+++ ntfsfix.c	12 Jul 2002 12:38:54 -0000	1.40
@@ -69,7 +69,4 @@
 	unsigned char *m = NULL, *m2 = NULL;
 	ntfs_volume *vol;
-	ntfs_attr_search_ctx *ctx;
-	ATTR_RECORD *a;
-	unsigned char *lfd;
 	unsigned long mnt_flags;
 	int i;
@@ -298,96 +295,13 @@
 	puts(OK);
 	printf("\n");
-	/*
-	 * Fill the value of the $LogFile data attribute, i.e. the contents of
-	 * the file, with 0xff's, thus marking the journal as empty.
-	 * FIXME(?): We might need to zero the LSN field of every single mft
-	 * record as well. (But, first try without doing that and see what
-	 * happens, since chkdsk might pickup the pieces and do it for us...)
-	 */
-	if (ntfs_read_file_record(vol, FILE_LogFile, (MFT_RECORD**)&m, NULL)) {
-		perror("Failed to read $LogFile");
-		goto error_exit;
-	}
-	if (!(((MFT_RECORD*)m)->flags & MFT_RECORD_IN_USE)) {
-		fprintf(stderr, "Error: $LogFile has been deleted. Cannot "
-				"handle this yet. Run chkdsk to fix this.\n");
-		goto error_exit;
-	}
 
 	printf("Going to empty the journal ($LogFile)... ");
-	/* Find the $DATA attribute. */
-	ctx = ntfs_get_attr_search_ctx(NULL, (MFT_RECORD*)m);
-	if (!ctx) {
-		puts(FAILED);
-		perror("Failed to allocate attribute search context");
-		goto log_file_error;
-	}
-	if (ntfs_lookup_attr(AT_DATA, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+	if (ntfs_reset_logfile(vol)) {
 		puts(FAILED);
-		fprintf(stderr, "Error: Attribute $DATA was not found in" \
-				"$LogFile!\n");
-		goto log_file_error;
-	}
-	a = ctx->attr;
-	/* The $DATA attribute of the $LogFile has to be non-resident. */
-	if (!a->non_resident) {
-		puts(FAILED);
-		fprintf(stderr, "$LogFile $DATA attribute is resident!?!\n");
-		goto log_file_error;
-	}
-	/* Get length of $LogFile contents. */
-	l = get_attribute_value_length((ATTR_RECORD*)a);
-	if (!l) {
-		puts(OK);
-		puts("$LogFile has zero length, no need to write to disk.");
-		goto log_file_error;
-	}
-	/* Allocate a buffer to hold all of the $LogFile contents. */
-	lfd = (unsigned char*)malloc(l);
-	if (!lfd) {
-		puts(FAILED);
-		puts("Not enough memory to load $LogFile.");
-		goto log_file_error;
+		perror("Failed to reset $LogFile");
+		goto error_exit;
 	}
-	/* Read in the $LogFile into the buffer. We do this more as a check
-	   for correct length than anything else. We thus make sure we are
-	   decompressing the mapping pairs array correctly and hence writing
-	   below if safe as well. */
-	if (l != get_attribute_value(vol, (MFT_RECORD*)m, a, lfd)) {
-		puts(FAILED);
-		puts("Amount of data read does not correspond to expected "
-		     "length!");
-		free(lfd);
-		goto log_file_error;
-	}
-	/* Fill the buffer with 0xff's. */
-	memset(lfd, -1, l);
-	/* Set the $DATA attribute. */
-	/* FIXME: set_attribute_value needs to either:
-	 * - know the MFT_RECORD so it can adjust it accordingly with
-	 *   changes in length of the resident part of the attribute.
-	 * or
-	 * - return a copy of the attribute so the MFT_RECORD can be
-	 * adjusted accordingly with changes in the length of the resident
-	 * part of the attribute by the caller.
-	 * For now, just assume that attribute length remains constant, since
-	 * this is the case for the $LogFile zeroing out. */
-	if (!set_attribute_value(vol, (ATTR_RECORD*)a, lfd, l)) {
-		puts(FAILED);
-		puts("Failed to set the $LogFile attribute value.");
-		free(lfd);
-		goto log_file_error;
-	}
-	/* No need to sync the $LogFile mft record to disk as we haven't
-	   touched it at all. */
-	/* Release the allocated buffer and finish $LogFile processing. */
-	free(lfd);
 	puts(OK);
-
-log_file_error:
 	printf("\n");
-
-	if (ctx)
-		ntfs_put_attr_search_ctx(ctx);
 
 	if (vol->major_ver >= 3) {

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsresize.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- ntfsresize.c	12 Jul 2002 07:10:44 -0000	1.10
+++ ntfsresize.c	12 Jul 2002 12:38:54 -0000	1.11
@@ -651,4 +651,8 @@
 	/* FIXME: first do all checks before any write attempt */
 
+	if (!opt.ro_flag)
+		if (ntfs_reset_logfile(vol))
+			perr_exit("Failed to reset $LogFile");
+
 	truncate_badclust_file(opt.size);
 	truncate_bitmap_file(opt.size);

[Linux-NTFS-cvs] CVS: linux-ntfs/include volume.h,1.28,1.29

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

Changes by: szaka

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv11567/include

Modified Files:
	volume.h 
Log Message:
Rewrote $LogFile reset using new inode API and moved it from ntfsfix to
libntfs as ntfs_reset_logfile(). ntfsresize also resets log file.


Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- volume.h	12 Jul 2002 07:10:44 -0000	1.28
+++ volume.h	12 Jul 2002 12:38:54 -0000	1.29
@@ -83,4 +83,6 @@
 #define NTFS_V3_1(major, minor) ((major) == 3 && (minor) == 1)
 
+#define NTFS_BUF_SIZE 4096
+
 /*
  * ntfs_volume - structure describing an open volume in memory
@@ -146,4 +148,5 @@
 
 extern int ntfs_is_version_supported(ntfs_volume *vol);
+extern int ntfs_reset_logfile(ntfs_volume *vol);
 
 #endif /* defined _NTFS_VOLUME_H */

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs volume.c,1.52,1.53

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

Changes by: szaka

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv11567/libntfs

Modified Files:
	volume.c 
Log Message:
Rewrote $LogFile reset using new inode API and moved it from ntfsfix to
libntfs as ntfs_reset_logfile(). ntfsresize also resets log file.


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -U2 -r1.52 -r1.53
--- volume.c	12 Jul 2002 08:18:15 -0000	1.52
+++ volume.c	12 Jul 2002 12:38:54 -0000	1.53
@@ -917,2 +917,93 @@
 	return -1;
 }
+
+/**
+ * ntfs_reset_logfile - "empty" $LogFile data attribute value
+ * @vol:	ntfs volume whose $LogFile we intend to reset.
+ *
+ * Fill the value of the $LogFile data attribute, i.e. the contents of
+ * the file, with 0xff's, thus marking the journal as empty.
+ * FIXME(?): We might need to zero the LSN field of every single mft
+ * record as well. (But, first try without doing that and see what
+ * happens, since chkdsk might pickup the pieces and do it for us...)
+ *
+ * On success return 0.
+ *
+ * On error, return -1 with errno set to the error code.
+ */
+int ntfs_reset_logfile(ntfs_volume *vol)
+{
+	ntfs_inode *ni;
+	ntfs_attr *na;
+	s64 len, pos, count;
+	char buf[NTFS_BUF_SIZE];
+
+	if ((ni = ntfs_open_inode(vol, FILE_LogFile)) == NULL) {
+		Dperror("Failed to open inode FILE_LogFile.\n");
+		return -1;
+	}
+
+	if ((na = ntfs_attr_open(ni, AT_DATA, AT_NONAME, 0)) == NULL) {
+		Dperror("Failed to open $FILE_LogFile/$DATA\n");
+		return -1;
+	}
+	
+	/* The $DATA attribute of the $LogFile has to be non-resident. */
+	if (!NAttrNonResident(na)) {
+		Dprintf("$LogFile $DATA attribute is resident!?!\n");
+		errno = EIO;
+		return -1;
+	}
+
+	/* Get length of $LogFile contents. */
+	len = na->data_size;
+	if (!len) {
+		Dprintf("$LogFile has zero length, no disk write needed.\n");
+		return 0;
+	}
+	
+	/* Read $LogFile until its end. We do this as a check for correct 
+	   length thus making sure we are decompressing the mapping pairs 
+	   array correctly and hence writing below is safe as well. */
+	pos = 0;
+	while (1) {
+		count = ntfs_attr_pread(na, pos, NTFS_BUF_SIZE, buf);
+		if (count == -1)
+			break;
+		
+		pos += count;
+		if (count != NTFS_BUF_SIZE || !count)
+			break;
+	}
+
+	if (count == -1 || pos != len) {
+		Dprintf("Amount of $LogFile data read does not "
+			"correspond to expected length!");
+		if (count != -1)
+			errno = EIO;
+		return -1;
+	}
+
+	/* Fill the buffer with 0xff's. */
+	memset(buf, -1, NTFS_BUF_SIZE);
+
+	/* Set the $DATA attribute. */
+	pos = 0;
+	while ((count = len - pos) > 0) {
+		if (count > NTFS_BUF_SIZE)
+			count = NTFS_BUF_SIZE;
+		
+		if (count != ntfs_attr_pwrite(na, pos, count, buf)) {
+			Dprintf("Failed to set the $LogFile attribute value.");
+			if (count != -1)
+				errno = EIO;
+			return -1;
+		}
+		pos += count;
+	}
+	
+	ntfs_attr_close(na);
+	
+	return ntfs_close_inode(ni);
+}
+

[Linux-NTFS-cvs] CVS: linux-ntfs ChangeLog,1.70,1.71

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

Changes by: antona

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

Modified Files:
	ChangeLog 
Log Message:
update changelog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -U2 -r1.70 -r1.71
--- ChangeLog	8 Jul 2002 06:23:22 -0000	1.70
+++ ChangeLog	12 Jul 2002 08:23:42 -0000	1.71
@@ -133,4 +133,8 @@
 	- Don't use string concatenation with __FUNCTION__ as gcc-3.x don't
 	  like it.
+	- Move run list functions to runlist.[hc]. (Richard Russon)
+	- Add new API to volume.[hc] and use it (Szakacsits Szabolcs):
+		ntfs_is_version_supported(), and
+		NTFS_V{1_[12],2_x,3_[01]}() macros.
 
 12/03/2002 - 1.6.0 - More mkntfs options and cleanups.

[Linux-NTFS-cvs] CVS: linux-ntfs/include inode.h,1.13,1.14

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv14813/include

Modified Files:
	inode.h 
Log Message:
and a final revert i forgot


Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/inode.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- inode.h	11 Jul 2002 23:44:13 -0000	1.13
+++ inode.h	12 Jul 2002 08:18:59 -0000	1.14
@@ -101,6 +101,4 @@
 };
 
-extern ntfs_inode *allocate_ntfs_inode(ntfs_volume *vol);
-
 extern ntfs_inode *ntfs_open_inode(ntfs_volume *vol, const MFT_REF mref);
 

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs attrib.c,1.59,1.60 dir.c,1.8,1.9 inode.c,1.16,1.17 volume.c,1.51,1.52

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv14399

Modified Files:
	attrib.c dir.c inode.c volume.c 
Log Message:
sorry flatcap. - remove a lot of reorganization which rips the code into incomprehensible order. - all functions were and are again now placed together by logicnot by sheer randomness. - functions which call each other are placed together for example...


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -U2 -r1.59 -r1.60
--- attrib.c	11 Jul 2002 23:44:13 -0000	1.59
+++ attrib.c	12 Jul 2002 08:18:15 -0000	1.60
@@ -408,1020 +408,1099 @@
 
 /**
- * Internal:
- *
- * ntfs_find_attr - find (next) attribute in mft record
- * @type:	attribute type to find
- * @name:	attribute name to find (optional, i.e. NULL means don't care)
- * @name_len:	attribute name length (only needed if @name present)
- * @ic:		IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
- * @val:	attribute value to find (optional, resident attributes only)
- * @val_len:	attribute value length
[...2737 lines suppressed...]
+	ctx->attr = (ATTR_RECORD*)((char*)mrec +
+			le16_to_cpu(mrec->attrs_offset));
+	ctx->is_first = TRUE;
+	ctx->ntfs_ino = ni;
+	ctx->al_entry = NULL;
+	ctx->base_ntfs_ino = NULL;
+	ctx->base_mrec = NULL;
+	ctx->base_attr = NULL;
+}
+
+/**
  * ntfs_reinit_attr_search_ctx - reinitialize an attribute search context
  * @ctx:	attribute search context to reinitialize
@@ -2006,6 +2005,4 @@
 
 /**
- * Inline:
- *
  * ntfs_get_nr_significant_bytes - get number of bytes needed to store a number
  * @n:		number for which to get the number of bytes for

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/dir.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- dir.c	11 Jul 2002 23:44:13 -0000	1.8
+++ dir.c	12 Jul 2002 08:18:15 -0000	1.9
@@ -40,130 +40,4 @@
 		   const_cpu_to_le16('\0') };
 
-/*
- * The little endian Unicode string ".." as a static global constant.
- */
-static const uchar_t dotdot[3] = { const_cpu_to_le16('.'),
-				   const_cpu_to_le16('.'),
-				   const_cpu_to_le16('\0') };
-
-typedef union {
-	INDEX_ROOT *ir;
-	INDEX_ALLOCATION *ia;
-} index_union __attribute__ ((__transparent_union__));
-
-typedef enum {
-	INDEX_TYPE_ROOT,	/* index root */
-	INDEX_TYPE_ALLOCATION,	/* index allocation */
-} INDEX_TYPE;
-
-/**
- * Internal:
- *
- * ntfs_filldir - ntfs specific filldir method
- * @dir_ni:	ntfs inode of current directory
- * @pos:	current position in directory
- * @ivcn_bits:	log(2) of index vcn size
- * @index_type:	specifies whether @iu is an index root or an index allocation
- * @iu:		index root or index block to which @ie belongs
- * @ie:		current index entry
- * @dirent:	context for filldir callback supplied by the caller
- * @filldir:	filldir callback supplied by the caller
- *
- * Pass information specifying the current directory entry @ie to the @filldir
- * callback.
- */
-static inline int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, u8 ivcn_bits,
-		const INDEX_TYPE index_type, index_union iu, INDEX_ENTRY *ie,
-		void *dirent, ntfs_filldir_t filldir)
-{
-	FILE_NAME_ATTR *fn = &ie->key.file_name;
-	unsigned dt_type;
-
-	/* Advance the position even if going to skip the entry. */
-	if (index_type == INDEX_TYPE_ALLOCATION)
-		*pos = (u8*)ie - (u8*)iu.ia + (sle64_to_cpu(
-				iu.ia->index_block_vcn) << ivcn_bits) +
-				dir_ni->vol->mft_record_size;
-	else /* if (index_type == INDEX_TYPE_ROOT) */
-		*pos = (u8*)ie - (u8*)iu.ir;
-	/* Skip root directory self reference entry. */
-	if (MREF_LE(ie->indexed_file) == FILE_root)
-		return 0;
-	if (ie->key.file_name.file_attributes &
-			FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT)
-		dt_type = NTFS_DT_DIR;
-	else
-		dt_type = NTFS_DT_REG;
-	return filldir(dirent, fn->file_name, fn->file_name_length,
-			fn->file_name_type, *pos,
-			le64_to_cpu(ie->indexed_file), dt_type);
-}
-
-/**
- * Internal:
- *
- * ntfs_get_parent_mft_ref - find mft reference of parent directory of an inode
- * @ni:		ntfs inode whose parent directory to find
- *
- * Find the parent directory of the ntfs inode @ni. To do this, find the first
- * file name attribute in the mft record of @ni and return the parent mft
- * reference from that.
- *
- * Note this only makes sense for directories, since files can be hard linked
- * from multiple directories and there is no way for us to tell which one is
- * being looked for.
- *
- * Technically directories can have hard links, too, but we consider that as
- * illegal as Linux/UNIX do not support directory hard links.
- *
- * Return the mft reference of the parent directory on success or -1 on error
- * with errno set to the error code.
- */
-static MFT_REF ntfs_get_parent_mft_ref(ntfs_inode *ni)
-{
-	MFT_REF mref;
-	ntfs_attr_search_ctx *ctx;
-	FILE_NAME_ATTR *fn;
-	int eo;
-
-	if (!ni) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	ctx = ntfs_get_attr_search_ctx(ni, NULL);
-	if (!ctx)
-		return -1;
-	if (ntfs_lookup_attr(AT_FILE_NAME, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
-		Dprintf("No file name found in inode 0x%Lx. Corrupt inode.\n",
-				(unsigned long long)ni->mft_no);
-		goto err_out;
-	}
-	if (ctx->attr->non_resident) {
-		Dprintf("File name attribute must be resident. Corrupt inode "
-				"0x%Lx.\n", (unsigned long long)ni->mft_no);
-		goto io_err_out;
-	}
-	fn = (FILE_NAME_ATTR*)((u8*)ctx->attr +
-			le16_to_cpu(ctx->attr->value_offset));
-	if ((u8*)fn +	le32_to_cpu(ctx->attr->value_length) >
-			(u8*)ctx->attr + le32_to_cpu(ctx->attr->length)) {
-		Dprintf("Corrupt file name attribute in inode 0x%Lx.\n",
-				(unsigned long long)ni->mft_no);
-		goto io_err_out;
-	}
-	mref = le64_to_cpu(fn->parent_directory);
-	ntfs_put_attr_search_ctx(ctx);
-	return mref;
-io_err_out:
-	errno = EIO;
-err_out:
-	eo = errno;
-	ntfs_put_attr_search_ctx(ctx);
-	errno = eo;
-	return -1;
-}
-
-
 /**
  * ntfs_lookup_inode_by_name - find an inode in a directory given its name
@@ -577,4 +451,132 @@
 }
 
+/*
+ * The little endian Unicode string ".." for ntfs_readdir().
+ */
+static const uchar_t dotdot[3] = { const_cpu_to_le16('.'),
+				   const_cpu_to_le16('.'),
+				   const_cpu_to_le16('\0') };
+
+/*
+ * More helpers for ntfs_readdir().
+ */
+typedef union {
+	INDEX_ROOT *ir;
+	INDEX_ALLOCATION *ia;
+} index_union __attribute__ ((__transparent_union__));
+
+typedef enum {
+	INDEX_TYPE_ROOT,	/* index root */
+	INDEX_TYPE_ALLOCATION,	/* index allocation */
+} INDEX_TYPE;
+
+/**
+ * Internal:
+ *
+ * ntfs_filldir - ntfs specific filldir method
+ * @dir_ni:	ntfs inode of current directory
+ * @pos:	current position in directory
+ * @ivcn_bits:	log(2) of index vcn size
+ * @index_type:	specifies whether @iu is an index root or an index allocation
+ * @iu:		index root or index block to which @ie belongs
+ * @ie:		current index entry
+ * @dirent:	context for filldir callback supplied by the caller
+ * @filldir:	filldir callback supplied by the caller
+ *
+ * Pass information specifying the current directory entry @ie to the @filldir
+ * callback.
+ */
+static inline int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, u8 ivcn_bits,
+		const INDEX_TYPE index_type, index_union iu, INDEX_ENTRY *ie,
+		void *dirent, ntfs_filldir_t filldir)
+{
+	FILE_NAME_ATTR *fn = &ie->key.file_name;
+	unsigned dt_type;
+
+	/* Advance the position even if going to skip the entry. */
+	if (index_type == INDEX_TYPE_ALLOCATION)
+		*pos = (u8*)ie - (u8*)iu.ia + (sle64_to_cpu(
+				iu.ia->index_block_vcn) << ivcn_bits) +
+				dir_ni->vol->mft_record_size;
+	else /* if (index_type == INDEX_TYPE_ROOT) */
+		*pos = (u8*)ie - (u8*)iu.ir;
+	/* Skip root directory self reference entry. */
+	if (MREF_LE(ie->indexed_file) == FILE_root)
+		return 0;
+	if (ie->key.file_name.file_attributes &
+			FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT)
+		dt_type = NTFS_DT_DIR;
+	else
+		dt_type = NTFS_DT_REG;
+	return filldir(dirent, fn->file_name, fn->file_name_length,
+			fn->file_name_type, *pos,
+			le64_to_cpu(ie->indexed_file), dt_type);
+}
+
+/**
+ * Internal:
+ *
+ * ntfs_get_parent_mft_ref - find mft reference of parent directory of an inode
+ * @ni:		ntfs inode whose parent directory to find
+ *
+ * Find the parent directory of the ntfs inode @ni. To do this, find the first
+ * file name attribute in the mft record of @ni and return the parent mft
+ * reference from that.
+ *
+ * Note this only makes sense for directories, since files can be hard linked
+ * from multiple directories and there is no way for us to tell which one is
+ * being looked for.
+ *
+ * Technically directories can have hard links, too, but we consider that as
+ * illegal as Linux/UNIX do not support directory hard links.
+ *
+ * Return the mft reference of the parent directory on success or -1 on error
+ * with errno set to the error code.
+ */
+static MFT_REF ntfs_get_parent_mft_ref(ntfs_inode *ni)
+{
+	MFT_REF mref;
+	ntfs_attr_search_ctx *ctx;
+	FILE_NAME_ATTR *fn;
+	int eo;
+
+	if (!ni) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	ctx = ntfs_get_attr_search_ctx(ni, NULL);
+	if (!ctx)
+		return -1;
+	if (ntfs_lookup_attr(AT_FILE_NAME, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+		Dprintf("No file name found in inode 0x%Lx. Corrupt inode.\n",
+				(unsigned long long)ni->mft_no);
+		goto err_out;
+	}
+	if (ctx->attr->non_resident) {
+		Dprintf("File name attribute must be resident. Corrupt inode "
+				"0x%Lx.\n", (unsigned long long)ni->mft_no);
+		goto io_err_out;
+	}
+	fn = (FILE_NAME_ATTR*)((u8*)ctx->attr +
+			le16_to_cpu(ctx->attr->value_offset));
+	if ((u8*)fn +	le32_to_cpu(ctx->attr->value_length) >
+			(u8*)ctx->attr + le32_to_cpu(ctx->attr->length)) {
+		Dprintf("Corrupt file name attribute in inode 0x%Lx.\n",
+				(unsigned long long)ni->mft_no);
+		goto io_err_out;
+	}
+	mref = le64_to_cpu(fn->parent_directory);
+	ntfs_put_attr_search_ctx(ctx);
+	return mref;
+io_err_out:
+	errno = EIO;
+err_out:
+	eo = errno;
+	ntfs_put_attr_search_ctx(ctx);
+	errno = eo;
+	return -1;
+}
+
 /**
  * ntfs_readdir - read the contents of an ntfs directory
@@ -893,7 +895,4 @@
 	}
 	goto find_next_index_buffer;
-
-
-
 EOD:
 	/* We are finished, set *pos to EOD. */

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/inode.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- inode.c	11 Jul 2002 23:44:13 -0000	1.16
+++ inode.c	12 Jul 2002 08:18:15 -0000	1.17
@@ -51,4 +51,14 @@
  * Internal:
  *
+ * allocate_ntfs_inode - desc
+ */
+ntfs_inode *allocate_ntfs_inode(ntfs_volume *vol)
+{
+	return __allocate_ntfs_inode(vol);
+}
+
+/**
+ * Internal:
+ *
  * __release_ntfs_inode - desc
  */
@@ -65,13 +75,4 @@
 	free(ni);
 	return 0;
-}
-
-
-/**
- * allocate_ntfs_inode - desc
- */
-ntfs_inode *allocate_ntfs_inode(ntfs_volume *vol)
-{
-	return __allocate_ntfs_inode(vol);
 }
 

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -U2 -r1.51 -r1.52
--- volume.c	12 Jul 2002 07:10:44 -0000	1.51
+++ volume.c	12 Jul 2002 08:18:15 -0000	1.52
@@ -83,4 +83,7 @@
 }
 
+/* External declaration for internal function. */
+extern ntfs_inode *allocate_ntfs_inode(ntfs_volume *);
+
 /**
  * Internal:
@@ -355,38 +358,4 @@
 }
 
-#ifdef HAVE_MNTENT_H
-/**
- * Internal:
- *
- * ntfs_check_mntent - desc
- *
- * If you are wanting to use this, you actually wanted to use
- * ntfs_check_if_mounted(), you just didn't realize. (-:
- *
- * See description of ntfs_check_if_mounted(), below.
- */
-static int ntfs_check_mntent(const char *file, unsigned long *mnt_flags)
-{
-	struct mntent *mnt;
-	FILE *f;
-
-	if (!(f = setmntent(MOUNTED, "r")))
-		return -1;
-	while ((mnt = getmntent(f)))
-		if (!strcmp(file, mnt->mnt_fsname))
-			break;
-	endmntent(f);
-	if (!mnt)
-		return 0;
-	*mnt_flags = NTFS_MF_MOUNTED;
-	if (!strcmp(mnt->mnt_dir, "/"))
-		*mnt_flags |= NTFS_MF_ISROOT;
-	if (hasmntopt(mnt, "ro") && !hasmntopt(mnt, "rw"))
-		*mnt_flags |= NTFS_MF_READONLY;
-	return 0;
-}
-
-#endif
-
 /**
  * ntfs_startup_volume - allocate and setup an ntfs volume
@@ -839,4 +808,37 @@
 }
 
+#ifdef HAVE_MNTENT_H
+/**
+ * Internal:
+ *
+ * ntfs_check_mntent - desc
+ *
+ * If you are wanting to use this, you actually wanted to use
+ * ntfs_check_if_mounted(), you just didn't realize. (-:
+ *
+ * See description of ntfs_check_if_mounted(), below.
+ */
+static int ntfs_check_mntent(const char *file, unsigned long *mnt_flags)
+{
+	struct mntent *mnt;
+	FILE *f;
+
+	if (!(f = setmntent(MOUNTED, "r")))
+		return -1;
+	while ((mnt = getmntent(f)))
+		if (!strcmp(file, mnt->mnt_fsname))
+			break;
+	endmntent(f);
+	if (!mnt)
+		return 0;
+	*mnt_flags = NTFS_MF_MOUNTED;
+	if (!strcmp(mnt->mnt_dir, "/"))
+		*mnt_flags |= NTFS_MF_ISROOT;
+	if (hasmntopt(mnt, "ro") && !hasmntopt(mnt, "rw"))
+		*mnt_flags |= NTFS_MF_READONLY;
+	return 0;
+}
+
+#endif
 
 /**

[Linux-NTFS-cvs] CVS: linux-ntfs/include volume.h,1.27,1.28

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

Changes by: szaka

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv31498/include

Modified Files:
	volume.h 
Log Message:
NTFS_V* version macros and ntfs_is_version_supported() added. 
Modified ntfsfix and ntfsresize to use them. 


Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- volume.h	11 Jul 2002 16:20:33 -0000	1.27
+++ volume.h	12 Jul 2002 07:10:44 -0000	1.28
@@ -71,4 +71,17 @@
 
 /*
+ * NTFS version 1.1 and 1.2 are used by Windows NT4.
+ * NTFS version 2.x is used by Windows 2000 Beta
+ * NTFS version 3.0 is used by Windows 2000.
+ * NTFS version 3.1 is used by Windows XP and .NET.
+ */
+
+#define NTFS_V1_1(major, minor) ((major) == 1 && (minor) == 1)
+#define NTFS_V1_2(major, minor) ((major) == 1 && (minor) == 2)
+#define NTFS_V2_X(major, minor) ((major) == 2)
+#define NTFS_V3_0(major, minor) ((major) == 3 && (minor) == 0)
+#define NTFS_V3_1(major, minor) ((major) == 3 && (minor) == 1)
+
+/*
  * ntfs_volume - structure describing an open volume in memory
  */
@@ -132,4 +145,7 @@
 extern int ntfs_umount(ntfs_volume *vol, const BOOL force);
 
+extern int ntfs_is_version_supported(ntfs_volume *vol);
+
 #endif /* defined _NTFS_VOLUME_H */
+
 

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs volume.c,1.50,1.51

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

Changes by: szaka

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv31498/libntfs

Modified Files:
	volume.c 
Log Message:
NTFS_V* version macros and ntfs_is_version_supported() added. 
Modified ntfsfix and ntfsresize to use them. 


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -U2 -r1.50 -r1.51
--- volume.c	11 Jul 2002 23:44:13 -0000	1.50
+++ volume.c	12 Jul 2002 07:10:44 -0000	1.51
@@ -875,2 +875,42 @@
 }
 
+/**
+ * ntfs_version_supported - check if NTFS version is supported.
+ * @vol:	ntfs volume whose version we're interested in.
+ *
+ * The function checks if the NTFS volume version is known or not.
+ * Version 1.1 and 1.2 are used by Windows NT4.
+ * Version 2.x is used by Windows 2000 Beta's
+ * Version 3.0 is used by Windows 2000.
+ * Version 3.1 is used by Windows XP and .NET.
+ *
+ * Return 0 if NTFS version is supported otherwise -1 with errno set.
+ *
+ * The following error codes are defined:
+ *	ENOTSUP   Unknown NTFS versions
+ *	EINVAL	  Invalid argument
+ */
+int ntfs_is_version_supported(ntfs_volume *vol)
+{
+	u8 major, minor;
+
+	if (!vol) {
+		errno = EINVAL;
+		return -1;
+	}
+	
+	major = vol->major_ver;
+	minor = vol->minor_ver;
+
+	if (NTFS_V1_1(major, minor) || NTFS_V1_2(major, minor))
+		return 0;
+	
+	if (NTFS_V2_X(major, minor))
+		return 0;
+	
+	if (NTFS_V3_0(major, minor) || NTFS_V3_1(major, minor))
+		return 0;
+
+	errno = ENOTSUP;
+	return -1;
+}

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsfix.c,1.38,1.39 ntfsresize.c,1.9,1.10

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

Changes by: szaka

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

Modified Files:
	ntfsfix.c ntfsresize.c 
Log Message:
NTFS_V* version macros and ntfs_is_version_supported() added. 
Modified ntfsfix and ntfsresize to use them. 


Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -U2 -r1.38 -r1.39
--- ntfsfix.c	11 Jul 2002 16:20:34 -0000	1.38
+++ ntfsfix.c	12 Jul 2002 07:10:44 -0000	1.39
@@ -270,18 +270,5 @@
 	printf("NTFS volume version is %i.%i.\n\n", vol->major_ver,
 			vol->minor_ver);
-	switch (vol->major_ver) {
-	case 1:
-		if (vol->minor_ver == 1 || vol->minor_ver == 2)
-			break;
-		else
-			goto version_error;
-	case 2:
-		break;
-	case 3:
-		if (vol->minor_ver == 0 || vol->minor_ver == 1)
-			break;
-		/* Fall through on error. */
-	default:
-version_error:
+	if (ntfs_is_version_supported(vol)) {
                	fprintf(stderr, "Error: Unknown NTFS version.\n");
 		goto error_exit;

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsresize.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- ntfsresize.c	11 Jul 2002 16:20:34 -0000	1.9
+++ ntfsresize.c	12 Jul 2002 07:10:44 -0000	1.10
@@ -622,4 +622,8 @@
 				 "please try again (or see -f option).\n");
 
+	if (ntfs_is_version_supported(vol))
+                perr_exit("Unknown NTFS version %d.%d detected", 
+			  vol->major_ver, vol->minor_ver);
+
 	printf("Cluster size      : %u\n", vol->cluster_size);
 	printf("Number of clusters: %lld\n", vol->nr_clusters);

Re: [Linux-NTFS-cvs] CVS: linux-ntfs/libntfs attrib.c,1.58,1.59 debug.c,1.2,1.3 dir.c,1.7,1.8 inode.c,1.15,1.16 runlist.c,1.3,1.4 volume.c,1.49,1.50

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

Hi,

> Modified Files:
> 	attrib.c debug.c dir.c inode.c runlist.c volume.c 
> Log Message:
> new function headers and a few function moves
> 
> Index: attrib.c

It may look like the patch from hell, but all I did was rearrange
a few functions.  Honest :-)

FlatCap (Rich).

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs attrib.c,1.58,1.59 debug.c,1.2,1.3 dir.c,1.7,1.8 inode.c,1.15,1.16 runlist.c,1.3,1.4 volume.c,1.49,1.50

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv1868/libntfs

Modified Files:
	attrib.c debug.c dir.c inode.c runlist.c volume.c 
Log Message:
new function headers and a few function moves


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -U2 -r1.58 -r1.59
--- attrib.c	11 Jul 2002 16:20:33 -0000	1.58
+++ attrib.c	11 Jul 2002 23:44:13 -0000	1.59
@@ -1,3 +1,3 @@
-/**
+/*
  * $Id$
  *
@@ -380,6 +380,6 @@
 /* Already cleaned up code below, but still look for FIXME:... */
 
-/*
- * Internal function:
+/**
+ * Internal:
[...2757 lines suppressed...]
-	/* Sanity checks are performed elsewhere. */
-	ctx->attr = (ATTR_RECORD*)((char*)mrec +
-			le16_to_cpu(mrec->attrs_offset));
-	ctx->is_first = TRUE;
-	ctx->ntfs_ino = ni;
-	ctx->al_entry = NULL;
-	ctx->base_ntfs_ino = NULL;
-	ctx->base_mrec = NULL;
-	ctx->base_attr = NULL;
-}
-
 /**
  * ntfs_reinit_attr_search_ctx - reinitialize an attribute search context
@@ -2005,4 +2006,6 @@
 
 /**
+ * Inline:
+ *
  * ntfs_get_nr_significant_bytes - get number of bytes needed to store a number
  * @n:		number for which to get the number of bytes for

Index: debug.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/debug.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- debug.c	11 Jul 2002 16:20:33 -0000	1.2
+++ debug.c	11 Jul 2002 23:44:13 -0000	1.3
@@ -25,6 +25,7 @@
 
 #ifdef DEBUG
-
-/* Dump a run list. */
+/**
+ * ntfs_debug_dump_run_list - Dump a run list.
+ */
 void ntfs_debug_dump_run_list(const run_list_element *rl)
 {

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/dir.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- dir.c	11 Jul 2002 16:20:33 -0000	1.7
+++ dir.c	11 Jul 2002 23:44:13 -0000	1.8
@@ -33,6 +33,6 @@
 #include "volume.h"
 
-/**
- * The little endian Unicode string $I30 as a global constant.
+/*
+ * The little endian Unicode string "$I30" as a global constant.
  */
 uchar_t I30[5] = { const_cpu_to_le16('$'), const_cpu_to_le16('I'),
@@ -40,4 +40,130 @@
 		   const_cpu_to_le16('\0') };
 
+/*
+ * The little endian Unicode string ".." as a static global constant.
+ */
+static const uchar_t dotdot[3] = { const_cpu_to_le16('.'),
+				   const_cpu_to_le16('.'),
+				   const_cpu_to_le16('\0') };
+
+typedef union {
+	INDEX_ROOT *ir;
+	INDEX_ALLOCATION *ia;
+} index_union __attribute__ ((__transparent_union__));
+
+typedef enum {
+	INDEX_TYPE_ROOT,	/* index root */
+	INDEX_TYPE_ALLOCATION,	/* index allocation */
+} INDEX_TYPE;
+
+/**
+ * Internal:
+ *
+ * ntfs_filldir - ntfs specific filldir method
+ * @dir_ni:	ntfs inode of current directory
+ * @pos:	current position in directory
+ * @ivcn_bits:	log(2) of index vcn size
+ * @index_type:	specifies whether @iu is an index root or an index allocation
+ * @iu:		index root or index block to which @ie belongs
+ * @ie:		current index entry
+ * @dirent:	context for filldir callback supplied by the caller
+ * @filldir:	filldir callback supplied by the caller
+ *
+ * Pass information specifying the current directory entry @ie to the @filldir
+ * callback.
+ */
+static inline int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, u8 ivcn_bits,
+		const INDEX_TYPE index_type, index_union iu, INDEX_ENTRY *ie,
+		void *dirent, ntfs_filldir_t filldir)
+{
+	FILE_NAME_ATTR *fn = &ie->key.file_name;
+	unsigned dt_type;
+
+	/* Advance the position even if going to skip the entry. */
+	if (index_type == INDEX_TYPE_ALLOCATION)
+		*pos = (u8*)ie - (u8*)iu.ia + (sle64_to_cpu(
+				iu.ia->index_block_vcn) << ivcn_bits) +
+				dir_ni->vol->mft_record_size;
+	else /* if (index_type == INDEX_TYPE_ROOT) */
+		*pos = (u8*)ie - (u8*)iu.ir;
+	/* Skip root directory self reference entry. */
+	if (MREF_LE(ie->indexed_file) == FILE_root)
+		return 0;
+	if (ie->key.file_name.file_attributes &
+			FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT)
+		dt_type = NTFS_DT_DIR;
+	else
+		dt_type = NTFS_DT_REG;
+	return filldir(dirent, fn->file_name, fn->file_name_length,
+			fn->file_name_type, *pos,
+			le64_to_cpu(ie->indexed_file), dt_type);
+}
+
+/**
+ * Internal:
+ *
+ * ntfs_get_parent_mft_ref - find mft reference of parent directory of an inode
+ * @ni:		ntfs inode whose parent directory to find
+ *
+ * Find the parent directory of the ntfs inode @ni. To do this, find the first
+ * file name attribute in the mft record of @ni and return the parent mft
+ * reference from that.
+ *
+ * Note this only makes sense for directories, since files can be hard linked
+ * from multiple directories and there is no way for us to tell which one is
+ * being looked for.
+ *
+ * Technically directories can have hard links, too, but we consider that as
+ * illegal as Linux/UNIX do not support directory hard links.
+ *
+ * Return the mft reference of the parent directory on success or -1 on error
+ * with errno set to the error code.
+ */
+static MFT_REF ntfs_get_parent_mft_ref(ntfs_inode *ni)
+{
+	MFT_REF mref;
+	ntfs_attr_search_ctx *ctx;
+	FILE_NAME_ATTR *fn;
+	int eo;
+
+	if (!ni) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	ctx = ntfs_get_attr_search_ctx(ni, NULL);
+	if (!ctx)
+		return -1;
+	if (ntfs_lookup_attr(AT_FILE_NAME, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+		Dprintf("No file name found in inode 0x%Lx. Corrupt inode.\n",
+				(unsigned long long)ni->mft_no);
+		goto err_out;
+	}
+	if (ctx->attr->non_resident) {
+		Dprintf("File name attribute must be resident. Corrupt inode "
+				"0x%Lx.\n", (unsigned long long)ni->mft_no);
+		goto io_err_out;
+	}
+	fn = (FILE_NAME_ATTR*)((u8*)ctx->attr +
+			le16_to_cpu(ctx->attr->value_offset));
+	if ((u8*)fn +	le32_to_cpu(ctx->attr->value_length) >
+			(u8*)ctx->attr + le32_to_cpu(ctx->attr->length)) {
+		Dprintf("Corrupt file name attribute in inode 0x%Lx.\n",
+				(unsigned long long)ni->mft_no);
+		goto io_err_out;
+	}
+	mref = le64_to_cpu(fn->parent_directory);
+	ntfs_put_attr_search_ctx(ctx);
+	return mref;
+io_err_out:
+	errno = EIO;
+err_out:
+	eo = errno;
+	ntfs_put_attr_search_ctx(ctx);
+	errno = eo;
+	return -1;
+}
+
+
 /**
  * ntfs_lookup_inode_by_name - find an inode in a directory given its name
@@ -450,129 +576,4 @@
 	goto eo_put_err_out;
 }
-
-typedef union {
-	INDEX_ROOT *ir;
-	INDEX_ALLOCATION *ia;
-} index_union __attribute__ ((__transparent_union__));
-
-typedef enum {
-	INDEX_TYPE_ROOT,	/* index root */
-	INDEX_TYPE_ALLOCATION,	/* index allocation */
-} INDEX_TYPE;
-
-/*
- * Internal function:
- *
- * ntfs_filldir - ntfs specific filldir method
- * @dir_ni:	ntfs inode of current directory
- * @pos:	current position in directory
- * @ivcn_bits:	log(2) of index vcn size
- * @index_type:	specifies whether @iu is an index root or an index allocation
- * @iu:		index root or index block to which @ie belongs
- * @ie:		current index entry
- * @dirent:	context for filldir callback supplied by the caller
- * @filldir:	filldir callback supplied by the caller
- *
- * Pass information specifying the current directory entry @ie to the @filldir
- * callback.
- */
-static inline int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, u8 ivcn_bits,
-		const INDEX_TYPE index_type, index_union iu, INDEX_ENTRY *ie,
-		void *dirent, ntfs_filldir_t filldir)
-{
-	FILE_NAME_ATTR *fn = &ie->key.file_name;
-	unsigned dt_type;
-
-	/* Advance the position even if going to skip the entry. */
-	if (index_type == INDEX_TYPE_ALLOCATION)
-		*pos = (u8*)ie - (u8*)iu.ia + (sle64_to_cpu(
-				iu.ia->index_block_vcn) << ivcn_bits) +
-				dir_ni->vol->mft_record_size;
-	else /* if (index_type == INDEX_TYPE_ROOT) */
-		*pos = (u8*)ie - (u8*)iu.ir;
-	/* Skip root directory self reference entry. */
-	if (MREF_LE(ie->indexed_file) == FILE_root)
-		return 0;
-	if (ie->key.file_name.file_attributes &
-			FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT)
-		dt_type = NTFS_DT_DIR;
-	else
-		dt_type = NTFS_DT_REG;
-	return filldir(dirent, fn->file_name, fn->file_name_length,
-			fn->file_name_type, *pos,
-			le64_to_cpu(ie->indexed_file), dt_type);
-}
-
-/*
- * Internal function:
- *
- * ntfs_get_parent_mft_ref - find mft reference of parent directory of an inode
- * @ni:		ntfs inode whose parent directory to find
- *
- * Find the parent directory of the ntfs inode @ni. To do this, find the first
- * file name attribute in the mft record of @ni and return the parent mft
- * reference from that.
- *
- * Note this only makes sense for directories, since files can be hard linked
- * from multiple directories and there is no way for us to tell which one is
- * being looked for.
- *
- * Technically directories can have hard links, too, but we consider that as
- * illegal as Linux/UNIX do not support directory hard links.
- *
- * Return the mft reference of the parent directory on success or -1 on error
- * with errno set to the error code.
- */
-static MFT_REF ntfs_get_parent_mft_ref(ntfs_inode *ni)
-{
-	MFT_REF mref;
-	ntfs_attr_search_ctx *ctx;
-	FILE_NAME_ATTR *fn;
-	int eo;
-
-	if (!ni) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	ctx = ntfs_get_attr_search_ctx(ni, NULL);
-	if (!ctx)
-		return -1;
-	if (ntfs_lookup_attr(AT_FILE_NAME, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
-		Dprintf("No file name found in inode 0x%Lx. Corrupt inode.\n",
-				(unsigned long long)ni->mft_no);
-		goto err_out;
-	}
-	if (ctx->attr->non_resident) {
-		Dprintf("File name attribute must be resident. Corrupt inode "
-				"0x%Lx.\n", (unsigned long long)ni->mft_no);
-		goto io_err_out;
-	}
-	fn = (FILE_NAME_ATTR*)((u8*)ctx->attr +
-			le16_to_cpu(ctx->attr->value_offset));
-	if ((u8*)fn +	le32_to_cpu(ctx->attr->value_length) >
-			(u8*)ctx->attr + le32_to_cpu(ctx->attr->length)) {
-		Dprintf("Corrupt file name attribute in inode 0x%Lx.\n",
-				(unsigned long long)ni->mft_no);
-		goto io_err_out;
-	}
-	mref = le64_to_cpu(fn->parent_directory);
-	ntfs_put_attr_search_ctx(ctx);
-	return mref;
-io_err_out:
-	errno = EIO;
-err_out:
-	eo = errno;
-	ntfs_put_attr_search_ctx(ctx);
-	errno = eo;
-	return -1;
-}
-
-/**
- * The little endian Unicode string .. as a static global constant.
- */
-static const uchar_t dotdot[3] = { const_cpu_to_le16('.'),
-				   const_cpu_to_le16('.'),
-				   const_cpu_to_le16('\0') };
 
 /**

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/inode.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- inode.c	11 Jul 2002 16:20:33 -0000	1.15
+++ inode.c	11 Jul 2002 23:44:13 -0000	1.16
@@ -33,4 +33,9 @@
 #include "runlist.h"
 
+/**
+ * Internal:
+ *
+ * __allocate_ntfs_inode - desc
+ */
 static __inline__ ntfs_inode *__allocate_ntfs_inode(ntfs_volume *vol)
 {
@@ -43,9 +48,9 @@
 }
 
-ntfs_inode *allocate_ntfs_inode(ntfs_volume *vol)
-{
-	return __allocate_ntfs_inode(vol);
-}
-
+/**
+ * Internal:
+ *
+ * __release_ntfs_inode - desc
+ */
 static __inline__ int __release_ntfs_inode(ntfs_inode *ni)
 {
@@ -60,4 +65,13 @@
 	free(ni);
 	return 0;
+}
+
+
+/**
+ * allocate_ntfs_inode - desc
+ */
+ntfs_inode *allocate_ntfs_inode(ntfs_volume *vol)
+{
+	return __allocate_ntfs_inode(vol);
 }
 

Index: runlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/runlist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- runlist.c	11 Jul 2002 16:20:34 -0000	1.3
+++ runlist.c	11 Jul 2002 23:44:13 -0000	1.4
@@ -1,3 +1,3 @@
-/**
+/*
  * $Id$
  *
@@ -35,6 +35,6 @@
 #include "disk_io.h"
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * ntfs_rl_mm - run_list memmove
@@ -47,6 +47,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * rl_mc - run_list memory copy
@@ -59,8 +59,8 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
- * ntfs_rl_realloc - Reallocate memory for run_lists
+ * ntfs_rl_realloc - Reallocate memory for run_lists*
  * @rl:		original run list
  * @old_size:	number of run list elements in the original run list @rl
@@ -87,6 +87,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * ntfs_are_rl_mergeable - test if two run lists can be joined together
@@ -119,6 +119,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * __ntfs_rl_merge - merge two run lists without testing if they can be merged
@@ -136,6 +136,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * ntfs_rl_merge - test if two run lists can be joined together and merge them
@@ -161,6 +161,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * ntfs_rl_append - append a run list after a given element
@@ -228,6 +228,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * ntfs_rl_insert - insert a run list into another
@@ -337,6 +337,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * ntfs_rl_replace - overwrite a run_list element with another run list
@@ -403,6 +403,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * ntfs_rl_split - insert a run list into the centre of a hole

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -U2 -r1.49 -r1.50
--- volume.c	11 Jul 2002 16:20:34 -0000	1.49
+++ volume.c	11 Jul 2002 23:44:13 -0000	1.50
@@ -39,6 +39,6 @@
 #include "runlist.h"
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * __allocate_ntfs_volume -
@@ -50,6 +50,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * __release_ntfs_volume -
@@ -83,8 +83,6 @@
 }
 
-extern ntfs_inode *allocate_ntfs_inode(ntfs_volume *);
-
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * ntfs_load_mft - load the $MFT and setup the ntfs volume with it
@@ -292,6 +290,6 @@
 }
 
-/*
- * Internal function:
+/**
+ * Internal:
  *
  * ntfs_load_mftmirr - load the $MFTMirr and setup the ntfs volume with it
@@ -357,4 +355,38 @@
 }
 
+#ifdef HAVE_MNTENT_H
+/**
+ * Internal:
+ *
+ * ntfs_check_mntent - desc
+ *
+ * If you are wanting to use this, you actually wanted to use
+ * ntfs_check_if_mounted(), you just didn't realize. (-:
+ *
+ * See description of ntfs_check_if_mounted(), below.
+ */
+static int ntfs_check_mntent(const char *file, unsigned long *mnt_flags)
+{
+	struct mntent *mnt;
+	FILE *f;
+
+	if (!(f = setmntent(MOUNTED, "r")))
+		return -1;
+	while ((mnt = getmntent(f)))
+		if (!strcmp(file, mnt->mnt_fsname))
+			break;
+	endmntent(f);
+	if (!mnt)
+		return 0;
+	*mnt_flags = NTFS_MF_MOUNTED;
+	if (!strcmp(mnt->mnt_dir, "/"))
+		*mnt_flags |= NTFS_MF_ISROOT;
+	if (hasmntopt(mnt, "ro") && !hasmntopt(mnt, "rw"))
+		*mnt_flags |= NTFS_MF_READONLY;
+	return 0;
+}
+
+#endif
+
 /**
  * ntfs_startup_volume - allocate and setup an ntfs volume
@@ -807,34 +839,4 @@
 }
 
-#ifdef HAVE_MNTENT_H
-/**
- * Internal function: ntfs_check_mntent
- *
- * If you are wanting to use this, you actually wanted to use
- * ntfs_check_if_mounted(), you just didn't realize. (-:
- *
- * See description of ntfs_check_if_mounted(), below.
- */
-static int ntfs_check_mntent(const char *file, unsigned long *mnt_flags)
-{
-	struct mntent *mnt;
-	FILE *f;
-
-	if (!(f = setmntent(MOUNTED, "r")))
-		return -1;
-	while ((mnt = getmntent(f)))
-		if (!strcmp(file, mnt->mnt_fsname))
-			break;
-	endmntent(f);
-	if (!mnt)
-		return 0;
-	*mnt_flags = NTFS_MF_MOUNTED;
-	if (!strcmp(mnt->mnt_dir, "/"))
-		*mnt_flags |= NTFS_MF_ISROOT;
-	if (hasmntopt(mnt, "ro") && !hasmntopt(mnt, "rw"))
-		*mnt_flags |= NTFS_MF_READONLY;
-	return 0;
-}
-#endif
 
 /**

[Linux-NTFS-cvs] CVS: linux-ntfs/include inode.h,1.12,1.13 runlist.h,1.3,1.4

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv1868/include

Modified Files:
	inode.h runlist.h 
Log Message:
new function headers and a few function moves


Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/inode.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- inode.h	11 Jul 2002 16:20:32 -0000	1.12
+++ inode.h	11 Jul 2002 23:44:13 -0000	1.13
@@ -101,4 +101,6 @@
 };
 
+extern ntfs_inode *allocate_ntfs_inode(ntfs_volume *vol);
+
 extern ntfs_inode *ntfs_open_inode(ntfs_volume *vol, const MFT_REF mref);
 

Index: runlist.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/runlist.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- runlist.h	11 Jul 2002 16:20:33 -0000	1.3
+++ runlist.h	11 Jul 2002 23:44:13 -0000	1.4
@@ -28,5 +28,5 @@
 #include "types.h"
 
-/* In memory vcn to lcn mapping array. */
+/* Forward declarations */
 typedef struct _run_list_element run_list_element;
 typedef run_list_element run_list;
@@ -35,5 +35,5 @@
 #include "volume.h"
 
-/**
+/*
  * run_list_element - in memory vcn to lcn mapping array element
  * @vcn:	starting vcn of the current array element

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsinfo.c,1.13,1.14

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

Changes by: flatcap

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

Modified Files:
	ntfsinfo.c 
Log Message:
new function headers and a few function moves


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsinfo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- ntfsinfo.c	11 Jul 2002 16:20:34 -0000	1.13
+++ ntfsinfo.c	11 Jul 2002 23:44:14 -0000	1.14
@@ -80,11 +80,11 @@
 	MFT_REF mref;
 	MFT_RECORD *mrec = NULL;
-	ATTR_RECORD *attr = NULL;
-	FILE_NAME_ATTR *file_name_attr = NULL;
-	STANDARD_INFORMATION *standard_information = NULL;
-	SECURITY_DESCRIPTOR_RELATIVE *security_descriptor = NULL;
+	//ATTR_RECORD *attr = NULL;
+	//FILE_NAME_ATTR *file_name_attr = NULL;
+	//STANDARD_INFORMATION *standard_information = NULL;
+	//SECURITY_DESCRIPTOR_RELATIVE *security_descriptor = NULL;
 	ntfs_attr_search_ctx *ctx = NULL;
 	ntfs_volume *vol = NULL;
-	char *file_name;
+	//char *file_name;
 	ntfs_inode *inode = NULL;
 

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/fs/ntfs sysctl.c,1.2,NONE sysctl.h,1.2,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv19361

Removed Files:
	sysctl.c sysctl.h 
Log Message:
Forgot to remove those


--- sysctl.c DELETED ---

--- sysctl.h DELETED ---

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 README.where.have.all.the.files.gone,NONE,1.1

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv18905

Added Files:
	README.where.have.all.the.files.gone 
Log Message:
Everything is tagged as final branch and then deleted from head. Add a README to branch to tell people to look at http://linux-ntfs.sf.net/downloads.html


--- NEW FILE ---

!!! NOTE !!! NOTE !!! NOTE !!!

There is now a new NTFS driver for the 2.4.x kernel. It is a backport of the
new NTFS driver present in the 2.5.x kernels (since 2.5.11).

You can download the driver in form of a patch for the 2.4.x kernel series
from the Linux NTFS download page:

	http://linux-ntfs.sf.net/downloads.html

!!! NOTE !!! NOTE !!! NOTE !!!

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/fs/ntfs Makefile,1.11,NONE attr.c,1.15,NONE attr.h,1.7,NONE dir.c,1.17,NONE dir.h,1.5,NONE fs.c,1.34,NONE inode.c,1.28,NONE inode.h,1.6,NONE macros.h,1.7,NONE ntfsendian.h,1.4,NONE ntfstypes.h,1.3,NONE struct.h,1.8,NONE super.c,1.28,NONE super.h,1.9,NONE support.c,1.11,NONE support.h,1.5,NONE unistr.c,1.4,NONE unistr.h,1.2,NONE upcase.c,1.2,NONE util.c,1.3,NONE util.h,1.3,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv18420/linux/fs/ntfs

Removed Files:
	Makefile attr.c attr.h dir.c dir.h fs.c inode.c inode.h 
	macros.h ntfsendian.h ntfstypes.h struct.h super.c super.h 
	support.c support.h unistr.c unistr.h upcase.c util.c util.h 
Log Message:
Everything is tagged as final branch and then deleted from head. Add a README to branch to tell people to look at http://linux-ntfs.sf.net/downloads.html


--- Makefile DELETED ---

--- attr.c DELETED ---

--- attr.h DELETED ---

--- dir.c DELETED ---

--- dir.h DELETED ---

--- fs.c DELETED ---

--- inode.c DELETED ---

--- inode.h DELETED ---

--- macros.h DELETED ---

--- ntfsendian.h DELETED ---

--- ntfstypes.h DELETED ---

--- struct.h DELETED ---

--- super.c DELETED ---

--- super.h DELETED ---

--- support.c DELETED ---

--- support.h DELETED ---

--- unistr.c DELETED ---

--- unistr.h DELETED ---

--- upcase.c DELETED ---

--- util.c DELETED ---

--- util.h DELETED ---

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/scripts get_ntfs_driver_version,1.1,NONE make_ntfs_sym_link,1.1,NONE make_ntfs_sym_links,1.1,NONE ntfsextra.h,1.1,NONE

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

Changes by: antona

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

Removed Files:
	get_ntfs_driver_version make_ntfs_sym_link make_ntfs_sym_links 
	ntfsextra.h 
Log Message:
Everything is tagged as final branch and then deleted from head. Add a README to branch to tell people to look at http://linux-ntfs.sf.net/downloads.html


--- get_ntfs_driver_version DELETED ---

--- make_ntfs_sym_link DELETED ---

--- make_ntfs_sym_links DELETED ---

--- ntfsextra.h DELETED ---

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/include/linux ntfs_fs.h,1.10,NONE ntfs_fs_i.h,1.8,NONE ntfs_fs_sb.h,1.8,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv18420/linux/include/linux

Removed Files:
	ntfs_fs.h ntfs_fs_i.h ntfs_fs_sb.h 
Log Message:
Everything is tagged as final branch and then deleted from head. Add a README to branch to tell people to look at http://linux-ntfs.sf.net/downloads.html


--- ntfs_fs.h DELETED ---

--- ntfs_fs_i.h DELETED ---

--- ntfs_fs_sb.h DELETED ---

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/Documentation/filesystems ntfs.txt,1.24,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/Documentation/filesystems
In directory usw-pr-cvs1:/tmp/cvs-serv18420/linux/Documentation/filesystems

Removed Files:
	ntfs.txt 
Log Message:
Everything is tagged as final branch and then deleted from head. Add a README to branch to tell people to look at http://linux-ntfs.sf.net/downloads.html


--- ntfs.txt DELETED ---

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 AUTHORS,1.1.1.1,NONE BUGS,1.4,NONE COPYING,1.1.1.1,NONE CREDITS,1.6,NONE ChangeLog,1.6,NONE INSTALL,1.6,NONE Makefile,1.15,NONE Makefile.module,1.5,NONE NEWS,1.3,NONE README,1.7,NONE vu_todos,1.3,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv18420

Removed Files:
	AUTHORS BUGS COPYING CREDITS ChangeLog INSTALL Makefile 
	Makefile.module NEWS README vu_todos 
Log Message:
Everything is tagged as final branch and then deleted from head. Add a README to branch to tell people to look at http://linux-ntfs.sf.net/downloads.html


--- AUTHORS DELETED ---

--- BUGS DELETED ---

--- COPYING DELETED ---

--- CREDITS DELETED ---

--- ChangeLog DELETED ---

--- INSTALL DELETED ---

--- Makefile DELETED ---

--- Makefile.module DELETED ---

--- NEWS DELETED ---

--- README DELETED ---

--- vu_todos DELETED ---

[Linux-NTFS-cvs] CVS: linux-ntfs Makefile.am,1.11,1.12 Makefile.in,1.18,1.19

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

Changes by: antona

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

Modified Files:
	Makefile.am Makefile.in 
Log Message:
fix make dist


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- Makefile.am	5 Jun 2002 20:32:52 -0000	1.11
+++ Makefile.am	11 Jul 2002 16:45:07 -0000	1.12
@@ -9,7 +9,7 @@
 SUBDIRS = doc include libntfs ntfstools
 
-EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.ntfsfix ChangeLog \
-		INSTALL NEWS README autogen.sh linux-ntfs.spec.in TODO.mkntfs \
-		TODO.ntfslabel TODO.ntfsinfo TODO.libntfs
+EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.libntfs ChangeLog \
+		INSTALL NEWS README autogen.sh linux-ntfs.spec.in \
+		TODO.ntfstools
 
 AUTOMAKE_OPTIONS = gnu

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- Makefile.in	5 Jun 2002 20:32:52 -0000	1.18
+++ Makefile.in	11 Jul 2002 16:45:07 -0000	1.19
@@ -94,7 +94,7 @@
 SUBDIRS = doc include libntfs ntfstools
 
-EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.ntfsfix ChangeLog \
-		INSTALL NEWS README autogen.sh linux-ntfs.spec.in TODO.mkntfs \
-		TODO.ntfslabel TODO.ntfsinfo TODO.libntfs
+EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.libntfs ChangeLog \
+		INSTALL NEWS README autogen.sh linux-ntfs.spec.in \
+		TODO.ntfstools
 
 

[Linux-NTFS-cvs] CVS: linux-ntfs/doc template.c,1.2,1.3 template.h,1.1,1.2

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/doc
In directory usw-pr-cvs1:/tmp/cvs-serv17019/doc

Modified Files:
	template.c template.h 
Log Message:
whitespace and include guards


Index: template.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/doc/template.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- template.c	3 Jul 2002 21:56:00 -0000	1.2
+++ template.c	11 Jul 2002 16:20:32 -0000	1.3
@@ -27,10 +27,10 @@
 
 /*
- * WARNING: This program might not work on architectures which do not allow 
- * unaligned access. For those, the program would need to start using 
+ * WARNING: This program might not work on architectures which do not allow
+ * unaligned access. For those, the program would need to start using
  * get/put_unaligned macros (#include <asm/unaligned.h>), but not doing it yet,
  * since NTFS really mostly applies to ia32 only, which does allow unaligned
- * accesses. We might not actually have a problem though, since the structs are 
- * defined as being packed so that might be enough for gcc to insert the 
+ * accesses. We might not actually have a problem though, since the structs are
+ * defined as being packed so that might be enough for gcc to insert the
  * correct code.
  *

Index: template.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/doc/template.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- template.h	23 Jan 2001 16:35:04 -0000	1.1
+++ template.h	11 Jul 2002 16:20:32 -0000	1.2
@@ -9,18 +9,18 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NAME_H
-#define NAME_H
+#ifndef NTFS_NAME_H
+#define NTFS_NAME_H
 
-#endif /* defined NAME_H */
+#endif /* defined NTFS_NAME_H */
 

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools dumplog.c,1.9,1.10 mkntfs.c,1.79,1.80 ntfsdump_logfile.c,1.26,1.27 ntfsfix.c,1.37,1.38 ntfsinfo.c,1.12,1.13 ntfslabel.c,1.16,1.17 ntfsresize.c,1.8,1.9 sd.c,1.5,1.6

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

Changes by: flatcap

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

Modified Files:
	dumplog.c mkntfs.c ntfsdump_logfile.c ntfsfix.c ntfsinfo.c 
	ntfslabel.c ntfsresize.c sd.c 
Log Message:
whitespace and include guards


Index: dumplog.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/dumplog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- dumplog.c	3 Jul 2002 21:56:01 -0000	1.9
+++ dumplog.c	11 Jul 2002 16:20:34 -0000	1.10
@@ -114,5 +114,5 @@
 	if (!is_rstr_recordp(lfd)) {
 		s64 _l;
-		
+
 		for (_l = 0LL; _l < l; _l++)
 			if (lfd[_l] != (unsigned char)-1)
@@ -140,5 +140,5 @@
 		goto skip_rstr_pass;
 	}
-	if (le16_to_cpu(rph->major_ver != 1) || 
+	if (le16_to_cpu(rph->major_ver != 1) ||
 	    le16_to_cpu(rph->minor_ver != 1)) {
 		fprintf(stderr, "$LogFile version %i.%i! Error: Unknown "
@@ -170,5 +170,5 @@
 	printf("SeqNumberBits = %u (0x%x)\n", le32_to_cpu(rr->seq_number_bits),
 			le32_to_cpu(rr->seq_number_bits));
-	printf("RestartAreaLength = 0x%x\n", 
+	printf("RestartAreaLength = 0x%x\n",
 			le16_to_cpu(rr->restart_area_length));
 	printf("ClientArrayOffset = 0x%x\n",
@@ -179,10 +179,10 @@
 			le32_to_cpu(rr->last_lsn_data_length));
 	printf("RecordLength = 0x%x\n", le16_to_cpu(rr->record_length));
-	printf("LogPageDataOffset = 0x%x\n", 
+	printf("LogPageDataOffset = 0x%x\n",
 			le16_to_cpu(rr->log_page_data_offset));
 	for (client = 0; client < le16_to_cpu(rr->log_clients); client++) {
 		printf("\nRestart client record number %i:\n", client);
 		printf("OldestLsn = 0x%Lx\n", sle64_to_cpu(cr->oldest_lsn));
-		printf("ClientRestartLsn = 0x%Lx\n", 
+		printf("ClientRestartLsn = 0x%Lx\n",
 				sle64_to_cpu(cr->client_restart_lsn));
 		printf("PrevClient = %i\n", sle16_to_cpu(cr->prev_client));

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -U2 -r1.79 -r1.80
--- mkntfs.c	9 Jul 2002 19:17:49 -0000	1.79
+++ mkntfs.c	11 Jul 2002 16:20:34 -0000	1.80
@@ -33,10 +33,10 @@
 
 /*
- * WARNING: This program might not work on architectures which do not allow 
- * unaligned access. For those, the program would need to start using 
+ * WARNING: This program might not work on architectures which do not allow
+ * unaligned access. For those, the program would need to start using
  * get/put_unaligned macros (#include <asm/unaligned.h>), but not doing it yet,
  * since NTFS really mostly applies to ia32 only, which does allow unaligned
- * accesses. We might not actually have a problem though, since the structs are 
- * defined as being packed so that might be enough for gcc to insert the 
+ * accesses. We might not actually have a problem though, since the structs are
+ * defined as being packed so that might be enough for gcc to insert the
  * correct code.
  *
@@ -247,5 +247,5 @@
 {
 	long long *new_buf;
-	
+
 	if (!(opt.nr_bad_blocks & 15)) {
 		new_buf = realloc(opt.bad_blocks, (opt.nr_bad_blocks + 16) *
@@ -265,5 +265,5 @@
 	long long bytes_written, total;
 	int retry;
-	
+
 	if (opt.no_action)
 		return count;
@@ -383,5 +383,5 @@
 {
 	int i;
-	
+
 	for (i = 0; i < maxlen; i++)
 		if (!s[i])
@@ -404,5 +404,5 @@
 	uchar_t u;
 	int i;
-	
+
 	/* Need one byte for null terminator. */
 	maxlen--;
@@ -432,5 +432,5 @@
 	char c;
 	int i;
-	
+
 	/* Need two bytes for null terminator. */
 	maxlen -= 2;
@@ -453,5 +453,5 @@
 	char *buf;
 	int i, j;
-	
+
 	switch (type) {
 	case AT_STANDARD_INFORMATION:
@@ -592,5 +592,5 @@
 {
 	int i;
-	
+
 	i = le32_to_cpu(a->value_length);
 	printf("Attribute value length = %u (0x%x)\n", i, i);
@@ -619,5 +619,5 @@
 	s64 l;
 	int i;
-	
+
 	l = sle64_to_cpu(a->lowest_vcn);
 	printf("Lowest VCN = %Li (0x%Lx)\n", l, l);
@@ -742,5 +742,5 @@
 	unsigned int u;
 	MFT_REF r;
-	
+
 	printf("-- Beginning dump of mft record. --\n");
 	u = le32_to_cpu(m->magic);
@@ -787,5 +787,5 @@
 {
 	ATTR_RECORD *a;
-	
+
 	memset(m, 0, vol->mft_record_size);
 	m->magic = magic_FILE;
@@ -837,5 +837,5 @@
  *
  * @pos points to the attribute in front of which we want to make space.
- * 
+ *
  * Return 0 on success or -errno on error. Possible error codes are:
  *
@@ -849,5 +849,5 @@
 {
 	u32 biu;
-	
+
 	if (!size)
 		return 0;
@@ -916,5 +916,5 @@
 	LCN j;
 	int i;
-	
+
 	if (!rl)
 		return;
@@ -932,5 +932,5 @@
 /*
  * Allocate @clusters and create a run list of the allocated clusters.
- * 
+ *
  * Return the allocated run list. Caller has to free the run list when finished
  * with it.
@@ -1178,5 +1178,5 @@
 			Eprintf("Error writing non-resident attribute value."
 				"\n");
-		err = ntfs_build_mapping_pairs(vol, (s8*)a + hdr_size + 
+		err = ntfs_build_mapping_pairs(vol, (s8*)a + hdr_size +
 				((name_len + 7) & ~7), mpa_size, rl);
 	}
@@ -1364,5 +1364,5 @@
 			Eprintf("Error writing non-resident attribute value."
 				"\n");
-		err = ntfs_build_mapping_pairs(vol, (s8*)a + hdr_size + 
+		err = ntfs_build_mapping_pairs(vol, (s8*)a + hdr_size +
 				((name_len + 7) & ~7), mpa_size, rl);
 	}
@@ -1606,5 +1606,5 @@
  * Create the security descriptor attribute adding the security descriptor @sd
  * of length @sd_len to the mft record @m.
- * 
+ *
  * Return 0 on success or -errno on error.
  */
@@ -1682,5 +1682,5 @@
 }
 
-/* 
+/*
  * Create volume name attribute specifying the volume name @vol_name as a null
  * terminated char string of length @vol_name_len (number of characters not
@@ -1688,5 +1688,5 @@
  * endian uchar_t string. The name is at least 1 character long and at most
  * 0xff characters long (not counting the terminating null).
- * 
+ *
  * Return 0 on success or -errno on error.
  */
@@ -1696,5 +1696,5 @@
 	uchar_t *uname;
 	int i, len;
-	
+
 	if (vol_name_len) {
 		len = (vol_name_len + 1) * sizeof(uchar_t);
@@ -1879,5 +1879,5 @@
  * attribute accordingly and move all of the index entries from the index root
  * into the index allocation.
- * 
+ *
  * Return 0 on success or -errno on error.
  */
@@ -1895,5 +1895,5 @@
 	char *re_start, *re_end;
 	int i, err, index_block_size;
-	
+
 	if (name_len) {
 		i = (name_len + 1) * sizeof(uchar_t);
@@ -1999,5 +1999,5 @@
 	r->index.allocated_size = r->index.index_length;
 	/* Resize index root attribute. */
-	err = resize_resident_attribute_value(m, a, sizeof(INDEX_ROOT) - 
+	err = resize_resident_attribute_value(m, a, sizeof(INDEX_ROOT) -
 			sizeof(INDEX_HEADER) +
 			le32_to_cpu(r->index.allocated_size));
@@ -2037,5 +2037,5 @@
 /*
  * Create space of @size bytes at position @pos inside the index block @index.
- * 
+ *
  * Return 0 on success or -errno on error.
  */
@@ -2044,5 +2044,5 @@
 {
 	u32 biu;
-	
+
 	if (!size)
 		return 0;
@@ -2089,5 +2089,5 @@
  * the file with mft reference @file_ref into the index (allocation) block
  * @index (which belongs to @file_ref's parent directory).
- * 
+ *
  * Return 0 on success or -errno on error.
  */
@@ -2098,5 +2098,5 @@
 	INDEX_ENTRY *ie;
 	char *index_end;
-	
+
 	/*
 	 * Lookup dir entry @file_name in dir @index to determine correct
@@ -2215,10 +2215,10 @@
  * Create a file_name_attribute in the mft record @m_file which points to the
  * parent directory with mft reference @ref_parent.
- * 
+ *
  * Then, insert an index entry with this file_name_attribute in the index
  * block @index of the index allocation attribute of the parent directory.
  *
  * @ref_file is the mft reference of @m_file.
- * 
+ *
  * Return 0 on success or -errno on error.
  */
@@ -2611,5 +2611,5 @@
 	/* Acquire exlusive (mandatory) write lock on the whole device. */
 	memset(&flk, 0, sizeof(flk));
-	if (opt.no_action) 
+	if (opt.no_action)
 		flk.l_type = F_RDLCK;
 	else

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- ntfsdump_logfile.c	8 Jul 2002 23:27:17 -0000	1.26
+++ ntfsdump_logfile.c	11 Jul 2002 16:20:34 -0000	1.27
@@ -31,10 +31,10 @@
 
 /*
- * WARNING: This program might not work on architectures which do not allow 
- * unaligned access. For those, the program would need to start using 
+ * WARNING: This program might not work on architectures which do not allow
+ * unaligned access. For those, the program would need to start using
  * get/put_unaligned macros (#include <asm/unaligned.h>), but not doing it yet,
  * since NTFS really mostly applies to ia32 only, which does allow unaligned
- * accesses. We might not actually have a problem though, since the structs are 
- * defined as being packed so that might be enough for gcc to insert the 
+ * accesses. We might not actually have a problem though, since the structs are
+ * defined as being packed so that might be enough for gcc to insert the
  * correct code.
  *
@@ -116,5 +116,5 @@
 			/* Fall through on error. */
 		default:
-version_error:			
+version_error:
                 	fprintf(stderr, "Error: Unknown NTFS version.\n");
 			goto error_exit;
@@ -164,5 +164,5 @@
 	if (!is_rstr_recordp(lfd)) {
 		s64 _l;
-		
+
 		for (_l = 0LL; _l < l; _l++)
 			if (lfd[_l] != (unsigned char)-1)
@@ -190,5 +190,5 @@
 		goto skip_rstr_pass;
 	}
-	if (le16_to_cpu(rph->major_ver != 1) || 
+	if (le16_to_cpu(rph->major_ver != 1) ||
 	    le16_to_cpu(rph->minor_ver != 1)) {
 		fprintf(stderr, "$LogFile version %i.%i! Error: Unknown "
@@ -220,5 +220,5 @@
 	printf("SeqNumberBits = %u (0x%x)\n", le32_to_cpu(rr->seq_number_bits),
 			le32_to_cpu(rr->seq_number_bits));
-	printf("RestartAreaLength = 0x%x\n", 
+	printf("RestartAreaLength = 0x%x\n",
 			le16_to_cpu(rr->restart_area_length));
 	printf("ClientArrayOffset = 0x%x\n",
@@ -232,10 +232,10 @@
 			le32_to_cpu(rr->last_lsn_data_length));
 	printf("RecordLength = 0x%x\n", le16_to_cpu(rr->record_length));
-	printf("LogPageDataOffset = 0x%x\n", 
+	printf("LogPageDataOffset = 0x%x\n",
 			le16_to_cpu(rr->log_page_data_offset));
 	for (client = 0; client < le16_to_cpu(rr->log_clients); client++) {
 		printf("\nRestart client record number %i:\n", client);
 		printf("OldestLsn = 0x%Lx\n", sle64_to_cpu(cr->oldest_lsn));
-		printf("ClientRestartLsn = 0x%Lx\n", 
+		printf("ClientRestartLsn = 0x%Lx\n",
 				sle64_to_cpu(cr->client_restart_lsn));
 		printf("PrevClient = %i\n", sle16_to_cpu(cr->prev_client));

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -U2 -r1.37 -r1.38
--- ntfsfix.c	8 Jul 2002 23:27:17 -0000	1.37
+++ ntfsfix.c	11 Jul 2002 16:20:34 -0000	1.38
@@ -32,10 +32,10 @@
 
 /*
- * WARNING: This program might not work on architectures which do not allow 
- * unaligned access. For those, the program would need to start using 
+ * WARNING: This program might not work on architectures which do not allow
+ * unaligned access. For those, the program would need to start using
  * get/put_unaligned macros (#include <asm/unaligned.h>), but not doing it yet,
  * since NTFS really mostly applies to ia32 only, which does allow unaligned
- * accesses. We might not actually have a problem though, since the structs are 
- * defined as being packed so that might be enough for gcc to insert the 
+ * accesses. We might not actually have a problem though, since the structs are
+ * defined as being packed so that might be enough for gcc to insert the
  * correct code.
  *
@@ -134,5 +134,5 @@
 		goto error_exit;
 	}
-	
+
 	puts("Processing $MFT and $MFTMirr.");
 
@@ -283,5 +283,5 @@
 		/* Fall through on error. */
 	default:
-version_error:			
+version_error:
                	fprintf(stderr, "Error: Unknown NTFS version.\n");
 		goto error_exit;
@@ -383,5 +383,5 @@
 	 * - return a copy of the attribute so the MFT_RECORD can be
 	 * adjusted accordingly with changes in the length of the resident
-	 * part of the attribute by the caller. 
+	 * part of the attribute by the caller.
 	 * For now, just assume that attribute length remains constant, since
 	 * this is the case for the $LogFile zeroing out. */
@@ -410,9 +410,9 @@
 	   using it for. */
 	}
-	
+
 	/* FIXME: Should we be marking the quota out of date, too? */
 
 	/* That's all for now! */
-	printf("NTFS partition %s was processed successfully.\n", 
+	printf("NTFS partition %s was processed successfully.\n",
 			vol->dev_name);
 	/* Set return code to 0. */

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsinfo.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- ntfsinfo.c	8 Jul 2002 23:27:17 -0000	1.12
+++ ntfsinfo.c	11 Jul 2002 16:20:34 -0000	1.13
@@ -3,5 +3,5 @@
  *
  * ntfsinfo - Part of the Linux-NTFS project.
- * 
+ *
  * Copyright (c) 2002 Matthew J. Fanto
  * Copyright (c) 2002 Anton Altaparmakov
@@ -100,29 +100,29 @@
 
 	ctx = ntfs_get_attr_search_ctx(inode, mrec);
-	
+
 //	print_file_name_attr(ctx);
 
 //	ctx = ntfs_get_attr_search_ctx(inode, mrec);	//need to fix this
-	
+
 	print_standard_information_attr(ctx);
 }
 
-	 
+
 s64 ntfs2time(s64 time)
 {
 	s64 t;
-	printf("Original Time: %Li\n",time);	
+	printf("Original Time: %Li\n",time);
 	t = time - NTFS_TIME_OFFSET;
 	t = t / 10000000;
 	return t;
-	
+
 
 }
-				
+
 void print_standard_information_attr(ntfs_attr_search_ctx *ctx)
 {
 	ATTR_RECORD *attr = NULL;
 	STANDARD_INFORMATION *standard_information_attr = NULL;
-	
+
 	if (ntfs_lookup_attr
 		(AT_STANDARD_INFORMATION, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
@@ -136,5 +136,5 @@
 	    (STANDARD_INFORMATION *) ((char *) attr +
 				      le16_to_cpu(attr->value_offset));
-	
+
 	printf("Creation time: %Li\n",
 		ntfs2time(standard_information_attr->creation_time));
@@ -173,5 +173,5 @@
 	attr = ctx->attr;
 	ctx = c;
-	
+
 	file_name_attr =
 	    (FILE_NAME_ATTR *) ((char *) attr +

Index: ntfslabel.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfslabel.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- ntfslabel.c	8 Jul 2002 23:27:17 -0000	1.16
+++ ntfslabel.c	11 Jul 2002 16:20:34 -0000	1.17
@@ -3,5 +3,5 @@
  *
  * ntfslabel - Part of the Linux-NTFS project.
- * 
+ *
  * Copyright (c) 2002 Matthew J. Fanto
  * Copyright (c) 2002 Anton Altaparmakov

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsresize.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- ntfsresize.c	11 Jul 2002 12:49:48 -0000	1.8
+++ ntfsresize.c	11 Jul 2002 16:20:34 -0000	1.9
@@ -173,5 +173,5 @@
 	/* Needs to be multiple of 8 bytes */
 	bm_bsize = (bm_bsize + 7) & ~7;
-	printf("Bitmap byte size  : %lld (%lld clusters)\n", 
+	printf("Bitmap byte size  : %lld (%lld clusters)\n",
 	       bm_bsize, rounded_up_division(bm_bsize, vol->cluster_size));
 
@@ -208,5 +208,5 @@
 {
 	ntfs_attr_search_ctx *ctx;
-	
+
 	if (!(ctx = ntfs_get_attr_search_ctx(NULL, mr)))
                 perr_exit("ntfs_get_attr_search_ctx");
@@ -238,8 +238,8 @@
 	/* FIXME: get_attribute_value_length() can't handle extents */
 	bm->size = get_attribute_value_length(ctx->attr);
-	
+
 	if (!(bm->bm = (u8 *)malloc(bm->size)))
 	    perr_exit("get_bitmap_data");
-	
+
 	if (get_attribute_value(vol, ni->mrec, ctx->attr, bm->bm) != bm->size)
 		perr_exit("Couldn't get $Bitmap $DATA\n");
@@ -305,5 +305,5 @@
 		mref = (MFT_REF)inode;
 		if (ntfs_read_file_record(vol, mref, &mrec, NULL)) {
-			/* FIXME: continue only if it make sense, e.g. 
+			/* FIXME: continue only if it make sense, e.g.
 			   MFT record not in use based on $MFT bitmap */
 			if (errno == EIO)
@@ -324,8 +324,8 @@
 {
 	u64 i;
-	
+
 	printf(NERR_PREFIX "Fragmented volume not yet supported. "
 		 "Defragment it before resize.\n");
-	
+
 	for (i = vol->nr_clusters - 1; i > 0; i--)
 		if (ntfs_get_bit(lcn_bitmap.bm, i))
@@ -350,5 +350,5 @@
 		if (rl[i].lcn != LCN_HOLE)
 			err_exit("Volume has bad sectors, not supported\n");
-	
+
 	free(rl);
 }
@@ -374,7 +374,7 @@
 
 
-/* 
+/*
  * FIXME: this function should go away and instead using a generalized
- * "truncate_bitmap_unnamed_attr()" 
+ * "truncate_bitmap_unnamed_attr()"
  */
 void truncate_badclust_bad_attr(ATTR_RECORD *a, s64 nr_clusters)
@@ -383,5 +383,5 @@
 	int mp_size;
 	char *mp;
-	
+
 	if (!a->non_resident)
 		/* FIXME: handle resident attribute value */
@@ -390,5 +390,5 @@
 	if (!(rl_bad = (run_list *)malloc(2 * sizeof(run_list))))
 		perr_exit("Couldn't get memory");
-	
+
 	rl_set(rl_bad, 0LL, (LCN)LCN_HOLE, nr_clusters);
 	rl_set(rl_bad + 1, nr_clusters, -1LL, 0LL);
@@ -410,5 +410,5 @@
 	free(mp);
 }
-	
+
 
 void truncate_bitmap_unnamed_attr(ATTR_RECORD *a, s64 nr_clusters)
@@ -420,5 +420,5 @@
 	int trunc_at = -1;	/* FIXME: -1 means unset */
 	char *mp;
-	
+
 
 	if (!a->non_resident)
@@ -454,5 +454,5 @@
 
 	if (trunc_at != -1) {
-		/* NOTE: 'i' always > 0 */ 
+		/* NOTE: 'i' always > 0 */
 		i = nr_bm_clusters - rl[trunc_at].vcn;
 		rl[trunc_at].length = i;
@@ -462,5 +462,5 @@
 		       "new cluster length %d\n", trunc_at, i);
 	}
-	
+
 	if (!opt.ro_flag) {
 		size = ntfs_rl_pwrite(vol, rl, 0, bm_bsize, lcn_bitmap.bm);
@@ -507,5 +507,5 @@
 	if (!(*ctx = ntfs_get_attr_search_ctx(ni, NULL)))
                 perr_exit("ntfs_get_attr_search_ctx");
-	
+
 	if (aname && ((len = ntfs_mbstoucs(aname, &ustr, 0)) == -1))
 		perr_exit("Unable to convert string to Unicode");
@@ -536,5 +536,5 @@
 {
 	ntfs_attr_search_ctx *ctx = NULL;
-	
+
 	printf("Updating $BadClust file ...\n");
 
@@ -544,8 +544,8 @@
 	/* FIXME: should use an "extended" truncate_bitmap_unnamed_attr() */
 	truncate_badclust_bad_attr(ctx->attr, nr_clusters);
-	
+
 	if (write_mft_record(ctx))
 		perr_exit("Couldn't update $BadClust");
-	
+
 	/* FIXME: clean up API => ntfs_put_attr_search_ctx() also closes ni */
 	ntfs_put_attr_search_ctx(ctx);
@@ -556,5 +556,5 @@
 {
 	ntfs_attr_search_ctx *ctx = NULL;
-	
+
 	printf("Updating $Bitmap file ...\n");
 
@@ -565,5 +565,5 @@
 	if (write_mft_record(ctx))
 		perr_exit("Couldn't update $Bitmap");
-	
+
 	ntfs_put_attr_search_ctx(ctx);
 }
@@ -574,5 +574,5 @@
 	/* Determine lcn bitmap byte size and allocate it. */
 	lcn_bitmap.size = nr_clusters_to_bitmap_byte_size(vol->nr_clusters);
-	
+
 	if (!(lcn_bitmap.bm = (unsigned char *)calloc(1, lcn_bitmap.size)))
 		perr_exit("Failed to allocate internal buffer");
@@ -586,5 +586,5 @@
 {
 	NTFS_BOOT_SECTOR bs;
-	
+
 	printf("Updating Boot record ...\n");
 
@@ -616,5 +616,5 @@
 	if (!(vol = ntfs_mount(opt.volume, opt.ro_flag)))
                 perr_exit("ntfs_mount failed");
-	
+
 	if (vol->flags & VOLUME_IS_DIRTY)
 		if (!opt.force--)
@@ -626,5 +626,5 @@
 
 	setup_lcn_bitmap();
-	
+
 	walk_inodes();
 

Index: sd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/sd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- sd.c	11 Jul 2002 13:18:12 -0000	1.5
+++ sd.c	11 Jul 2002 16:20:34 -0000	1.6
@@ -5,5 +5,5 @@
  * NTFS 1.2 - System files security decriptors
  * ===========================================
- * 
+ *
  * Create the security descriptor for system file number @sys_file_no and
  * return a pointer to the descriptor.
@@ -56,5 +56,5 @@
 	sd->sacl = cpu_to_le32(0);
 	sd->dacl = cpu_to_le32(0x14);
-	/* 
+	/*
 	 * Now at offset 0x14, as specified in the security descriptor, we have
 	 * the DACL.

[Linux-NTFS-cvs] CVS: linux-ntfs/include attrib.h,1.46,1.47 bitmap.h,1.10,1.11 bootsect.h,1.12,1.13 debug.h,1.4,1.5 dir.h,1.4,1.5 disk_io.h,1.17,1.18 endians.h,1.6,1.7 inode.h,1.11,1.12 layout.h,1.24,1.25 list.h,1.5,1.6 logfile.h,1.14,1.15 mft.h,1.36,1.37 mst.h,1.6,1.7 runlist.h,1.2,1.3 support.h,1.5,1.6 types.h,1.11,1.12 unistr.h,1.16,1.17 volume.h,1.26,1.27

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv17019/include

Modified Files:
	attrib.h bitmap.h bootsect.h debug.h dir.h disk_io.h endians.h 
	inode.h layout.h list.h logfile.h mft.h mst.h runlist.h 
	support.h types.h unistr.h volume.h 
Log Message:
whitespace and include guards


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -U2 -r1.46 -r1.47
--- attrib.h	11 Jul 2002 13:18:11 -0000	1.46
+++ attrib.h	11 Jul 2002 16:20:32 -0000	1.47
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef ATTRIB_H
-#define ATTRIB_H
+#ifndef _NTFS_ATTRIB_H
+#define _NTFS_ATTRIB_H
 
 /* Forward declarations */
@@ -271,5 +271,5 @@
  * @b:		pointer to a buffer containing the mft record of FILE_Volume
  * @flags:	new flags
- * 
+ *
  * Set the volume flags in the mft record buffer @b and on volume @v to @flags.
  * Return 1 on success or 0 on error.
@@ -283,5 +283,5 @@
  * Return the byte size of the attribute value of the attribute @a (as it
  * would be after eventual decompression and filling in of holes if sparse).
- * If we return 0, check errno. If errno is 0 the actual length was 0, 
+ * If we return 0, check errno. If errno is 0 the actual length was 0,
  * otherwise errno describes the error.
  *
@@ -295,5 +295,5 @@
  * @a:		attribute to get the value of
  * @b:		destination buffer for the attribute value
- * 
+ *
  * Make a copy of the attribute value of the attribute @a into the destination
  * buffer @b. Note, that the size of @b has to be at least equal to the value
@@ -315,5 +315,5 @@
  *
  * Set the value of the attribute @a to the contents of the buffer @b which has
- * a byte-size of @l and write it to the NTFS volume @vol. 
+ * a byte-size of @l and write it to the NTFS volume @vol.
  * Return 1 on success and 0 on error, errno will be set in the latter case.
  *
@@ -328,4 +328,4 @@
 		const u8 *b, s64 l);
 
-#endif /* defined ATTRIB_H */
+#endif /* defined _NTFS_ATTRIB_H */
 

Index: bitmap.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bitmap.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- bitmap.h	2 Jul 2002 23:47:10 -0000	1.10
+++ bitmap.h	11 Jul 2002 16:20:32 -0000	1.11
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef BITMAP_H
-#define BITMAP_H
+#ifndef _NTFS_BITMAP_H
+#define _NTFS_BITMAP_H
 
 #include "types.h"
@@ -61,5 +61,5 @@
  * @bitmap:	field of bits
  * @bit:	bit to get
- * 
+ *
  * Get and return the value of the bit @bit in @bitmap (0 or 1).
  * Return -1 on error.
@@ -84,5 +84,5 @@
  * @bit:	bit to get/set
  * @new_value:	value to set bit to (0 or 1)
- * 
+ *
  * Return the value of the bit @bit and set it to @new_value (0 or 1).
  * Return -1 on error.
@@ -92,5 +92,5 @@
 {
 	register u8 old_bit, shift;
-	
+
 	if (!bitmap || new_value > 1)
 		return -1;
@@ -98,8 +98,8 @@
 	old_bit = (bitmap[bit >> 3] >> shift) & 1;
 	if (new_value != old_bit)
-		bitmap[bit >> 3] ^= 1 << shift; 
+		bitmap[bit >> 3] ^= 1 << shift;
 	return old_bit;
 }
 
-#endif /* defined BITMAP_H */
+#endif /* defined _NTFS_BITMAP_H */
 

Index: bootsect.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bootsect.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- bootsect.h	11 Jul 2002 13:18:11 -0000	1.12
+++ bootsect.h	11 Jul 2002 16:20:32 -0000	1.13
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef BOOTSECT_H
-#define BOOTSECT_H
+#ifndef _NTFS_BOOTSECT_H
+#define _NTFS_BOOTSECT_H
 
 #include "types.h"
@@ -34,5 +34,5 @@
  * @b:		buffer containing the boot sector
  * @silent:	if 1 don't display progress information
- * 
+ *
  * This function checks the boot sector in @b for describing a valid ntfs
  * volume. Return TRUE if @b is a valid NTFS boot sector or FALSE otherwise.
@@ -45,4 +45,4 @@
 extern int parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b);
 
-#endif /* defined BOOTSECT_H */
+#endif /* defined _NTFS_BOOTSECT_H */
 

Index: debug.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/debug.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- debug.h	22 Apr 2002 10:34:31 -0000	1.4
+++ debug.h	11 Jul 2002 16:20:32 -0000	1.5
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef _NTFS_DEBUG_H
+#define _NTFS_DEBUG_H
 
 #include "attrib.h"
@@ -77,4 +77,4 @@
 #endif
 
-#endif /* defined DEBUG_H */
+#endif /* defined _NTFS_DEBUG_H */
 

Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/dir.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- dir.h	2 Jul 2002 23:47:10 -0000	1.4
+++ dir.h	11 Jul 2002 16:20:32 -0000	1.5
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NTFS_DIR_H
-#define NTFS_DIR_H
+#ifndef _NTFS_DIR_H
+#define _NTFS_DIR_H
 
 #include "types.h"
@@ -59,4 +59,4 @@
 		void *dirent, ntfs_filldir_t filldir);
 
-#endif /* defined NTFS_DIR_H */
+#endif /* defined _NTFS_DIR_H */
 

Index: disk_io.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- disk_io.h	2 Jul 2002 23:47:10 -0000	1.17
+++ disk_io.h	11 Jul 2002 16:20:32 -0000	1.18
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DISK_IO_H
-#define DISK_IO_H
+#ifndef _NTFS_DISK_IO_H
+#define _NTFS_DISK_IO_H
 
 #include "volume.h"
@@ -40,4 +40,4 @@
 		const s64 count, const void *b);
 
-#endif /* defined DISK_IO_H */
+#endif /* defined _NTFS_DISK_IO_H */
 

Index: endians.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/endians.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- endians.h	2 Jul 2002 23:47:10 -0000	1.6
+++ endians.h	11 Jul 2002 16:20:32 -0000	1.7
@@ -4,5 +4,5 @@
  * endians.h - Definitions related to handling of byte ordering. Part of the
  * 	       Linux-NTFS project.
- * 	       
+ *
  * Copyright (c) 2000,2001 Anton Altaparmakov.
  *
@@ -12,16 +12,19 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* 
+#ifndef _NTFS_ENDIANS_H
+#define _NTFS_ENDIANS_H
+
+/*
  * Notes:
  *
@@ -29,11 +32,8 @@
  * defaults don't necessarily perform appropriate typecasts.
  * 	Also, using our own functions means that we can change them if it
- * turns out that we do need to use the unaligned access macros on 
+ * turns out that we do need to use the unaligned access macros on
  * architectures requirering aligned memory accesses...
  */
 
-#ifndef ENDIANS_H
-#define ENDIANS_H
-
 #include <asm/byteorder.h>
 
@@ -89,4 +89,4 @@
 #define const_cpu_to_le64(x)	__constant_cpu_to_le64(x)
 
-#endif /* defined ENDIANS_H */
+#endif /* defined _NTFS_ENDIANS_H */
 

Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/inode.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- inode.h	11 Jul 2002 13:18:11 -0000	1.11
+++ inode.h	11 Jul 2002 16:20:32 -0000	1.12
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * inode.h - Defines for NTFS inode handling. Part of the Linux-NTFS project.
  *
@@ -9,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NTFS_INODE_H
-#define NTFS_INODE_H
+#ifndef _NTFS_INODE_H
+#define _NTFS_INODE_H
 
 /* Forward declaration */
@@ -106,4 +108,4 @@
 		const MFT_REF mref);
 
-#endif /* NTFS_INODE_H */
+#endif /* defined _NTFS_INODE_H */
 

Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- layout.h	11 Jul 2002 13:18:11 -0000	1.24
+++ layout.h	11 Jul 2002 16:20:32 -0000	1.25
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LAYOUT_H
-#define LAYOUT_H
+#ifndef _NTFS_LAYOUT_H
+#define _NTFS_LAYOUT_H
 
 #include "types.h"
@@ -39,5 +39,5 @@
  * 	from within Windows as the bootsector contained number of sectors
  *	value is one less than the actual value!).
- * 	On versions of NT 3.51 and earlier, the backup copy was located at 
+ * 	On versions of NT 3.51 and earlier, the backup copy was located at
  * 	number of sectors/2 (integer divide), i.e. in the middle of the volume.
  */
@@ -132,5 +132,5 @@
 
 /*
- * Defines for the NTFS filesystem. Don't want to use BLOCK_SIZE and 
+ * Defines for the NTFS filesystem. Don't want to use BLOCK_SIZE and
  * BLOCK_SIZE_BITS from the kernel as that is 1024 and hence too high for us.
  */
@@ -212,5 +212,5 @@
 
 /*
- * These are the so far known MFT_RECORD_* flags (16-bit) which contain 
+ * These are the so far known MFT_RECORD_* flags (16-bit) which contain
  * information about the mft record in which they are present.
  */
@@ -224,5 +224,5 @@
  * mft references (aka file references or file record segment references) are
  * used whenever a structure needs to refer to a record in the mft.
- * 
+ *
  * A reference consists of a 48-bit index into the mft and a 16-bit sequence
  * number used to detect stale references.
@@ -250,5 +250,5 @@
  *
  * FIXME: The mft zone is defined as the first 12% of the volume. This space is
- * reserved so that the mft can grow contiguously and hence doesn't become 
+ * reserved so that the mft can grow contiguously and hence doesn't become
  * fragmented. Volume free space includes the empty part of the mft zone and
  * when the volume's free 88% are used up, the mft zone is shrunk by a factor
@@ -301,5 +301,5 @@
 				   is done when the file is deleted. NOTE: If
 				   this is zero it is left zero. */
-/* 18*/	u16 link_count; 	/* Number of hard links, i.e. the number of 
+/* 18*/	u16 link_count; 	/* Number of hard links, i.e. the number of
 				   directory entries referencing this record.
 				   NOTE: Only used in mft base records.
@@ -482,5 +482,5 @@
 
 /*
- * Attribute flags (16-bit). 
+ * Attribute flags (16-bit).
  */
 typedef enum {
@@ -593,5 +593,5 @@
 /* 12*/	ATTR_FLAGS flags;	/* Flags describing the attribute. */
 /* 14*/	u16 instance;		/* The instance of this attribute record. This
-				   number is unique within this mft record (see 
+				   number is unique within this mft record (see
 				   MFT_RECORD/next_attribute_instance notes in
 				   in mft.h for more details). */
@@ -603,5 +603,5 @@
 					       value from the start of the
 					       attribute record. When creating,
-					       align to 8-byte boundary if we 
+					       align to 8-byte boundary if we
 					       have a name present as this might
 					       not have a length of a multiple
@@ -696,5 +696,5 @@
 
 	FILE_ATTR_VALID_FLAGS		= const_cpu_to_le32(0x00007fb7),
-	/* FILE_ATTR_VALID_FLAGS masks out the old DOS VolId and the 
+	/* FILE_ATTR_VALID_FLAGS masks out the old DOS VolId and the
 	   FILE_ATTR_DEVICE and preserves everything else. This mask
 	   is used to obtain all flags that are valid for reading. */
@@ -826,7 +826,7 @@
  * name (if present), third by instance number. The extents of one
  * non-resident attribute (if present) immediately follow after the initial
- * extent. They are ordered by lowest_vcn and have their instace set to zero. 
+ * extent. They are ordered by lowest_vcn and have their instace set to zero.
  * It is not allowed to have two attributes with all sorting keys equal.
- * - Further restrictions: 
+ * - Further restrictions:
  * 	- If not resident, the vcn to lcn mapping array has to fit inside the
  * 	  base mft record.
@@ -886,5 +886,5 @@
 typedef enum {
 	FILE_NAME_POSIX			= 0x00,
-		/* This is the largest namespace. It is case sensitive and 
+		/* This is the largest namespace. It is case sensitive and
 		   allows all Unicode characters except for: '\0' and '/'.
 		   Beware that in WinNT/2k files which eg have the same name
@@ -894,5 +894,5 @@
 	FILE_NAME_WIN32			= 0x01,
 		/* The standard WinNT/2k NTFS long filenames. Case insensitive.
-		   All Unicode chars except: '\0', '"', '*', '/', ':', '<', 
+		   All Unicode chars except: '\0', '"', '*', '/', ':', '<',
 		   '>', '?', '\' and '|'. Further, names cannot end with a '.'
 		   or a space. */
@@ -901,5 +901,5 @@
 		   All 8-bit characters greater space, except: '"', '*', '+',
 		   ',', '/', ':', ';', '<', '=', '>', '?' and '\'. */
-	FILE_NAME_WIN32_AND_DOS		= 0x03, 
+	FILE_NAME_WIN32_AND_DOS		= 0x03,
 		/* 3 means that both the Win32 and the DOS filenames are
 		   identical and hence have been saved in this single filename
@@ -956,5 +956,5 @@
 
 /*
- * GUID structures store globally unique identifiers (GUID). A GUID is a 
+ * GUID structures store globally unique identifiers (GUID). A GUID is a
  * 128-bit value consisting of one group of eight hexadecimal digits, followed
  * by three groups of four hexadecimal digits each, followed by one group of
@@ -1040,5 +1040,5 @@
  * These relative identifiers (RIDs) are used with the above identifier
  * authorities to make up universal well-known SIDs.
- * 	
+ *
  * Note: The relative identifier (RID) refers to the portion of a SID, which
  * identifies a user or group in relation to the authority that issued the SID.
@@ -1051,5 +1051,5 @@
 	SECURITY_WORLD_RID		  = 0,	/* S-1-1 */
 	SECURITY_LOCAL_RID		  = 0,	/* S-1-2 */
-	
+
 	SECURITY_CREATOR_OWNER_RID	  = 0,	/* S-1-3 */
 	SECURITY_CREATOR_GROUP_RID	  = 1,	/* S-1-3 */
@@ -1071,8 +1071,8 @@
 	SECURITY_RESTRICTED_CODE_RID	  = 0xc,
 	SECURITY_TERMINAL_SERVER_RID	  = 0xd,
-	
+
 	SECURITY_LOGON_IDS_RID		  = 5,
 	SECURITY_LOGON_IDS_RID_COUNT	  = 3,
-	
+
 	SECURITY_LOCAL_SYSTEM_RID	  = 0x12,
 
@@ -1084,10 +1084,10 @@
 	 * Well-known domain relative sub-authority values (RIDs).
 	 */
-	
+
 	/* Users. */
 	DOMAIN_USER_RID_ADMIN		  = 0x1f4,
 	DOMAIN_USER_RID_GUEST		  = 0x1f5,
 	DOMAIN_USER_RID_KRBTGT		  = 0x1f6,
-	
+
 	/* Groups. */
 	DOMAIN_GROUP_RID_ADMINS		  = 0x200,
@@ -1106,10 +1106,10 @@
 	DOMAIN_ALIAS_RID_GUESTS		  = 0x222,
 	DOMAIN_ALIAS_RID_POWER_USERS	  = 0x223,
-	
+
 	DOMAIN_ALIAS_RID_ACCOUNT_OPS	  = 0x224,
 	DOMAIN_ALIAS_RID_SYSTEM_OPS	  = 0x225,
 	DOMAIN_ALIAS_RID_PRINT_OPS	  = 0x226,
 	DOMAIN_ALIAS_RID_BACKUP_OPS	  = 0x227,
-	
+
 	DOMAIN_ALIAS_RID_REPLICATOR	  = 0x228,
 	DOMAIN_ALIAS_RID_RAS_SERVERS	  = 0x229,
@@ -1131,5 +1131,5 @@
  *
  * NT well-known SIDs:
- * 
+ *
  * 	NT_AUTHORITY_SID	S-1-5
  * 	DIALUP_SID		S-1-5-1
@@ -1168,5 +1168,5 @@
  * The SID structure is a variable-length structure used to uniquely identify
  * users or groups. SID stands for security identifier.
- * 
+ *
  * The standard textual representation of the SID is of the form:
  * 	S-R-I-S-S...
@@ -1178,5 +1178,5 @@
  *    - I is the 48-bit identifier_authority, expressed as digits as R above.
  *    - S... is one or more sub_authority values, expressed as digits as above.
- *    
+ *
  * Example SID; the domain-relative SID of the local Administrators group on
  * Windows NT/2k:
@@ -1219,5 +1219,5 @@
 	ACCESS_ALLOWED_COMPOUND_ACE_TYPE= 4,
 	ACCESS_MAX_MS_V3_ACE_TYPE	= 4,
-	
+
 	/* The following are Win2k only. */
 	ACCESS_MIN_MS_OBJECT_ACE_TYPE	= 5,
@@ -1285,31 +1285,31 @@
 
 	/* Specific rights for files and directories are as follows: */
-	
+
 	/* Right to read data from the file. (FILE) */
 	FILE_READ_DATA			= const_cpu_to_le32(0x00000001),
 	/* Right to list contents of a directory. (DIRECTORY) */
 	FILE_LIST_DIRECTORY		= const_cpu_to_le32(0x00000001),
-	
+
 	/* Right to write data to the file. (FILE) */
 	FILE_WRITE_DATA			= const_cpu_to_le32(0x00000002),
 	/* Right to create a file in the directory. (DIRECTORY) */
 	FILE_ADD_FILE			= const_cpu_to_le32(0x00000002),
-	
+
 	/* Right to append data to the file. (FILE) */
 	FILE_APPEND_DATA		= const_cpu_to_le32(0x00000004),
 	/* Right to create a subdirectory. (DIRECTORY) */
 	FILE_ADD_SUBDIRECTORY		= const_cpu_to_le32(0x00000004),
-	
+
 	/* Right to read extended attributes. (FILE/DIRECTORY) */
 	FILE_READ_EA			= const_cpu_to_le32(0x00000008),
-	
+
 	/* Right to write extended attributes. (FILE/DIRECTORY) */
 	FILE_WRITE_EA			= const_cpu_to_le32(0x00000010),
-	
+
 	/* Right to execute a file. (FILE) */
 	FILE_EXECUTE			= const_cpu_to_le32(0x00000020),
 	/* Right to traverse the directory. (DIRECTORY) */
 	FILE_TRAVERSE			= const_cpu_to_le32(0x00000020),
-	
+
 	/*
 	 * Right to delete a directory and all the files it contains (its
@@ -1320,8 +1320,8 @@
 	/* Right to read file attributes. (FILE/DIRECTORY) */
 	FILE_READ_ATTRIBUTES		= const_cpu_to_le32(0x00000080),
-	
+
 	/* Right to change file attributes. (FILE/DIRECTORY) */
 	FILE_WRITE_ATTRIBUTES		= const_cpu_to_le32(0x00000100),
-	
+
 	/*
 	 * The standard rights (bits 16 to 23). Are independent of the type of
@@ -1356,13 +1356,13 @@
 	 * convenience and are defined by the Win32 API.
 	 */
-	
+
 	/* These are currently defined to READ_CONTROL. */
 	STANDARD_RIGHTS_READ		= const_cpu_to_le32(0x00020000),
 	STANDARD_RIGHTS_WRITE		= const_cpu_to_le32(0x00020000),
 	STANDARD_RIGHTS_EXECUTE		= const_cpu_to_le32(0x00020000),
-	
+
 	/* Combines DELETE, READ_CONTROL, WRITE_DAC, and WRITE_OWNER access. */
 	STANDARD_RIGHTS_REQUIRED	= const_cpu_to_le32(0x000f0000),
-	
+
 	/*
 	 * Combines DELETE, READ_CONTROL, WRITE_DAC, WRITE_OWNER, and
@@ -1411,5 +1411,5 @@
  * The generic mapping array. Used to denote the mapping of each generic
  * access right to a specific access mask.
- * 
+ *
  * FIXME: What exactly is this and what is it for? (AIA)
  */
@@ -1572,5 +1572,5 @@
 			   SE_SACL_PRESENT is set but sacl is NULL, a NULL ACL
 			   is specified. */
-	u32 dacl;	/* Byte offset to a discretionary ACL. Only valid, if 
+	u32 dacl;	/* Byte offset to a discretionary ACL. Only valid, if
 			   SE_DACL_PRESENT is set in the control field. If
 			   SE_DACL_PRESENT is set but dacl is NULL, a NULL ACL
@@ -1589,5 +1589,5 @@
 	u8 revision;	/* Revision level of the security descriptor. */
 	u8 alignment;
-	SECURITY_DESCRIPTOR_CONTROL control;	/* Flags qualifying the type of 
+	SECURITY_DESCRIPTOR_CONTROL control;	/* Flags qualifying the type of
 			   the descriptor as well as the following fields. */
 	SID *owner;	/* Points to a SID representing an object's owner. If
@@ -1601,5 +1601,5 @@
 			   SE_SACL_PRESENT is set but sacl is NULL, a NULL ACL
 			   is specified. */
-	ACL *dacl;	/* Points to a discretionary ACL. Only valid, if 
+	ACL *dacl;	/* Points to a discretionary ACL. Only valid, if
 			   SE_DACL_PRESENT is set in the control field. If
 			   SE_DACL_PRESENT is set but dacl is NULL, a NULL ACL
@@ -1634,9 +1634,9 @@
  * On NTFS 3.0+, all security descriptors are stored in FILE_Secure. Only one
  * referenced instance of each unique security descriptor is stored.
- * 
+ *
  * FILE_Secure contains no unnamed data attribute, i.e. it has zero length. It
  * does, however, contain two indexes ($SDH and $SII) as well as a named data
  * stream ($SDS).
- * 
+ *
  * Every unique security descriptor is assigned a unique security identifier
  * (security_id, not to be confused with a SID). The security_id is unique for
@@ -1653,10 +1653,10 @@
  * matching hash is found, but the security descriptors do not match, the
  * search in the $SDH index is continued, searching for a next matching hash.
- * 
+ *
  * When a precise match is found, the security_id coresponding to the security
  * descriptor in the $SDS attribute is read from the found $SDH index entry and
  * is stored in the $STANDARD_INFORMATION attribute of the file/directory to
  * which the security descriptor is being applied. The $STANDARD_INFORMATION
- * attribute is present in all base mft records (i.e. in all files and 
+ * attribute is present in all base mft records (i.e. in all files and
  * directories).
  *
@@ -1669,5 +1669,5 @@
  * references an entry any more.
  */
- 
+
 /*
  * This header precedes each security descriptor in the $SDS data stream.
@@ -1700,5 +1700,5 @@
 /*
  * The index entry key used in the $SII index. The collation type is
- * COLLATION_NTOFS_ULONG. 
+ * COLLATION_NTOFS_ULONG.
  */
 typedef struct {
@@ -1718,5 +1718,5 @@
 /*
  * Attribute: Volume name (0x60).
- * 
+ *
  * NOTE: Always resident.
  * NOTE: Present only in FILE_Volume.
@@ -1849,5 +1849,5 @@
 					   an index block is >= than a cluster,
 					   otherwise this will be the log of
-					   the size (like how the encoding of 
+					   the size (like how the encoding of
 					   the mft record size and the index
 					   record size found in the boot sector
@@ -1862,5 +1862,5 @@
  *
  * NOTE: Always non-resident (doesn't make sense to be resident anyway!).
- * 
+ *
  * This is an array of index blocks. Each index block starts with an
  * INDEX_BLOCK structure containing an index header, followed by a sequence of
@@ -1913,5 +1913,5 @@
 	QUOTA_FLAG_USER_MASK		= const_cpu_to_le32(0x00000007),
 		/* Bit mask for user quota flags. */
-	
+
 	/* These flags are only present in the quota defaults index entry,
 	   i.e. in the entry where owner_id = QUOTA_DEFAULTS_ID. */
@@ -1932,5 +1932,5 @@
  * The $Q index contains one entry for each existing user_id on the volume. The
  * index key is the user_id of the user/group owning this quota control entry,
- * i.e. the key is the owner_id. The user_id of the owner of a file, i.e. the 
+ * i.e. the key is the owner_id. The user_id of the owner of a file, i.e. the
  * owner_id, is found in the standard information attribute. The collation rule
  * for $Q is COLLATION_NTOFS_ULONG.
@@ -2090,5 +2090,5 @@
 	IO_REPARSE_TAG_IS_HIGH_LATENCY	= const_cpu_to_le32(0x40000000),
 	IO_REPARSE_TAG_IS_MICROSOFT	= const_cpu_to_le32(0x80000000),
-	
+
 	IO_REPARSE_TAG_RESERVED_ZERO	= const_cpu_to_le32(0x00000000),
 	IO_REPARSE_TAG_RESERVED_ONE	= const_cpu_to_le32(0x00000001),
@@ -2149,6 +2149,6 @@
  *
  * NOTE: Always non-resident. (Is this true?)
- * 
- * Like the attribute list and the index buffer list, the EA attribute value is 
+ *
+ * Like the attribute list and the index buffer list, the EA attribute value is
  * a sequence of EA_ATTR variable length records.
  *
@@ -2193,4 +2193,4 @@
 } __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM, EFS_ATTR;
 
-#endif /* defined LAYOUT_H */
+#endif /* defined _NTFS_LAYOUT_H */
 

Index: list.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/list.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- list.h	30 Jun 2002 17:01:53 -0000	1.5
+++ list.h	11 Jul 2002 16:20:33 -0000	1.6
@@ -1,2 +1,25 @@
+/*
+ * $Id$
+ *
+ * list.h - Linked list implementation. Part of the Linux-NTFS project.
+ *
+ * Copyright (c)
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _NTFS_LIST_H
 #define _NTFS_LIST_H
@@ -27,5 +50,5 @@
 
 /*
- * Insert a new entry between two known consecutive entries. 
+ * Insert a new entry between two known consecutive entries.
  *
  * This is only for internal list manipulation where we know the prev/next
@@ -99,5 +122,5 @@
 {
 	__list_del(entry->prev, entry->next);
-	INIT_LIST_HEAD(entry); 
+	INIT_LIST_HEAD(entry);
 }
 
@@ -160,4 +183,4 @@
 		pos = n, n = pos->next)
 
-#endif
+#endif /* defined _NTFS_LIST_H */
 

Index: logfile.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/logfile.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- logfile.h	2 Jul 2002 23:47:10 -0000	1.14
+++ logfile.h	11 Jul 2002 16:20:33 -0000	1.15
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LOGFILE_H
-#define LOGFILE_H
+#ifndef _NTFS_LOGFILE_H
+#define _NTFS_LOGFILE_H
 
 #include "types.h"
@@ -65,5 +65,5 @@
 				   required size of the usa and add this to the
 				   ntfs.usa_offset value. Then verify that the
-				   result is less than the value of the 
+				   result is less than the value of the
 				   restart_offset. = 0x1000 */
 	u32 log_page_size;	/* Byte size of log file records, has to be
@@ -105,5 +105,5 @@
 				   the first client record if versions are
 				   matched. The offset is otherwise assumed to
-				   be (sizeof(RESTART_AREA) + 7) & ~7, i.e. 
+				   be (sizeof(RESTART_AREA) + 7) & ~7, i.e.
 				   rounded up to first 8-byte boundary. Either
 				   way, the offset to the client array has to be
@@ -113,5 +113,5 @@
 				   client array + (log_clients * 0xa0) have to
 				   be <= SystemPageSize. = 0x30 */
-	u64 file_size;		/* Byte size of the log file. If the 
+	u64 file_size;		/* Byte size of the log file. If the
 				   restart_offset + the offset of the file_size
 				   are > 510 then corruption has occured. This
@@ -123,5 +123,5 @@
 				   then these checks are futile of course.
 				   Calculate the file_size bits and check that
-				   seq_number_bits == 0x43 - file_size bits. 
+				   seq_number_bits == 0x43 - file_size bits.
 				   = 0x400000 */
 	u32 last_lsn_data_length;/* ??? = 0, 0x40 */
@@ -159,8 +159,8 @@
 				     size uncertain, offset uncertain */
 	uchar_t client_name[0];	/* ??? Name of the client in unicode. = NTFS */
-	/* 
+	/*
 	 * Or it could be the client name is fixed size like in attr def struct
 	 * and the 8 means something else. Favouring this is that the
-	 * RESTART_CLIENT struct is assumed to be fixed size of 0xa0 bytes, 
+	 * RESTART_CLIENT struct is assumed to be fixed size of 0xa0 bytes,
 	 * just like the attr def struct! There might be parallels to be drawn
 	 * between the two.
@@ -226,5 +226,5 @@
 	u16 undo_length;
 	u16 target_attribute;
-	u16 lcns_to_follow;		   /* Number of lcn_list entries 
+	u16 lcns_to_follow;		   /* Number of lcn_list entries
 					      following this entry. */
 /* Now at ofs 0x40. */
@@ -240,4 +240,4 @@
 } __attribute__ ((__packed__)) LOG_RECORD;
 
-#endif /* defined LOGFILE_H */
+#endif /* defined _NTFS_LOGFILE_H */
 

Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -U2 -r1.36 -r1.37
--- mft.h	11 Jul 2002 13:18:11 -0000	1.36
+++ mft.h	11 Jul 2002 16:20:33 -0000	1.37
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef MFT_H
-#define MFT_H
+#ifndef _NTFS_MFT_H
+#define _NTFS_MFT_H
 
 #include "volume.h"
@@ -103,4 +103,4 @@
 }
 
-#endif /* defined MFT_H */
+#endif /* defined _NTFS_MFT_H */
 

Index: mst.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mst.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- mst.h	11 Jul 2002 13:18:11 -0000	1.6
+++ mst.h	11 Jul 2002 16:20:33 -0000	1.7
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef MST_H
-#define MST_H
+#ifndef _NTFS_MST_H
+#define _NTFS_MST_H
 
 #include "types.h"
@@ -33,4 +33,4 @@
 extern void ntfs_post_write_mst_fixup(NTFS_RECORD *b);
 
-#endif /* defined MST_H */
+#endif /* defined _NTFS_MST_H */
 

Index: runlist.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/runlist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- runlist.h	11 Jul 2002 13:18:11 -0000	1.2
+++ runlist.h	11 Jul 2002 16:20:33 -0000	1.3
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _RUNLIST_H_
-#define _RUNLIST_H_
+#ifndef _NTFS_RUNLIST_H
+#define _NTFS_RUNLIST_H
 
 #include "types.h"
@@ -40,8 +40,8 @@
  * @lcn:	starting lcn of the current array element
  * @length:	length in clusters of the current array element
- * 
+ *
  * The last vcn (in fact the last vcn + 1) is reached when length == 0.
- * 
- * When lcn == -1 this means that the count vcns starting at vcn are not 
+ *
+ * When lcn == -1 this means that the count vcns starting at vcn are not
  * physically allocated (i.e. this is a hole / data is sparse).
  */
@@ -66,4 +66,4 @@
 		const int dst_len, const run_list_element *rl);
 
-#endif /* _RUNLIST_H_ */
+#endif /* defined _NTFS_RUNLIST_H */
 

Index: support.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/support.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- support.h	14 Apr 2002 13:56:45 -0000	1.5
+++ support.h	11 Jul 2002 16:20:33 -0000	1.6
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef SUPPORT_H
-#define SUPPORT_H
+#ifndef _NTFS_SUPPORT_H
+#define _NTFS_SUPPORT_H
 
 #include <stddef.h>
@@ -54,4 +54,4 @@
 #define test_and_clear_bit(bit, var)	(test_bit(bit, var), clear_bit(bit, var))
 
-#endif /* defined SUPPORT_H */
+#endif /* defined _NTFS_SUPPORT_H */
 

Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/types.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- types.h	11 Jul 2002 13:18:11 -0000	1.11
+++ types.h	11 Jul 2002 16:20:33 -0000	1.12
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NTFS_TYPES_H
-#define NTFS_TYPES_H
+#ifndef _NTFS_TYPES_H
+#define _NTFS_TYPES_H
 
 #include <stdint.h>
@@ -67,4 +67,4 @@
 } IGNORE_CASE_BOOL;
 
-#endif /* defined NTFS_TYPES_H */
+#endif /* defined _NTFS_TYPES_H */
 

Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/unistr.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- unistr.h	11 Jul 2002 13:18:11 -0000	1.16
+++ unistr.h	11 Jul 2002 16:20:33 -0000	1.17
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef UNISTR_H
-#define UNISTR_H
+#ifndef _NTFS_UNISTR_H
+#define _NTFS_UNISTR_H
 
 #include "types.h"
@@ -60,4 +60,4 @@
 extern int ntfs_mbstoucs(char *ins, uchar_t **outs, int outs_len);
 
-#endif /* defined UNISTR_H */
+#endif /* defined _NTFS_UNISTR_H */
 

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- volume.h	11 Jul 2002 13:18:11 -0000	1.26
+++ volume.h	11 Jul 2002 16:20:33 -0000	1.27
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef VOLUME_H
-#define VOLUME_H
+#ifndef _NTFS_VOLUME_H
+#define _NTFS_VOLUME_H
 
 #include "config.h"
@@ -132,4 +132,4 @@
 extern int ntfs_umount(ntfs_volume *vol, const BOOL force);
 
-#endif /* defined VOLUME_H */
+#endif /* defined _NTFS_VOLUME_H */
 

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs attrib.c,1.57,1.58 attrib_RE.c,1.6,1.7 bootsect.c,1.12,1.13 debug.c,1.1,1.2 dir.c,1.6,1.7 disk_io.c,1.29,1.30 inode.c,1.14,1.15 mft.c,1.31,1.32 mst.c,1.5,1.6 runlist.c,1.2,1.3 unistr.c,1.19,1.20 volume.c,1.48,1.49

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv17019/libntfs

Modified Files:
	attrib.c attrib_RE.c bootsect.c debug.c dir.c disk_io.c 
	inode.c mft.c mst.c runlist.c unistr.c volume.c 
Log Message:
whitespace and include guards


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -U2 -r1.57 -r1.58
--- attrib.c	9 Jul 2002 19:17:49 -0000	1.57
+++ attrib.c	11 Jul 2002 16:20:33 -0000	1.58
@@ -12,11 +12,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -76,5 +76,5 @@
 	c = (VOLUME_INFORMATION*)(le16_to_cpu(r->value_offset) + (char*)r);
 	/* Sanity checks. */
-	if ((char*)c + le32_to_cpu(r->value_length) > 
+	if ((char*)c + le32_to_cpu(r->value_length) >
 			le16_to_cpu(b->bytes_in_use) + (char*)b ||
 	    		le16_to_cpu(r->value_offset) +
@@ -162,5 +162,5 @@
 		 * FIXED: We were overflowing here in a nasty fashion when we
 		 * reach the last cluster in the run list as the buffer will
-		 * only be big enough to hold data_size bytes while we are 
+		 * only be big enough to hold data_size bytes while we are
 		 * reading in allocated_size bytes which is usually larger
 		 * than data_size, since the actual data is unlikely to have a
@@ -183,5 +183,5 @@
 				 * 	buffer, and continue.
 				 */
-				intbuf = malloc(rl[i].length << 
+				intbuf = malloc(rl[i].length <<
 							vol->cluster_size_bits);
 				if (!intbuf) {
@@ -194,9 +194,9 @@
 				}
 				/*
-				 * FIXME: If compressed file: Only read if 
-				 * lcn != -1. Otherwise, we are dealing with a 
+				 * FIXME: If compressed file: Only read if
+				 * lcn != -1. Otherwise, we are dealing with a
 				 * sparse run and we just memset the user buffer
 				 * to 0 for the length of the run, which should
-				 * be 16 (= compression unit size). 
+				 * be 16 (= compression unit size).
 				 * FIXME: Really only when file is compressed,
 				 * or can we have sparse runs in uncompressed
@@ -229,5 +229,5 @@
 					return 0;
 				}
-				memcpy(b + total, intbuf, 
+				memcpy(b + total, intbuf,
 				       sle64_to_cpu(a->data_size) - total);
 				free(intbuf);
@@ -235,6 +235,6 @@
 			} else {
 				/*
-				 * FIXME: If compressed file: Only read if 
-				 * lcn != -1. Otherwise, we are dealing with a 
+				 * FIXME: If compressed file: Only read if
+				 * lcn != -1. Otherwise, we are dealing with a
 				 * sparse run and we just memset the user buffer
 				 * to 0 for the length of the run, which should
@@ -280,5 +280,5 @@
  * set_attribute_value
  */
-int set_attribute_value(ntfs_volume *vol, ATTR_RECORD *a, 
+int set_attribute_value(ntfs_volume *vol, ATTR_RECORD *a,
 			const u8 *b, s64 l)
 {
@@ -315,5 +315,5 @@
 		s64 total, w;
 		int i;
-		
+
 		/* If no data return 1. FIXME: This needs to change when we can
 		   cope with changes in length of the attribute. */
@@ -341,5 +341,5 @@
 					perror(ESTR);
 					errno = eo;
-				} else if (w < min(l, rl[i].length << 
+				} else if (w < min(l, rl[i].length <<
 						vol->cluster_size_bits)) {
 					fprintf(stderr, ESTR ": Ran out of "
@@ -357,5 +357,5 @@
 			l -= w;
 			if ((l <= 0) && rl[i+1].length) {
-				fprintf(stderr, 
+				fprintf(stderr,
 				       "Warning: Amount of data to write "
 				       "doesn't match attribute length in\n"
@@ -364,5 +364,5 @@
 				       "has been preserved.\n");
 			} else if ((l > 0) && !rl[i+1].length) {
-				fprintf(stderr, 
+				fprintf(stderr,
 				       "Warning: Still have data to write but "
 				       "the attribute length in the run list\n"
@@ -371,5 +371,5 @@
 			}
 		}
-		free(rl);	
+		free(rl);
 		return 1;
 	}
@@ -545,5 +545,5 @@
 /**
  * ntfs_attr_map_run_list - map (a part of) a run list of an ntfs attribute
- * @na:		ntfs attribute for which to map (part of) a run list 
+ * @na:		ntfs attribute for which to map (part of) a run list
  * @vcn:	map run list part containing this vcn
  *
@@ -556,5 +556,5 @@
 	ntfs_attr_search_ctx *ctx;
 	int err;
-	
+
 	Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x, vcn 0x%Lx.\n",
 			__FUNCTION__, (unsigned long long)na->ni->mft_no,
@@ -1153,5 +1153,5 @@
 	if (need_to_undo.initialized_size) {
 		int err;
-		
+
 		err = 0;
 		if (!ctx) {
@@ -1383,5 +1383,5 @@
 	uchar_t *upcase;
 	u32 upcase_len;
-	
+
 	if (!ctx || !ctx->mrec || !ctx->attr) {
 		errno = EINVAL;
@@ -1425,6 +1425,6 @@
 		if (a->type != type)
 			continue;
-		/* 
-		 * If @name is AT_NONAME we want an unnamed attribute.  
+		/*
+		 * If @name is AT_NONAME we want an unnamed attribute.
 		 * If @name is present, compare the two names.
 		 * Otherwise, match any attribute.
@@ -1440,5 +1440,5 @@
 			    a->name_length, ic, upcase, upcase_len)) {
 			register int rc;
-			
+
 			rc = ntfs_collate_names(name, name_len,
 					(uchar_t*)((char*)a +
@@ -1479,5 +1479,5 @@
 		else {
 			register int rc;
-			
+
 			rc = memcmp(val, (char*)a +le16_to_cpu(a->value_offset),
 					min(val_len,
@@ -1644,6 +1644,6 @@
 		if (!type)
 			goto is_enumeration;
-		/* 
-		 * If @name is AT_NONAME we want an unnamed attribute.  
+		/*
+		 * If @name is AT_NONAME we want an unnamed attribute.
 		 * If @name is present, compare the two names.
 		 * Otherwise, match any attribute.
@@ -1694,5 +1694,5 @@
 				(char*)next_al_entry + 6 < al_end	    &&
 				(char*)next_al_entry + le16_to_cpu(
-					next_al_entry->length) <= al_end    &&	
+					next_al_entry->length) <= al_end    &&
 				sle64_to_cpu(next_al_entry->lowest_vcn) <=
 					sle64_to_cpu(lowest_vcn)	    &&

Index: attrib_RE.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib_RE.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- attrib_RE.c	2 Jul 2002 23:47:10 -0000	1.6
+++ attrib_RE.c	11 Jul 2002 16:20:33 -0000	1.7
@@ -54,5 +54,5 @@
 {
 	ATTR_RECORD *a;
-	
+
 #ifdef DEBUG
 	if (!vol || !ctx || !ctx->mrec || !ctx->attr) {
@@ -60,5 +60,5 @@
 		return FALSE;
 	}
-#endif	
+#endif
 	a = ctx->attr;
 	/*

Index: bootsect.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bootsect.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- bootsect.c	2 Jul 2002 23:47:10 -0000	1.12
+++ bootsect.c	11 Jul 2002 16:20:33 -0000	1.13
@@ -11,11 +11,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -50,5 +50,5 @@
 	if (!silent)
 		printf("\nBeginning bootsector check...\n");
-	
+
 	/* Calculate the checksum. Note, this is just a simple addition of
 	   all u32 values in the bootsector starting at the beginning and
@@ -61,8 +61,8 @@
 		if (!silent)
 			printf("Calculating bootsector checksum... ");
-		
+
 		for (i = 0; u < bi; ++u)
 			i += le32_to_cpup(u);
-		
+
 		if (le32_to_cpu(b->checksum) && le32_to_cpu(b->checksum) != i)
 			goto not_ntfs;
@@ -126,5 +126,5 @@
 	if (!silent)
 		printf("Checking clusters per mft record... ");
-	if ((u8)b->clusters_per_mft_record < 0xe1 || 
+	if ((u8)b->clusters_per_mft_record < 0xe1 ||
 	    (u8)b->clusters_per_mft_record > 0xf7) {
 		switch (b->clusters_per_mft_record) {
@@ -141,5 +141,5 @@
 	if (!silent)
 		printf("Checking clusters per index block... ");
-	if ((u8)b->clusters_per_index_record < 0xe1 || 
+	if ((u8)b->clusters_per_index_record < 0xe1 ||
 	    (u8)b->clusters_per_index_record > 0xf7) {
 		switch (b->clusters_per_index_record) {

Index: debug.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/debug.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- debug.c	22 Apr 2002 10:34:31 -0000	1.1
+++ debug.c	11 Jul 2002 16:20:33 -0000	1.2
@@ -11,11 +11,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/dir.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- dir.c	8 Jul 2002 23:27:16 -0000	1.6
+++ dir.c	11 Jul 2002 16:20:33 -0000	1.7
@@ -11,11 +11,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -U2 -r1.29 -r1.30
--- disk_io.c	8 Jul 2002 06:23:22 -0000	1.29
+++ disk_io.c	11 Jul 2002 16:20:33 -0000	1.30
@@ -11,11 +11,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -39,8 +39,8 @@
  * @count:	number of bytes to read
  * @b:		output data buffer
- * 
+ *
  * This function will read @count bytes from file descriptor @fd at position
  * @pos into the data buffer @b.
- * 
+ *
  * On success, return the number of successfully read bytes. If this number is
  * lower than @count this means that we have either reached end of file or
@@ -92,5 +92,5 @@
  * @count:	number of bytes to write
  * @b:		data buffer to write to disk
- * 
+ *
  * This function will write @count bytes from data buffer @b to file descriptor
  * @fd at position @pos.
@@ -108,5 +108,5 @@
 {
 	s64 written, total;
-	
+
 	Dprintf("%s(): Entering for pos 0x%Lx, count 0x%Lx.\n", __FUNCTION__,
 			pos, count);
@@ -151,9 +151,9 @@
  * @bksize:	size of each block that needs mst deprotecting
  * @b:		output data buffer
- * 
+ *
  * Multi sector transfer (mst) positioned read. This function will read @count
  * blocks of size @bksize bytes each from file descriptor @fd at position @pos
  * into the data buffer @b.
- * 
+ *
  * On success, return the number of successfully read blocks. If this number is
  * lower than @count this means that we have reached end of file, that the read
@@ -165,5 +165,5 @@
  * return code of either lseek, read, or set to EINVAL in case of invalid
  * arguments.
- * 
+ *
  * NOTE: If an incomplete multi sector transfer has been detected the magic
  * will have been changed to magic_BAAD but no error will be returned. Thus it
@@ -207,9 +207,9 @@
  * @bksize:	size of each block that needs mst protecting
  * @b:		data buffer to write to disk
- * 
+ *
  * Multi sector transfer (mst) positioned write. This function will write
  * @count blocks of size @bksize bytes each from data buffer @b to file
  * descriptor @fd at position @pos.
- * 
+ *
  * On success, return the number of successfully written blocks. If this number
  * is lower than @count this means that the write has been interrutped or that
@@ -234,5 +234,5 @@
 {
 	s64 written, i;
-	
+
 	if (count < 0 || bksize % NTFS_SECTOR_SIZE) {
 		errno = EINVAL;
@@ -274,5 +274,5 @@
  *
  * Read @count ntfs clusters starting at logical cluster number @lcn from
- * volume @vol into buffer @b. Return number of clusters read or -1 on error, 
+ * volume @vol into buffer @b. Return number of clusters read or -1 on error,
  * with errno set to the error code.
  */
@@ -281,5 +281,5 @@
 {
 	s64 br;
-	
+
 	if (!vol || lcn < 0 || count < 0) {
 		errno = EINVAL;

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/inode.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- inode.c	9 Jul 2002 19:17:49 -0000	1.14
+++ inode.c	11 Jul 2002 16:20:33 -0000	1.15
@@ -11,11 +11,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -U2 -r1.31 -r1.32
--- mft.c	8 Jul 2002 06:23:22 -0000	1.31
+++ mft.c	11 Jul 2002 16:20:33 -0000	1.32
@@ -11,11 +11,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -80,5 +80,5 @@
 
 /**
- * ntfs_write_mft_records - write mft records to disk 
+ * ntfs_write_mft_records - write mft records to disk
  * @vol:	volume to write to
  * @mref:	starting mft record number to write
@@ -198,5 +198,5 @@
 	ATTR_RECORD *a;
 	int err;
-	
+
 	if (!vol || !mrec) {
 		errno = EINVAL;

Index: mst.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mst.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- mst.c	2 Jul 2002 23:47:10 -0000	1.5
+++ mst.c	11 Jul 2002 16:20:34 -0000	1.6
@@ -11,11 +11,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -29,5 +29,5 @@
  * @b:          pointer to the data to deprotect
  * @size:       size in bytes of @b
- * 
+ *
  * Perform the necessary post read multi sector transfer fixups and detect the
  * presence of incomplete multi sector transfers. - In that case, overwrite the
@@ -56,11 +56,11 @@
 		return -1;
 	}
-	/* Position of usn in update sequence array. */  
+	/* Position of usn in update sequence array. */
 	usa_pos = (u16*)b + usa_ofs/sizeof(u16);
-	/* 
+	/*
 	 * The update sequence number which has to be equal to each of the
 	 * u16 values before they are fixed up. Note no need to care for
 	 * endianness since we are comparing and moving data for on disk
-	 * structures which means the data is consistent. - If it is 
+	 * structures which means the data is consistent. - If it is
 	 * consistenty the wrong endianness it doesn't make any difference.
 	 */
@@ -106,5 +106,5 @@
  * @b:          pointer to the data to protect
  * @size:       size in bytes of @b
- * 
+ *
  * Perform the necessary pre write multi sector transfer fixup on the data
  * pointer to by @b of @size.
@@ -143,8 +143,8 @@
 		return -1;
 	}
-	/* Position of usn in update sequence array. */  
+	/* Position of usn in update sequence array. */
 	usa_pos = (u16*)((u8*)b + usa_ofs);
 	/*
-	 * Cyclically increment the update sequence number 
+	 * Cyclically increment the update sequence number
 	 * (skipping 0 and -1, i.e. 0xffff).
 	 */
@@ -159,5 +159,5 @@
         while (usa_count--) {
 		/*
-		 * Increment the position in the usa and save the 
+		 * Increment the position in the usa and save the
 		 * original data from the data buffer into the usa.
 		 */
@@ -174,5 +174,5 @@
  * ntfs_post_write_mst_fixup - deprotect multi sector transfer protected data
  * @b:          pointer to the data to deprotect
- * 
+ *
  * Perform the necessary post write multi sector transfer fixup, not checking
  * for any errors, because we assume we have just used
@@ -187,5 +187,5 @@
 	u16 usa_count = le16_to_cpu(b->usa_count) - 1;
 
-	/* Position of usn in update sequence array. */  
+	/* Position of usn in update sequence array. */
 	usa_pos = (u16*)b + usa_ofs/sizeof(u16);
 

Index: runlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/runlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- runlist.c	11 Jul 2002 13:18:11 -0000	1.2
+++ runlist.c	11 Jul 2002 16:20:34 -0000	1.3
@@ -1099,5 +1099,5 @@
 	return -1;
 }
-		
+
 /**
  * ntfs_build_mapping_pairs - build the mapping pairs array from a run list

Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/unistr.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- unistr.c	8 Jul 2002 23:27:16 -0000	1.19
+++ unistr.c	11 Jul 2002 16:20:34 -0000	1.20
@@ -11,11 +11,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -97,5 +97,5 @@
  *
  * ntfs_collate_names collates two Unicode names and returns:
- * 
+ *
  *  -1 if the first name collates before the second one,
  *   0 if the names match,
@@ -156,5 +156,5 @@
  * The strings in little endian format and appropriate le16_to_cpu()
  * conversion is performed on non-little endian machines.
- * 
+ *
  * The function returns an integer less than, equal to, or greater than zero
  * if @s1 (or the first @n Unicode characters thereof) is found, respectively,
@@ -196,5 +196,5 @@
  * ignoring case. The strings in little endian format and appropriate
  * le16_to_cpu() conversion is performed on non-little endian machines.
- * 
+ *
  * Each character is uppercased using the @upcase table before the comparison.
  *

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -U2 -r1.48 -r1.49
--- volume.c	9 Jul 2002 19:17:49 -0000	1.48
+++ volume.c	11 Jul 2002 16:20:34 -0000	1.49
@@ -11,11 +11,11 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -467,10 +467,10 @@
  * is implemented:
  *	MS_RDONLY	- mount volume read-only
- * 
+ *
  * The function opens the device or file @name and verifies that it contains a
  * valid bootsector. Then, it allocates an ntfs_volume structure and initializes
  * some of the values inside the structure from the information stored in the
  * bootsector. It proceeds to load the necessary system files and completes
- * setting up the structure. 
+ * setting up the structure.
  *
  * Return the allocated volume structure on success and NULL on error with
@@ -834,5 +834,5 @@
 	if (hasmntopt(mnt, "ro") && !hasmntopt(mnt, "rw"))
 		*mnt_flags |= NTFS_MF_READONLY;
-	return 0; 
+	return 0;
 }
 #endif