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

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

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

Changes by: flatcap

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

Added Files:
	.cvsignore 
Log Message:
ignore built/generated files


--- NEW FILE ---
.deps
Makefile
mkntfs
ntfscat
ntfsclone
ntfscluster
ntfscp
ntfsdump_logfile
ntfsfix
ntfsinfo
ntfslabel
ntfsls
ntfsmftalloc
ntfsmove
ntfsresize
ntfsrm
ntfstruncate
ntfsundelete
ntfswipe
*.8

[Linux-NTFS-cvs] CVS: ntfsprogs/include .cvsignore,NONE,1.1

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

Changes by: flatcap

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

Added Files:
	.cvsignore 
Log Message:
ignore built/generated files


--- NEW FILE ---
Makefile

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.61,1.62

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

Changes by: flatcap

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

Modified Files:
	ntfsinfo.c 
Log Message:
Cristi Klein - display the namespace of the file's name


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- ntfsinfo.c	8 Jun 2005 18:01:46 -0000	1.61
+++ ntfsinfo.c	9 Jun 2005 08:29:03 -0000	1.62
@@ -3,8 +3,9 @@
  *
  * Copyright (c) 2002-2004 Matthew J. Fanto
  * Copyright (c) 2002-2004 Anton Altaparmakov
- * Copyright (c) 2002-2003 Richard Russon
+ * Copyright (c) 2002-2005 Richard Russon
  * Copyright (c) 2004-2005 Yura Pakhuchiy
+ * Copyright (c)      2005 Cristian Klein
  *
  * This utility will dump a file's attributes.
  *
@@ -628,6 +629,7 @@ static void ntfs_dump_attr_list(ATTR_REC
 static void ntfs_dump_attr_file_name(ATTR_RECORD *attr)
 {
 	FILE_NAME_ATTR *file_name_attr = NULL;
+	const char *mbs_file_type = NULL;
 
 	file_name_attr = (FILE_NAME_ATTR*)((char *)attr +
 		le16_to_cpu(attr->value_offset));
@@ -659,6 +661,25 @@ static void ntfs_dump_attr_file_name(ATT
 		printf("\tFile Name:\t\t unnamed?!?\n");
 	}
 	
+	/* name space */
+	switch (file_name_attr->file_name_type) {
+	case FILE_NAME_POSIX:
+		mbs_file_type = "POSIX";
+		break;
+	case FILE_NAME_WIN32:
+		mbs_file_type = "Win32";
+		break;
+	case FILE_NAME_DOS:
+		mbs_file_type = "DOS";
+		break;
+	case FILE_NAME_WIN32_AND_DOS:
+		mbs_file_type = "Win32 & DOS";
+		break;
+	}
+	if (mbs_file_type == NULL)      // should never happen
+	    mbs_file_type = "(unknown)";
+	printf("\tNamespace:\t\t %s\n", mbs_file_type);
+
 	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
 	
 	/* other basic stuff about the file */

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs inode.c,1.53,1.54

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

Changes by: cha0smaster

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

Modified Files:
	inode.c 
Log Message:
Fix coding style.


Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- inode.c	5 Jun 2005 14:55:09 -0000	1.53
+++ inode.c	8 Jun 2005 18:02:29 -0000	1.54
@@ -421,7 +421,8 @@ int ntfs_inode_attach_all_extents(ntfs_i
  *
  * Return 0 on success or -1 on error with errno set to the error code.
  */
-static int ntfs_inode_sync_standard_information(ntfs_inode *ni) {
+static int ntfs_inode_sync_standard_information(ntfs_inode *ni)
+{
 	ntfs_attr_search_ctx *ctx;
 	STANDARD_INFORMATION *std_info;
 	int err;
@@ -465,7 +466,8 @@ static int ntfs_inode_sync_standard_info
  *
  * Return 0 on success or -1 on error with errno set to the error code.
  */
-static int ntfs_inode_sync_file_name(ntfs_inode *ni) {
+static int ntfs_inode_sync_file_name(ntfs_inode *ni)
+{
 	ntfs_attr_search_ctx *ctx = NULL;
 	ntfs_index_context *ictx;
 	ntfs_inode *index_ni;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.60,1.61

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

Changes by: cha0smaster

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

Modified Files:
	ntfsinfo.c 
Log Message:
Move flags dumping into the separate function.


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- ntfsinfo.c	6 Jun 2005 14:21:53 -0000	1.60
+++ ntfsinfo.c	8 Jun 2005 18:01:46 -0000	1.61
@@ -100,7 +100,7 @@ static void version (void)
 	printf ("    2002-2004 Anton Altaparmakov\n");
 	printf ("    2002-2003 Richard Russon\n");
 	printf ("    2003      Leonard Norrgård\n");
-	printf ("    2004      Yura Pakhuchiy\n");
+	printf ("    2004-2005 Yura Pakhuchiy\n");
 	printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
 }
 
@@ -387,45 +387,13 @@ static void ntfs_dump_volume(ntfs_volume
 	//TODO: Still need to add a few more attributes
 }
 
-
-/* *************** functions for dumping attributes ******************** */
 /**
- * ntfs_dump_standard_information
+ * ntfs_dump_flags - Dump flags for STANDARD_INFORMATION and FILE_NAME.
+ * @type:	dump flags for this attribute type
+ * @flags:	flags for dumping
  */
-static void ntfs_dump_attr_standard_information(ATTR_RECORD *attr)
+static void ntfs_dump_flags(ATTR_TYPES type, u32 flags)
 {
-	STANDARD_INFORMATION *standard_attr = NULL;
-	u32 value_length, flags;
-
-	standard_attr = (STANDARD_INFORMATION*)((char *)attr +
-		le16_to_cpu(attr->value_offset));
-
-	printf("Dumping attribute $STANDARD_INFORMATION (0x10)\n");
-	
-	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
-
-	/* let's start with mandatory? fields */
-
-	/* time conversion stuff */
-	if (!opts.notime) {
-		char *ntfs_time_str = NULL;
-		
-		ntfs_time_str = ntfsinfo_time_to_str(standard_attr->creation_time);
-		printf("\tFile Creation Time:\t %s",ntfs_time_str);
-		
-		ntfs_time_str = ntfsinfo_time_to_str(
-			standard_attr->last_data_change_time);
-		printf("\tFile Altered Time:\t %s",ntfs_time_str);
-		
-		ntfs_time_str = ntfsinfo_time_to_str(
-			standard_attr->last_mft_change_time);
-		printf("\tMFT Changed Time:\t %s",ntfs_time_str);
-		
-		ntfs_time_str = ntfsinfo_time_to_str(standard_attr->last_access_time);
-		printf("\tLast Accessed Time:\t %s",ntfs_time_str);
-	}
-	
-	flags = standard_attr->file_attributes;
 	printf("\tFile attributes:\t");
 	if (flags & FILE_ATTR_READONLY) {
 		printf(" READONLY");
@@ -479,9 +447,58 @@ static void ntfs_dump_attr_standard_info
 		printf(" ENCRYPTED");
 		flags &= ~FILE_ATTR_ENCRYPTED;
 	}
+	if (type == AT_FILE_NAME) {
+		if (flags & FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT) {
+			printf(" DIRECTORY");
+			flags &= ~FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT;
+		}
+		if (flags & FILE_ATTR_DUP_VIEW_INDEX_PRESENT) {
+			printf(" INDEX_VIEW");
+			flags &= ~FILE_ATTR_DUP_VIEW_INDEX_PRESENT;
+		}
+	}
 	if (flags)
 		printf(" UNKNOWN: 0x%x", (unsigned int)le32_to_cpu(flags));
 	printf("\n");
+}
+
+/* *************** functions for dumping attributes ******************** */
+/**
+ * ntfs_dump_standard_information
+ */
+static void ntfs_dump_attr_standard_information(ATTR_RECORD *attr)
+{
+	STANDARD_INFORMATION *standard_attr = NULL;
+	u32 value_length;
+
+	standard_attr = (STANDARD_INFORMATION*)((char *)attr +
+		le16_to_cpu(attr->value_offset));
+
+	printf("Dumping attribute $STANDARD_INFORMATION (0x10)\n");
+	
+	printf("\tAttribute instance:\t %u\n", le16_to_cpu(attr->instance));
+
+	/* let's start with mandatory? fields */
+
+	/* time conversion stuff */
+	if (!opts.notime) {
+		char *ntfs_time_str = NULL;
+		
+		ntfs_time_str = ntfsinfo_time_to_str(standard_attr->creation_time);
+		printf("\tFile Creation Time:\t %s",ntfs_time_str);
+		
+		ntfs_time_str = ntfsinfo_time_to_str(
+			standard_attr->last_data_change_time);
+		printf("\tFile Altered Time:\t %s",ntfs_time_str);
+		
+		ntfs_time_str = ntfsinfo_time_to_str(
+			standard_attr->last_mft_change_time);
+		printf("\tMFT Changed Time:\t %s",ntfs_time_str);
+		
+		ntfs_time_str = ntfsinfo_time_to_str(standard_attr->last_access_time);
+		printf("\tLast Accessed Time:\t %s",ntfs_time_str);
+	}
+	ntfs_dump_flags(attr->type, standard_attr->file_attributes);
 
 	printf("\tMax Number of Versions:\t %u \n",
 		(unsigned int)le32_to_cpu(standard_attr->maximum_versions));
@@ -489,7 +506,6 @@ static void ntfs_dump_attr_standard_info
 		(unsigned int)le32_to_cpu(standard_attr->version_number));
 	printf("\tClass ID:\t\t %u \n",
 		(unsigned int)le32_to_cpu(standard_attr->class_id));
-
 	
 	value_length = le32_to_cpu(attr->value_length);
 	if (value_length == 48) {
@@ -505,7 +521,6 @@ static void ntfs_dump_attr_standard_info
 			"either 72 or 48, something is wrong...\n",
 			(unsigned int)value_length);
 	}
-	
 }
 
 /**
@@ -613,7 +628,6 @@ static void ntfs_dump_attr_list(ATTR_REC
 static void ntfs_dump_attr_file_name(ATTR_RECORD *attr)
 {
 	FILE_NAME_ATTR *file_name_attr = NULL;
-	u32 flags;
 
 	file_name_attr = (FILE_NAME_ATTR*)((char *)attr +
 		le16_to_cpu(attr->value_offset));
@@ -654,71 +668,7 @@ static void ntfs_dump_attr_file_name(ATT
 		(long long)sle64_to_cpu(file_name_attr->data_size));
 	printf("\tParent directory:\t %lld\n",
 		(long long)MREF_LE(file_name_attr->parent_directory));
-	flags = file_name_attr->file_attributes;
-	printf("\tFile attributes:\t");
-	if (flags & FILE_ATTR_READONLY) {
-		printf(" READONLY");
-		flags &= ~FILE_ATTR_READONLY;
-	}
-	if (flags & FILE_ATTR_HIDDEN) {
-		printf(" HIDDEN");
-		flags &= ~FILE_ATTR_HIDDEN;
-	}
-	if (flags & FILE_ATTR_SYSTEM) {
-		printf(" SYSTEM");
-		flags &= ~FILE_ATTR_SYSTEM;
-	}
-	if (flags & FILE_ATTR_ARCHIVE) {
-		printf(" ARCHIVE");
-		flags &= ~FILE_ATTR_ARCHIVE;
-	}
-	if (flags & FILE_ATTR_DEVICE) {
-		printf(" DEVICE");
-		flags &= ~FILE_ATTR_DEVICE;
-	}
-	if (flags & FILE_ATTR_NORMAL) {
-		printf(" NORMAL");
-		flags &= ~FILE_ATTR_NORMAL;
-	}
-	if (flags & FILE_ATTR_TEMPORARY) {
-		printf(" TEMPORARY");
-		flags &= ~FILE_ATTR_TEMPORARY;
-	}
-	if (flags & FILE_ATTR_SPARSE_FILE) {
-		printf(" SPARSE_FILE");
-		flags &= ~FILE_ATTR_SPARSE_FILE;
-	}
-	if (flags & FILE_ATTR_REPARSE_POINT) {
-		printf(" REPARSE_POINT");
-		flags &= ~FILE_ATTR_REPARSE_POINT;
-	}
-	if (flags & FILE_ATTR_COMPRESSED) {
-		printf(" COMPRESSED");
-		flags &= ~FILE_ATTR_COMPRESSED;
-	}
-	if (flags & FILE_ATTR_OFFLINE) {
-		printf(" OFFLINE");
-		flags &= ~FILE_ATTR_OFFLINE;
-	}
-	if (flags & FILE_ATTR_NOT_CONTENT_INDEXED) {
-		printf(" NOT_CONTENT_INDEXED");
-		flags &= ~FILE_ATTR_NOT_CONTENT_INDEXED;
-	}
-	if (flags & FILE_ATTR_ENCRYPTED) {
-		printf(" ENCRYPTED");
-		flags &= ~FILE_ATTR_ENCRYPTED;
-	}
-	if (flags & FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT) {
-		printf(" DIRECTORY");
-		flags &= ~FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT;
-	}
-	if (flags & FILE_ATTR_DUP_VIEW_INDEX_PRESENT) {
-		printf(" INDEX_VIEW");
-		flags &= ~FILE_ATTR_DUP_VIEW_INDEX_PRESENT;
-	}
-	if (flags)
-		printf(" UNKNOWN: 0x%x", (unsigned int)le32_to_cpu(flags));
-	printf("\n");
+	ntfs_dump_flags(attr->type, file_name_attr->file_attributes);
 
 	/* time stuff stuff */
 	if (!opts.notime) {
@@ -1126,9 +1076,10 @@ static int ntfs_dump_index_entries(INDEX
 			case(AT_FILE_NAME):
 				Vprintf("\t\tFILE record number:\t %llu\n",
 						MREF_LE(entry->indexed_file));
-				Vprintf("\t\tFile attributes:\t 0x%08x\n",
-					(unsigned int)le32_to_cpu(
-					entry->key.file_name.file_attributes));
+				Vprintf("\t");
+				if (opts.verbose)
+					ntfs_dump_flags(type, entry->key.
+						file_name.file_attributes);
 				Vprintf("\t\tFile name namespace:\t 0x%02x\n",
 					entry->key.file_name.file_name_type);
 				ntfs_ucstombs(entry->key.file_name.file_name,

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs win32_io.c,1.34,1.35

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

Changes by: antona

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

Modified Files:
	win32_io.c 
Log Message:
Use dynamic buffer in ntfs_device_win32_find_partition().
Based on patch from Yuval.


Index: win32_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- win32_io.c	6 Jun 2005 14:30:38 -0000	1.34
+++ win32_io.c	6 Jun 2005 14:51:09 -0000	1.35
@@ -669,23 +669,47 @@ static HANDLE ntfs_device_win32_open_vol
  * the partition attributes are returned back.
  *
  * Return TRUE  if found, and sets the output parameters.
- *        FALSE if not.
+ *        FALSE if not and errno is set to the error code.
  */
 static BOOL ntfs_device_win32_find_partition(HANDLE handle, DWORD partition_id,
 		s64 *part_offset, s64 *part_length, int *hidden_sectors)
 {
 	DRIVE_LAYOUT_INFORMATION *drive_layout;
+	unsigned int err, buf_size, part_count;
 	DWORD i;
-	char buf[sizeof(DRIVE_LAYOUT_INFORMATION) +
-			9 * sizeof(PARTITION_INFORMATION)];
 
-	if (!DeviceIoControl(handle, IOCTL_DISK_GET_DRIVE_LAYOUT, NULL, 0,
-			&buf, sizeof(buf), &i, NULL)) {
-		errno = ntfs_w32error_to_errno(GetLastError());
-		Dputs("Error: GetDriveLayout failed.");
-		return FALSE;
-	}
-	drive_layout = (DRIVE_LAYOUT_INFORMATION *)buf;
+	/*
+	 * There is no way to know the required buffer, so if the ioctl fails,
+	 * try doubling the buffer size each time until the ioctl succeeds.
+	 */
+	part_count = 8;
+	do {
+		buf_size = sizeof(DRIVE_LAYOUT_INFORMATION) +
+				part_count * sizeof(PARTITION_INFORMATION);
+		drive_layout = malloc(buf_size);
+		if (!drive_layout) {
+			errno = ENOMEM;
+			return FALSE;
+		}
+		if (DeviceIoControl(handle, IOCTL_DISK_GET_DRIVE_LAYOUT, NULL,
+				0, (BYTE*)drive_layout, buf_size, &i, NULL))
+			break;
+		err = GetLastError();
+		free(drive_layout);
+		if (err != ERROR_INSUFFICIENT_BUFFER) {
+			Dputs("Error: GetDriveLayout failed.");
+			errno = ntfs_w32error_to_errno(err);
+			return FALSE;
+		}
+		Dprintf("More than %u partitions.\n", part_count);
+		part_count <<= 1;
+		if (part_count > 512) {
+			Dputs("Error: GetDriveLayout failed: More than 512 "
+					"partitions?");
+			errno = ENOBUFS;
+			return FALSE;
+		}
+	} while (1);
 	for (i = 0; i < drive_layout->PartitionCount; i++) {
 		if (drive_layout->PartitionEntry[i].PartitionNumber ==
 				partition_id) {
@@ -695,9 +719,12 @@ static BOOL ntfs_device_win32_find_parti
 					PartitionLength.QuadPart;
 			*hidden_sectors = drive_layout->PartitionEntry[i].
 					HiddenSectors;
+			free(drive_layout);
 			return TRUE;
 		}
 	}
+	free(drive_layout);
+	errno = ENOENT;
 	return FALSE;
 }
 

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

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

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Update build for changes to function detection in configure.ac.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- Makefile.in	4 Jun 2005 00:58:01 -0000	1.19
+++ Makefile.in	6 Jun 2005 14:31:42 -0000	1.20
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -65,6 +65,7 @@ ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
@@ -75,6 +76,10 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -86,6 +91,8 @@ EGREP = @EGREP@
 ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
 ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -115,13 +122,19 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.in,1.69,1.70

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

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Update build for changes to function detection in configure.ac.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- Makefile.in	4 Jun 2005 00:58:01 -0000	1.69
+++ Makefile.in	6 Jun 2005 14:31:42 -0000	1.70
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -132,7 +132,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -162,6 +162,7 @@ ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
@@ -172,6 +173,10 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -183,6 +188,8 @@ EGREP = @EGREP@
 ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
 ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -212,13 +219,19 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@

[Linux-NTFS-cvs] CVS: ntfsprogs/doc Makefile.in,1.22,1.23

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

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Update build for changes to function detection in configure.ac.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/doc/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- Makefile.in	4 Jun 2005 00:58:00 -0000	1.22
+++ Makefile.in	6 Jun 2005 14:31:42 -0000	1.23
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -52,6 +52,7 @@ ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
@@ -62,6 +63,10 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -73,6 +78,8 @@ EGREP = @EGREP@
 ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
 ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -102,13 +109,19 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs Makefile.in,1.43,1.44

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

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Update build for changes to function detection in configure.ac.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/Makefile.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- Makefile.in	4 Jun 2005 00:58:01 -0000	1.43
+++ Makefile.in	6 Jun 2005 14:31:42 -0000	1.44
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -107,11 +107,11 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libntfs_gnomevfs_la_SOURCES) $(libntfs_la_SOURCES)
 DIST_SOURCES = $(libntfs_gnomevfs_la_SOURCES) $(libntfs_la_SOURCES)
@@ -127,6 +127,7 @@ ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
@@ -137,6 +138,10 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -148,6 +153,8 @@ EGREP = @EGREP@
 ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
 ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -177,13 +184,19 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -412,18 +425,18 @@ distclean-compile:
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libntfs_gnomevfs_la-gnome-vfs-method.lo: gnome-vfs-method.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-method.lo -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo" -c -o libntfs_gnomevfs_la-gnome-vfs-method.lo `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-method.lo -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo" -c -o libntfs_gnomevfs_la-gnome-vfs-method.lo `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo" "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Plo"; else rm -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.lo `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.lo `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c
 
 libntfs_gnomevfs_la-gnome-vfs-module.lo: gnome-vfs-module.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-module.lo -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo" -c -o libntfs_gnomevfs_la-gnome-vfs-module.lo `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c; \
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-module.lo -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo" -c -o libntfs_gnomevfs_la-gnome-vfs-module.lo `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo" "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Plo"; else rm -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.lo `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.lo `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c
 
 mostlyclean-libtool:
 	-rm -f *.lo

[Linux-NTFS-cvs] CVS: ntfsprogs INSTALL,1.10,1.11 Makefile.in,1.29,1.30 aclocal.m4,1.22,1.23 autogen.sh,1.7,1.8 compile,1.9,1.10 config.guess,1.18,1.19 config.h.in,1.16,1.17 config.sub,1.18,1.19 configure,1.79,1.80 configure.ac,1.56,1.57 depcomp,1.10,1.11 install-sh,1.17,1.18 ltmain.sh,1.15,1.16 missing,1.10,1.11 mkinstalldirs,1.9,1.10

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

Changes by: antona

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

Modified Files:
	INSTALL Makefile.in aclocal.m4 autogen.sh compile config.guess 
	config.h.in config.sub configure configure.ac depcomp 
	install-sh ltmain.sh missing mkinstalldirs 
Log Message:
Update build for changes to function detection in configure.ac.


Index: INSTALL
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/INSTALL,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- INSTALL	4 Jun 2005 00:57:58 -0000	1.10
+++ INSTALL	6 Jun 2005 14:31:37 -0000	1.11
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
 Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
@@ -189,8 +189,13 @@ them in the `configure' command line, us
 
      ./configure CC=/usr/local2/bin/gcc
 
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
 
 `configure' Invocation
 ======================

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- Makefile.in	4 Jun 2005 00:57:58 -0000	1.29
+++ Makefile.in	6 Jun 2005 14:31:37 -0000	1.30
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -77,6 +77,7 @@ ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
@@ -87,6 +88,10 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -98,6 +103,8 @@ EGREP = @EGREP@
 ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
 ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -127,13 +134,19 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -251,7 +264,13 @@ uninstall-info-am:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -263,7 +282,7 @@ $(RECURSIVE_TARGETS):
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -271,7 +290,13 @@ $(RECURSIVE_TARGETS):
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -292,7 +317,7 @@ maintainer-clean-recursive:
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/aclocal.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- aclocal.m4	4 Jun 2005 00:57:58 -0000	1.22
+++ aclocal.m4	6 Jun 2005 14:31:37 -0000	1.23
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,63 @@
[...9575 lines suppressed...]
-# 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; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------

Index: autogen.sh
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/autogen.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- autogen.sh	19 May 2005 20:47:09 -0000	1.7
+++ autogen.sh	6 Jun 2005 14:31:39 -0000	1.8
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Run this to generate all the initial makefiles, etc.
 
 if test "$srcdir" == ""; then

Index: compile
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/compile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- compile	4 Jun 2005 00:57:59 -0000	1.9
+++ compile	6 Jun 2005 14:31:39 -0000	1.10
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2004-10-12.08
+scriptversion=2005-02-03.08
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tr...@cy...>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -47,11 +47,11 @@ right script to run: please start by rea
 
 Report bugs to <bug...@gn...>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 

Index: config.guess
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.guess,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- config.guess	4 Jun 2005 00:57:59 -0000	1.18
+++ config.guess	6 Jun 2005 14:31:39 -0000	1.19
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-11-12'
+timestamp='2005-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -804,6 +804,9 @@ EOF
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit 0 ;;
+    amd64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
 	exit 0 ;;
@@ -1197,6 +1200,9 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;

Index: config.h.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.h.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- config.h.in	17 Dec 2004 14:41:57 -0000	1.16
+++ config.h.in	6 Jun 2005 14:31:39 -0000	1.17
@@ -6,6 +6,9 @@
 /* Define to 1 if you have the <byteswap.h> header file. */
 #undef HAVE_BYTESWAP_H
 
+/* Define to 1 if you have the <ctype.h> header file. */
+#undef HAVE_CTYPE_H
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -93,9 +96,6 @@
 /* Define to 1 if you have the `regcomp' function. */
 #undef HAVE_REGCOMP
 
-/* Define to 1 if you have the `SetFilePointerEx' function. */
-#undef HAVE_SETFILEPOINTEREX
-
 /* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 

Index: config.sub
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.sub,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- config.sub	4 Jun 2005 00:57:59 -0000	1.18
+++ config.sub	6 Jun 2005 14:31:39 -0000	1.19
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-11-30'
+timestamp='2005-02-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@ Report bugs and patches to <config-patch
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -237,7 +237,7 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -310,7 +310,7 @@ case $basic_machine in
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \

Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- configure	4 Jun 2005 00:57:59 -0000	1.79
+++ configure	6 Jun 2005 14:31:39 -0000	1.80
@@ -243,17 +243,6 @@ IFS=" 	$as_nl"
 $as_unset CDPATH
 
 
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) lt_cv_sys_path_separator=';' ;;
-    *)     lt_cv_sys_path_separator=':' ;;
-  esac
[...19543 lines suppressed...]
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
+s,@CXX@,$CXX,;t t
+s,@CXXFLAGS@,$CXXFLAGS,;t t
+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@CXXDEPMODE@,$CXXDEPMODE,;t t
+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+s,@CXXCPP@,$CXXCPP,;t t
+s,@F77@,$F77,;t t
+s,@FFLAGS@,$FFLAGS,;t t
+s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@LIBNTFS_GNOMEVFS_CFLAGS@,$LIBNTFS_GNOMEVFS_CFLAGS,;t t
 s,@LIBNTFS_GNOMEVFS_LIBS@,$LIBNTFS_GNOMEVFS_LIBS,;t t
 s,@ENABLE_GNOME_VFS_TRUE@,$ENABLE_GNOME_VFS_TRUE,;t t

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- configure.ac	17 Dec 2004 14:41:57 -0000	1.56
+++ configure.ac	6 Jun 2005 14:31:42 -0000	1.57
@@ -190,11 +190,11 @@ AC_SUBST(AUTODIRS)
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h libintl.h limits.h locale.h mntent.h stddef.h \
-	stdint.h stdlib.h stdio.h stdarg.h string.h strings.h errno.h time.h \
-	unistd.h utime.h wchar.h getopt.h features.h endian.h byteswap.h \
-	sys/byteorder.h sys/endian.h sys/param.h sys/ioctl.h sys/mount.h \
-	sys/stat.h sys/types.h sys/vfs.h linux/major.h linux/fd.h \
+AC_CHECK_HEADERS([ctype.h fcntl.h libintl.h limits.h locale.h mntent.h \
+	stddef.h stdint.h stdlib.h stdio.h stdarg.h string.h strings.h \
+	errno.h time.h unistd.h utime.h wchar.h getopt.h features.h endian.h \
+	byteswap.h sys/byteorder.h sys/endian.h sys/param.h sys/ioctl.h \
+	sys/mount.h sys/stat.h sys/types.h sys/vfs.h linux/major.h linux/fd.h \
 	linux/hdreg.h machine/endian.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -219,7 +219,7 @@ AC_FUNC_STRFTIME
 AC_FUNC_UTIME_NULL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([atexit fdatasync hasmntopt memmove memset regcomp setlocale \
-	strcasecmp strchr strdup strerror strtol strtoul utime mbsinit SetFilePointerEx])
+	strcasecmp strchr strdup strerror strtol strtoul utime mbsinit])
 
 # Makefiles to be created by configure.
 AC_CONFIG_FILES([

Index: depcomp
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/depcomp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- depcomp	4 Jun 2005 00:58:00 -0000	1.10
+++ depcomp	6 Jun 2005 14:31:42 -0000	1.11
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2004-05-31.23
+scriptversion=2005-02-09.22
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -50,11 +50,11 @@ Environment variables:
 
 Report bugs to <bug...@gn...>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -287,36 +287,43 @@ tru64)
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mecanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
       "$@" -Wc,-MD
    else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
       exit $stat
    fi
 
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].

Index: install-sh
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/install-sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- install-sh	4 Jun 2005 00:58:00 -0000	1.17
+++ install-sh	6 Jun 2005 14:31:42 -0000	1.18
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-12-17.09
+scriptversion=2005-02-02.21
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -109,7 +109,7 @@ while test -n "$1"; do
         shift
         continue;;
 
-    --help) echo "$usage"; exit 0;;
+    --help) echo "$usage"; exit $?;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -134,7 +134,7 @@ while test -n "$1"; do
 	shift
 	continue;;
 
-    --version) echo "$0 $scriptversion"; exit 0;;
+    --version) echo "$0 $scriptversion"; exit $?;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.

Index: ltmain.sh
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ltmain.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ltmain.sh	4 Jun 2005 00:58:00 -0000	1.15
+++ ltmain.sh	6 Jun 2005 14:31:42 -0000	1.16
@@ -1,7 +1,7 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <go...@gn...>, 1996
 #
@@ -17,13 +17,41 @@
 #
 # You should have received a copy of the GNU General Public License
[...5515 lines suppressed...]
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script

Index: missing
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/missing,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- missing	4 Jun 2005 00:58:00 -0000	1.10
+++ missing	6 Jun 2005 14:31:42 -0000	1.11
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2004-09-07.08
+scriptversion=2005-02-08.22
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pi...@ir...>, 1996.
 
@@ -87,12 +87,12 @@ Supported PROGRAM values:
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug...@gn...>."
-    exit 0
+    exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
-    exit 0
+    exit $?
     ;;
 
   -*)
@@ -288,10 +288,14 @@ WARNING: \`$1' is $msg.  You should only
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
     touch $file
     ;;

Index: mkinstalldirs
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/mkinstalldirs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mkinstalldirs	4 Jun 2005 00:58:00 -0000	1.9
+++ mkinstalldirs	6 Jun 2005 14:31:42 -0000	1.10
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2004-02-15.20
+scriptversion=2005-02-02.21
 
 # Original author: Noah Friedman <fri...@pr...>
 # Created: 1993-05-16
@@ -27,7 +27,7 @@ while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
       echo "$usage"
-      exit 0
+      exit $?
       ;;
     -m)                         # -m PERM arg
       shift
@@ -37,7 +37,7 @@ while test $# -gt 0 ; do
       ;;
     --version)
       echo "$0 $scriptversion"
-      exit 0
+      exit $?
       ;;
     --)                         # stop option processing
       shift

[Linux-NTFS-cvs] CVS: ntfsprogs/include Makefile.in,1.28,1.29

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

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Update build for changes to function detection in configure.ac.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/Makefile.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- Makefile.in	4 Jun 2005 00:58:00 -0000	1.28
+++ Makefile.in	6 Jun 2005 14:31:42 -0000	1.29
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -61,6 +61,7 @@ ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTODIRS = @AUTODIRS@
 AUTOHEADER = @AUTOHEADER@
@@ -71,6 +72,10 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -82,6 +87,8 @@ EGREP = @EGREP@
 ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
 ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -111,13 +118,19 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -206,7 +219,13 @@ uninstall-info-am:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -218,7 +237,7 @@ $(RECURSIVE_TARGETS):
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -226,7 +245,13 @@ $(RECURSIVE_TARGETS):
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -247,7 +272,7 @@ maintainer-clean-recursive:
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs win32_io.c,1.33,1.34

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

Changes by: antona

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

Modified Files:
	win32_io.c 
Log Message:
Finally fix the win32 write support problems.


Index: win32_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- win32_io.c	3 Jun 2005 10:33:35 -0000	1.33
+++ win32_io.c	6 Jun 2005 14:30:38 -0000	1.34
@@ -42,7 +42,11 @@ struct stat;
 struct ntfs_volume;
 typedef struct ntfs_volume ntfs_volume;
 
-#include "config.h"
+#ifndef NTFS_BLOCK_SIZE
+#define NTFS_BLOCK_SIZE		512
+#define NTFS_BLOCK_SIZE_BITS	9
+#endif
+
 #include "debug.h"
 
[...1549 lines suppressed...]
 	}
 }
 
-static s64 ntfs_device_win32_pread(struct ntfs_device *dev, void *buf,
+static s64 ntfs_device_win32_pread(struct ntfs_device *dev, void *b,
 		s64 count, s64 offset)
 {
-	return ntfs_pread(dev, offset, count, buf);
+	return ntfs_pread(dev, offset, count, b);
 }
 
-static s64 ntfs_device_win32_pwrite(struct ntfs_device *dev, const void *buf,
+static s64 ntfs_device_win32_pwrite(struct ntfs_device *dev, const void *b,
 		s64 count, s64 offset)
 {
-	return ntfs_pwrite(dev, offset, count, buf);
+	return ntfs_pwrite(dev, offset, count, b);
 }
 
 struct ntfs_device_operations ntfs_device_win32_io_ops = {

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

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

Changes by: antona

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

Modified Files:
	mkntfs.c 
Log Message:
Minor cleanup


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- mkntfs.c	3 Jun 2005 22:22:12 -0000	1.56
+++ mkntfs.c	6 Jun 2005 14:29:47 -0000	1.57
@@ -1,7 +1,7 @@
 /**
  * mkntfs - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000-2004 Anton Altaparmakov
+ * Copyright (c) 2000-2005 Anton Altaparmakov
  * Copyright (c) 2001-2003 Richard Russon
  *
  * This utility will create an NTFS 1.2 (Windows NT 4.0) volume on a user
@@ -540,16 +540,21 @@ static s64 ntfs_rlwrite(struct ntfs_devi
 			// TODO: Check that *val is really zero at pos and len.
 			continue;
 		}
+		/*
+		 * Break up the write into the real data write and then a write
+		 * of zeroes between the end of the real data and the end of
+		 * the (last) run.
+		 */
+		if (total + length > val_len) {
+			delta = length;
+			length = val_len - total;
+			delta -= length;
+		}
 		if (dev->d_ops->seek(dev, rl[i].lcn * vol->cluster_size,
 				SEEK_SET) == (off_t)-1)
 			return -1LL;
 		retry = 0;
 		do {
-			if (total + length > val_len) {
-				delta = length;
-				length = val_len - total;
-				delta -= length;
-			}
 			bytes_written = dev->d_ops->write(dev, val + total,
 					length);
 			if (bytes_written == -1LL) {
@@ -575,12 +580,15 @@ static s64 ntfs_rlwrite(struct ntfs_devi
 		}
 	}
 	if (delta) {
+		int eo;
 		char *b = (char*)calloc(1, delta);
 		if (!b)
 			err_exit("Error allocating internal buffer: "
 					"%s\n", strerror(errno));
 		bytes_written = mkntfs_write(dev, b, delta);
+		eo = errno;
 		free(b);
+		errno = eo;
 		if (bytes_written == -1LL)
 			return bytes_written;
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.59,1.60

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

Changes by: antona

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

Modified Files:
	ntfsinfo.c 
Log Message:
Fix warnings.  (Yuval)


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- ntfsinfo.c	5 Jun 2005 23:48:55 -0000	1.59
+++ ntfsinfo.c	6 Jun 2005 14:21:53 -0000	1.60
@@ -480,7 +480,7 @@ static void ntfs_dump_attr_standard_info
 		flags &= ~FILE_ATTR_ENCRYPTED;
 	}
 	if (flags)
-		printf(" UNKNOWN: 0x%x", le32_to_cpu(flags));
+		printf(" UNKNOWN: 0x%x", (unsigned int)le32_to_cpu(flags));
 	printf("\n");
 
 	printf("\tMax Number of Versions:\t %u \n",
@@ -576,7 +576,8 @@ static void ntfs_dump_attr_list(ATTR_REC
 	for(;(u8 *)entry < (u8 *) value + l; entry = (ATTR_LIST_ENTRY *)
 				((u8 *) entry + le16_to_cpu(entry->length))) {
 		printf("\n");
-		printf("\t\tAtrribute type:\t0x%X\n", le32_to_cpu(entry->type));
+		printf("\t\tAtrribute type:\t0x%x\n",
+				(unsigned int)le32_to_cpu(entry->type));
 		printf("\t\tRecord length:\t%u\n",
 				le16_to_cpu(entry->length));
 		printf("\t\tName length:\t%u\n", entry->name_length);
@@ -716,7 +717,7 @@ static void ntfs_dump_attr_file_name(ATT
 		flags &= ~FILE_ATTR_DUP_VIEW_INDEX_PRESENT;
 	}
 	if (flags)
-		printf(" UNKNOWN: 0x%x", le32_to_cpu(flags));
+		printf(" UNKNOWN: 0x%x", (unsigned int)le32_to_cpu(flags));
 	printf("\n");
 
 	/* time stuff stuff */
@@ -1126,7 +1127,7 @@ static int ntfs_dump_index_entries(INDEX
 				Vprintf("\t\tFILE record number:\t %llu\n",
 						MREF_LE(entry->indexed_file));
 				Vprintf("\t\tFile attributes:\t 0x%08x\n",
-					le32_to_cpu(
+					(unsigned int)le32_to_cpu(
 					entry->key.file_name.file_attributes));
 				Vprintf("\t\tFile name namespace:\t 0x%02x\n",
 					entry->key.file_name.file_name_type);

[Linux-NTFS-cvs] CVS: ntfsprogs NEWS,1.21,1.22

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

Changes by: antona

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

Modified Files:
	NEWS 
Log Message:
Fix typo.


Index: NEWS
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/NEWS,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- NEWS	5 Jun 2005 23:48:55 -0000	1.21
+++ NEWS	6 Jun 2005 09:18:33 -0000	1.22
@@ -1,9 +1,9 @@
 Current news
 ============
 
-Attribute resize code for normal and sparse files is completed. Thus ntfscp
-should always successfully overwrite any normal or sparse even if file size is
-changed.
+Attribute resize code for normal and sparse files is completed.  Thus, ntfscp
+should always successfully overwrite any normal or sparse file even if file
+size is changed.
 
 Moved back from BitKeeper to CVS on SF.net.
 

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

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

Changes by: cha0smaster

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

Modified Files:
	collate.c 
Log Message:
Anyway, this extra check will not harm anybody, but in case windows support such names it's will be useful.


Index: collate.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- collate.c	5 Jun 2005 14:55:09 -0000	1.3
+++ collate.c	6 Jun 2005 04:26:28 -0000	1.4
@@ -81,9 +81,14 @@ static int ntfs_collate_file_name(ntfs_v
 			fn2->file_name, fn2->file_name_length,
 			NTFS_COLLATION_ERROR, IGNORE_CASE, vol->upcase,
 			vol->upcase_len);
+	if (!rc) {
+		rc = ntfs_names_collate(fn1->file_name, fn1->file_name_length,
+				fn2->file_name, fn2->file_name_length,
+				NTFS_COLLATION_ERROR, CASE_SENSITIVE,
+				vol->upcase, vol->upcase_len);
+	}
 	ntfs_debug("Done, returning %i.", rc);
 	return rc;
-
 }
 
 typedef int (*ntfs_collate_func_t)(ntfs_volume *, const void *, const int,

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscp.8.in,1.4,1.5 ntfscp.c,1.17,1.18 ntfsinfo.c,1.58,1.59

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

Changes by: cha0smaster

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

Modified Files:
	ntfscp.8.in ntfscp.c ntfsinfo.c 
Log Message:
- Fix bug in index.c pointed by Anton, many thanks to him.
- Small updates all over the place:
   * NEWS
   * ntfscp manual page
   * ntfsinfo prints parent directory for FILE_NAME attribute
   * year in ntfscp copyright


Index: ntfscp.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.8.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ntfscp.8.in	21 Nov 2004 10:54:50 -0000	1.4
+++ ntfscp.8.in	5 Jun 2005 23:48:55 -0000	1.5
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2004 Yura Pakhuchiy. All Rights Reserved.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCP 8 "October 2004" "ntfsprogs version @VERSION@"
+.TH NTFSCP 8 "June 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfscp \- overwrite file on an NTFS volume.
 .SH SYNOPSIS
@@ -10,12 +10,22 @@ ntfscp \- overwrite file on an NTFS volu
 [
 .I options
 ]
-.B device src_file dest_file
+.B device source_file destination
 .SH DESCRIPTION
 .B ntfscp
 will overwrite file on an NTFS volume. At present
 .B ntfscp
 can't create new files.
+.B destination
+can be either file or directory. In case if
+.B destination
+is directory specified by name then
+.B source_file
+is copied into this directory, in case if
+.B destination
+is directory and specified by inode number then unnamed data attribute is created for this inode and
+.B source_file
+is copied into it (WARNING: it's unusual to have unnamed data streams in the directories, think twice before specifying directory by inode number). 
 .SH OPTIONS
 Below is a summary of all the options that
 .B ntfscp
@@ -35,7 +45,7 @@ Write to this attribute.
 .TP
 .B \-i, \-\-inode
 Treat
-.I dest_file
+.I destination
 as inode number.
 .TP
 .BI "\-N, \-\-attr-name " name
@@ -61,17 +71,19 @@ Show the version number, copyright and l
 .TP
 .B \-v, \-\-vebose
 Display more debug/warning/error messages.
+.SH DATA STREAMS
+All data on NTFS is stored in streams, which can have names. A file can have more than one data streams, but exactly one must have no name. The size of a file is the size of its unnamed data stream. Usually when you don't specify stream name you are access to unnamed data stream. If you want access to named data stream you need to add ":stream_name" to the filename. For example: by opening "some.mp3:artist" you will open stream "artist" in "some.mp3". But windows usually prevent you from accessing to named data streams, so you need to use some program like FAR or utils from cygwin to access named data streams.
 .SH EXAMPLES
-Copy boot.ini from /home/user to the root of an /dev/hda1 NTFS volume:
+Copy new_boot.ini from /home/user as boot.ini to the root of an /dev/hda1 NTFS volume:
 .RS
 .sp
-.B ntfscp /dev/hda1 /home/user/boot.ini boot.ini
+.B ntfscp /dev/hda1 /home/user/new_boot.ini boot.ini
 .sp
 .RE
-Copy myfile to C:\\some\\path\\file:stream (assume that /dev/hda1 letter in windows is C):
+Copy myfile to C:\\some\\path\\myfile:stream (assume that /dev/hda1 letter in windows is C):
 .RS
 .sp
-.B ntfscp -N stream /dev/hda1 myfile /some/path/file
+.B ntfscp -N stream /dev/hda1 myfile /some/path
 .SH BUGS
 No bugs are known at present. If you find any bugs, please send an email to
 .nh
@@ -83,7 +95,10 @@ was written by Yura Pakhuchiy.
 .B ntfscp
 and this manual page is based on
 .B ntfscat
-and it's manaul page by Richard Russon, so many thanks to him.
+and it's manaul page by Richard Russon, so many thanks to him. Information about named data streams was partly taken from
+.B ntfsdoc.
+.SH DEDICATION
+With love to Marina Sapego.
 .SH AVAILABILITY
 .B ntfscp
 is part of the ntfsprogs package and is available from

Index: ntfscp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ntfscp.c	5 Jun 2005 14:55:09 -0000	1.17
+++ ntfscp.c	5 Jun 2005 23:48:55 -0000	1.18
@@ -70,7 +70,7 @@ static void version (void)
 {
 	Printf ("\n%s v%s - Overwrite files on NTFS volume.\n\n",
 		EXEC_NAME, VERSION);
-	Printf ("Copyright (c) 2004 Yura Pakhuchiy\n");
+	Printf ("Copyright (c) 2004-2005 Yura Pakhuchiy\n");
 	Printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
 }
 

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ntfsinfo.c	5 Jun 2005 14:55:09 -0000	1.58
+++ ntfsinfo.c	5 Jun 2005 23:48:55 -0000	1.59
@@ -651,6 +651,8 @@ static void ntfs_dump_attr_file_name(ATT
 		(long long)sle64_to_cpu(file_name_attr->allocated_size));
 	printf("\tReal File Size:\t\t %lld\n",
 		(long long)sle64_to_cpu(file_name_attr->data_size));
+	printf("\tParent directory:\t %lld\n",
+		(long long)MREF_LE(file_name_attr->parent_directory));
 	flags = file_name_attr->file_attributes;
 	printf("\tFile attributes:\t");
 	if (flags & FILE_ATTR_READONLY) {

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

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

Changes by: cha0smaster

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

Modified Files:
	index.c 
Log Message:
- Fix bug in index.c pointed by Anton, many thanks to him.
- Small updates all over the place:
   * NEWS
   * ntfscp manual page
   * ntfsinfo prints parent directory for FILE_NAME attribute
   * year in ntfscp copyright


Index: index.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- index.c	5 Jun 2005 14:55:09 -0000	1.3
+++ index.c	5 Jun 2005 23:48:55 -0000	1.4
@@ -75,9 +75,10 @@ void ntfs_index_ctx_put(ntfs_index_conte
 			if (ictx->ia_dirty) {
 				if (ntfs_attr_mst_pwrite(ictx->ia_na,
 						ictx->ia_vcn <<
-						ictx->ni->vol->cluster_size, 1,
-						ictx->block_size, ictx->ia) !=
-						1)
+						ictx->ni->vol->
+						cluster_size_bits,
+						1, ictx->block_size,
+						ictx->ia) != 1)
 					ntfs_error(, "Failed to write out "
 							"index block.");
 			}

[Linux-NTFS-cvs] CVS: ntfsprogs NEWS,1.20,1.21

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

Changes by: cha0smaster

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

Modified Files:
	NEWS 
Log Message:
- Fix bug in index.c pointed by Anton, many thanks to him.
- Small updates all over the place:
   * NEWS
   * ntfscp manual page
   * ntfsinfo prints parent directory for FILE_NAME attribute
   * year in ntfscp copyright


Index: NEWS
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/NEWS,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- NEWS	19 May 2005 21:51:12 -0000	1.20
+++ NEWS	5 Jun 2005 23:48:55 -0000	1.21
@@ -1,6 +1,10 @@
 Current news
 ============
 
+Attribute resize code for normal and sparse files is completed. Thus ntfscp
+should always successfully overwrite any normal or sparse even if file size is
+changed.
+
 Moved back from BitKeeper to CVS on SF.net.
 
 ntfsprogs should now work completely on Windows 2000 and XP (Cygwin). 

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

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

Changes by: antona

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

Modified Files:
	layout.h 
Log Message:
Add some offset comments.


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- layout.h	11 Jan 2005 20:28:28 -0000	1.16
+++ layout.h	5 Jun 2005 20:06:45 -0000	1.17
@@ -52,12 +52,12 @@ typedef struct {
 	u16 sectors;			/* zero */
 	u8  media_type;			/* 0xf8 = hard disk */
 	u16 sectors_per_fat;		/* zero */
-	u16 sectors_per_track;		/* Required to boot Windows. */
-	u16 heads;			/* Required to boot Windows. */
-	u32 hidden_sectors;		/* Offset to the start of the partition
+/*0x0d*/u16 sectors_per_track;		/* Required to boot Windows. */
+/*0x0f*/u16 heads;			/* Required to boot Windows. */
+/*0x11*/u32 hidden_sectors;		/* Offset to the start of the partition
 					   relative to the disk in sectors.
 					   Required to boot Windows. */
-	u32 large_sectors;		/* zero */
+/*0x15*/u32 large_sectors;		/* zero */
 /* sizeof() = 25 (0x19) bytes */
 } __attribute__ ((__packed__)) BIOS_PARAMETER_BLOCK;
 
@@ -67,7 +67,7 @@ typedef struct {
 typedef struct {
 	u8  jump[3];			/* Irrelevant (jump to boot up code).*/
 	u64 oem_id;			/* Magic "NTFS    ". */
-	BIOS_PARAMETER_BLOCK bpb;	/* See BIOS_PARAMETER_BLOCK. */
+/*0x0b*/BIOS_PARAMETER_BLOCK bpb;	/* See BIOS_PARAMETER_BLOCK. */
 	u8  unused[4];			/* zero, NTFS diskedit.exe states that
 					   this is actually:
 					    u8 physical_drive;		// 0x80

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscp.c,1.16,1.17 ntfsinfo.c,1.57,1.58

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

Changes by: cha0smaster

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

Modified Files:
	ntfscp.c ntfsinfo.c 
Log Message:
- Implement FILE_NAME attributes update in index during inode sync and enable code that set/clean sparse bit. Also add new inode state bit FileNameDirty to indicate that FILE_NAME attributes need update. At least after attribute resize we leave absolutely consist volume.
- Bugfixes to collate.c and index.c.
- Minor formating fixed to ntfscp and ntfsinfo.


Index: ntfscp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ntfscp.c	6 Apr 2005 15:47:43 -0000	1.16
+++ ntfscp.c	5 Jun 2005 14:55:09 -0000	1.17
@@ -273,7 +273,7 @@ int main (int argc, char *argv[])
 		return 1;
 
 	utils_set_locale();
-	
+
 	/* Set SIGINT handler. */
 	if (signal(SIGINT, sigint_handler) == SIG_ERR) {
 		perror("Failed to set SIGINT handler");
@@ -288,7 +288,7 @@ int main (int argc, char *argv[])
  		perror("ERROR: couldn't mount volume");
 		return 1;
 	}
-	
+
 	if ((vol->flags & VOLUME_IS_DIRTY) && (!opts.force))
 		goto umount;
 
@@ -382,7 +382,7 @@ int main (int argc, char *argv[])
 			goto close_dst;
 		}
 	}
-	
+
 	Vprintf("Old file size: %lld\n", na->data_size);
 	if (na->data_size != new_size) {
 		if (ntfs_attr_truncate(na, new_size)) {

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- ntfsinfo.c	4 Jun 2005 15:20:46 -0000	1.57
+++ ntfsinfo.c	5 Jun 2005 14:55:09 -0000	1.58
@@ -1390,9 +1390,12 @@ static void ntfs_dump_attr_index_allocat
 			printf("\tIndex name:\t\t '%s'\n",index_name);
 			free(index_name);
 		} else {
-			/* an error occured, errno holds the reason - notify the user */
-			fprintf(stderr, "ntfsinfo error: could not parse index name: %s\n",
-				strerror(errno));
+			/*
+			 * An error occured, errno holds the reason -
+			 * notify the user
+			 */
+			fprintf(stderr, "ntfsinfo error: could not parse "
+					"index name: %s\n", strerror(errno));
 		}
 	} else {
 		printf("\tIndex name:\t\t unnamed\n");

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.157,1.158 collate.c,1.2,1.3 index.c,1.2,1.3 inode.c,1.52,1.53

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

Changes by: cha0smaster

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

Modified Files:
	attrib.c collate.c index.c inode.c 
Log Message:
- Implement FILE_NAME attributes update in index during inode sync and enable code that set/clean sparse bit. Also add new inode state bit FileNameDirty to indicate that FILE_NAME attributes need update. At least after attribute resize we leave absolutely consist volume.
- Bugfixes to collate.c and index.c.
- Minor formating fixed to ntfscp and ntfsinfo.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- attrib.c	17 Feb 2005 18:01:56 -0000	1.157
+++ attrib.c	5 Jun 2005 14:55:09 -0000	1.158
@@ -3976,12 +3976,6 @@ static int ntfs_attr_make_resident(ntfs_
  * function updates sparse bit and allocates/frees space for compressed_size,
  * but doesn't change it, so caller should update it manually.
  *
- * NOTE: Code that set/clean sparse bit currently disabled, because chkdsk
- * complain if we don't update index entry's for inode to which we set sparse
- * bit. But it doesn't if attribute's runlist has lcn holes and sparse bit
- * isn't set. So until we have no API for updating index entries it's the best
- * choice.
- *
  * On success return 0 and on error return -1 with errno set to the error code.
  * The following error codes are defined:
  *	ENOMEM	- Not enough memory to complete operation.
@@ -4064,7 +4058,6 @@ retry:
 				goto put_err_out;
 			}
 		}
-#if 0
 		/* If we in the first extent, then set/clean sparse bit. */
 		if (!a->lowest_vcn) {
 			int sparse;
@@ -4130,6 +4123,13 @@ retry:
 				a->mapping_pairs_offset =
 						cpu_to_le16(le16_to_cpu(
 						a->mapping_pairs_offset) + 8);
+				/*
+				 * Set FILE_NAME dirty flag, to update
+				 * sparse bit in the index.
+				 */
+				if (na->type == AT_DATA &&
+						na->name == AT_UNNAMED)
+					NInoFileNameSetDirty(na->ni);
 			}
 			if (!sparse && (a->flags & ATTR_IS_SPARSE) &&
 					!(a->flags & ATTR_IS_COMPRESSED)) {
@@ -4144,9 +4144,15 @@ retry:
 				a->mapping_pairs_offset =
 						cpu_to_le16(le16_to_cpu(
 						a->mapping_pairs_offset) - 8);
+				/*
+				 * Set FILE_NAME dirty flag, to update
+				 * sparse bit in the index.
+				 */
+				if (na->type == AT_DATA &&
+						na->name == AT_UNNAMED)
+					NInoFileNameSetDirty(na->ni);
 			}
 		}
-#endif
 		/* Get the size for the rest of mapping pairs array. */
 		mp_size = ntfs_get_size_for_mapping_pairs(na->ni->vol, na->rl,
 								stop_vcn);
@@ -4811,6 +4817,8 @@ put_err_out:
  */
 int ntfs_attr_truncate(ntfs_attr *na, const s64 newsize)
 {
+	int ret;
+
 	if (!na || newsize < 0 ||
 			(na->ni->mft_no == FILE_MFT && na->type == AT_DATA)) {
 		Dprintf("%s(): Invalid aruments passed.\n", __FUNCTION__);
@@ -4837,9 +4845,24 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 	}
 	if (NAttrNonResident(na)) {
 		if (newsize > na->data_size)
-			return ntfs_non_resident_attr_expand(na, newsize);
+			ret = ntfs_non_resident_attr_expand(na, newsize);
+		else
+			ret = ntfs_non_resident_attr_shrink(na, newsize);
+	} else
+		ret = ntfs_resident_attr_resize(na, newsize);
+	/* Set FILE_NAME dirty flag, to update file length in the index. */
+	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
+		NInoFileNameSetDirty(na->ni);
+		na->ni->data_size = na->data_size;
+		/*
+		 * If attribute sparse or commpreseed then allocated size in
+		 * index should be euqal to compressed size, not to allocated
+		 * size.
+		 */
+		if (NAttrCompressed(na) || NAttrSparse(na))
+			na->ni->allocated_size = na->compressed_size;
 		else
-			return ntfs_non_resident_attr_shrink(na, newsize);
+			na->ni->allocated_size = na->allocated_size;
 	}
-	return ntfs_resident_attr_resize(na, newsize);
+	return ret;
 }

Index: collate.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- collate.c	4 Jun 2005 15:20:00 -0000	1.2
+++ collate.c	5 Jun 2005 14:55:09 -0000	1.3
@@ -79,7 +79,7 @@ static int ntfs_collate_file_name(ntfs_v
 	fn2 = (const FILE_NAME_ATTR *)data2;
 	rc = ntfs_names_collate(fn1->file_name, fn1->file_name_length,
 			fn2->file_name, fn2->file_name_length,
-			NTFS_COLLATION_ERROR, CASE_SENSITIVE, vol->upcase,
+			NTFS_COLLATION_ERROR, IGNORE_CASE, vol->upcase,
 			vol->upcase_len);
 	ntfs_debug("Done, returning %i.", rc);
 	return rc;

Index: index.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- index.c	4 Jun 2005 15:20:00 -0000	1.2
+++ index.c	5 Jun 2005 14:55:09 -0000	1.3
@@ -26,6 +26,7 @@
 #include "collate.h"
 #include "debug.h"
 #include "index.h"
+#include "mst.h"
 
 /**
  * ntfs_index_ctx_get - allocate and initialize a new index context
@@ -71,14 +72,15 @@ void ntfs_index_ctx_put(ntfs_index_conte
 				ntfs_attr_put_search_ctx(ictx->actx);
 		} else {
 			/* Write out index block it it's dirty. */
-			if (ictx->ia_dirty)
-				if (ntfs_attr_pwrite(ictx->ia_na,
+			if (ictx->ia_dirty) {
+				if (ntfs_attr_mst_pwrite(ictx->ia_na,
 						ictx->ia_vcn <<
-						ictx->ni->vol->cluster_size,
+						ictx->ni->vol->cluster_size, 1,
 						ictx->block_size, ictx->ia) !=
-						ictx->block_size)
+						1)
 					ntfs_error(, "Failed to write out "
 							"index block.");
+			}
 			/* Free resources. */
 			free(ictx->ia);
 			ntfs_attr_close(ictx->ia_na);
@@ -264,12 +266,13 @@ done:
 		goto err_out;
 	}
 descend_into_child_node:
+	ntfs_debug("Descend into node with VCN %lld.", vcn);
 	/* Read index allocation block. */
-	if (ntfs_attr_pread(na, vcn << vol->cluster_size_bits, ictx->block_size,
-				ia) != ictx->block_size) {
+	if (ntfs_attr_mst_pread(na, vcn << vol->cluster_size_bits, 1, 
+				ictx->block_size, ia) != 1) {
 		ntfs_error(, "Failed to read index allocation.");
 		goto err_out;
-	}	
+	}
 	/* Catch multi sector transfer fixup errors. */
 	if (!ntfs_is_indx_record(ia->magic)) {
 		ntfs_error(sb, "Index record with vcn 0x%llx is corrupt.  "
@@ -392,3 +395,4 @@ idx_err_out:
 	ntfs_error(sb, "Corrupt index.  Aborting lookup.");
 	goto err_out;
 }
+

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- inode.c	27 Jan 2005 18:31:08 -0000	1.52
+++ inode.c	5 Jun 2005 14:55:09 -0000	1.53
@@ -36,6 +36,8 @@
 #include "attrlist.h"
 #include "runlist.h"
 #include "lcnalloc.h"
+#include "index.h"
+#include "dir.h"
 
 /**
  * Internal:
@@ -123,6 +125,8 @@ ntfs_inode *ntfs_inode_open(ntfs_volume 
 	if (!(ni->mrec->flags & MFT_RECORD_IN_USE))
 		goto err_out;
 	ni->mft_no = MREF(mref);
+	ni->data_size = -1;
+	ni->allocated_size = -1;
 	ctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!ctx)
 		goto err_out;
@@ -454,6 +458,113 @@ static int ntfs_inode_sync_standard_info
 }
 
 /**
+ * ntfs_inode_sync_standard_information - update FILE_NAME attribute's
+ * @ni:		ntfs inode to update FILE_NAME attribute's
+ *
+ * Update all FILE_NAME attribute's for inode @ni in the index.
+ *
+ * Return 0 on success or -1 on error with errno set to the error code.
+ */
+static int ntfs_inode_sync_file_name(ntfs_inode *ni) {
+	ntfs_attr_search_ctx *ctx = NULL;
+	ntfs_index_context *ictx;
+	ntfs_inode *index_ni;
+	FILE_NAME_ATTR *fn;
+	int err = 0;
+
+	ctx = ntfs_attr_get_search_ctx(ni, NULL);
+	if (!ctx) {
+		err = errno;
+		Dprintf("%s(): Failed to get attribute search context.\n",
+				__FUNCTION__);
+		goto err_out;
+	}
+	/* Walk through all FILE_NAME attributes and update them. */
+	while (!ntfs_attr_lookup(AT_FILE_NAME, NULL, 0, 0, 0, NULL, 0, ctx)) {
+		fn = (FILE_NAME_ATTR *)((u8 *)ctx->attr +
+				le16_to_cpu(ctx->attr->value_offset));
+		if (MREF_LE(fn->parent_directory) == ni->mft_no) {
+			/*
+			 * WARNING: We cheater here and obtain 2 attribute
+			 * search contextes for one inode (first we obtained
+			 * above, second will be obtained inside
+			 * ntfs_index_lookup), it's acceptable for library,
+			 * but will lock kernel.
+			 */
+			index_ni = ni;
+		} else
+			index_ni = ntfs_inode_open(ni->vol,
+				le64_to_cpu(fn->parent_directory));
+		if (!index_ni) {
+			if (!err)
+				err = errno;
+			Dprintf("%s(): Failed to open inode with index.\n",
+					__FUNCTION__);
+			continue;
+		}
+		ictx = ntfs_index_ctx_get(index_ni, I30, 4);
+		if (!ictx) {
+			if (!err)
+				err = errno;
+			Dprintf("%s(): Failed to get index context.\n",
+					__FUNCTION__);
+			ntfs_inode_close(index_ni);
+			continue;
+		}
+		if (ntfs_index_lookup(fn, sizeof(FILE_NAME_ATTR), ictx)) {
+			if (!err) {
+				if (errno == ENOENT)
+					err = EIO;
+				else
+					err = errno;
+			}
+			Dprintf("%s(): Index lookup failed.\n", __FUNCTION__);
+			ntfs_index_ctx_put(ictx);
+			ntfs_inode_close(index_ni);
+			continue;
+		}
+		/* Update flags and file size. */
+		fn = (FILE_NAME_ATTR *)ictx->data;
+		if (NInoCompressed(ni))
+			fn->file_attributes |= FILE_ATTR_COMPRESSED;
+		else
+			fn->file_attributes &= ~FILE_ATTR_COMPRESSED;
+		if (NInoEncrypted(ni))
+			fn->file_attributes |= FILE_ATTR_ENCRYPTED;
+		else
+			fn->file_attributes &= ~FILE_ATTR_ENCRYPTED;
+		if (NInoSparse(ni))
+			fn->file_attributes |= FILE_ATTR_SPARSE_FILE;
+		else
+			fn->file_attributes &= ~FILE_ATTR_SPARSE_FILE;
+		if (ni->allocated_size != -1)
+			fn->allocated_size = cpu_to_sle64(ni->allocated_size);
+		if (ni->data_size != -1)
+			fn->data_size = cpu_to_sle64(ni->data_size);
+		ntfs_index_entry_mark_dirty(ictx);
+		ntfs_index_ctx_put(ictx);
+		ntfs_inode_close(index_ni);
+	}
+	/* Check for real error occured. */
+	if (errno != ENOENT) {
+		err = errno;
+		Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__);
+		goto err_out;
+	}
+	ntfs_attr_put_search_ctx(ctx);
+	if (err) {
+		errno = err;
+		return -1;
+	}
+	return 0;
+err_out:
+	if (ctx)
+		ntfs_attr_put_search_ctx(ctx);
+	errno = err;
+	return -1;
+}
+
+/**
  * ntfs_inode_sync - write the inode (and its dirty extents) to disk
  * @ni:		ntfs inode to write
  *
@@ -480,7 +591,7 @@ int ntfs_inode_sync(ntfs_inode *ni)
 		errno = EINVAL;
 		return -1;
 	}
-	
+
 	Dprintf("%s(): Entering for inode 0x%llx.\n",
 			__FUNCTION__, (long long) ni->mft_no);
 
@@ -495,6 +606,19 @@ int ntfs_inode_sync(ntfs_inode *ni)
 				__FUNCTION__);
 	}
 
+	/* Update FILE_NAME's in the index. */
+	if (ni->nr_extents != -1 && NInoFileNameTestAndClearDirty(ni) &&
+			ntfs_inode_sync_file_name(ni)) {
+		if (!err || errno == EIO) {
+			err = errno;
+			if (err != EIO)
+				err = EBUSY;
+		}
+		Dprintf("%s(): Failed to sync FILE_NAME attributes.\n",
+				__FUNCTION__);
+		NInoFileNameSetDirty(ni);
+	}
+
 	/* Write out attribute list from cache to disk. */
 	if (ni->nr_extents != -1 && NInoAttrList(ni) &&
 			NInoAttrListTestAndClearDirty(ni)) {
@@ -522,7 +646,6 @@ int ntfs_inode_sync(ntfs_inode *ni)
 						Dprintf("%s(): Attribute list "
 						"sync failed (write failed).\n",
 						 __FUNCTION__);
-
 					}
 					NInoAttrListSetDirty(ni);
 				}
@@ -574,8 +697,6 @@ int ntfs_inode_sync(ntfs_inode *ni)
 		}
 	}
 
-	// TODO: Update FILE_NAME attribute in the index.
-
 	if (!err)
 		return 0;
 	errno = err;

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs inode.h,1.11,1.12

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

Changes by: cha0smaster

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

Modified Files:
	inode.h 
Log Message:
- Implement FILE_NAME attributes update in index during inode sync and enable code that set/clean sparse bit. Also add new inode state bit FileNameDirty to indicate that FILE_NAME attributes need update. At least after attribute resize we leave absolutely consist volume.
- Bugfixes to collate.c and index.c.
- Minor formating fixed to ntfscp and ntfsinfo.


Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/inode.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- inode.h	22 Dec 2004 14:04:41 -0000	1.11
+++ inode.h	5 Jun 2005 14:55:08 -0000	1.12
@@ -45,6 +45,8 @@ typedef enum {
 	NI_Compressed,		/* 1: Inode is compressed. */
 	NI_Encrypted,		/* 1: Inode is encrypted. */
 	NI_Sparse,		/* 1: Inode is sparse. */
+	NI_FileNameDirty,	/* 1: FILE_NAME attributes need to be updated
+				      in the index. */
 } ntfs_inode_state_bits;
 
 #define  test_nino_flag(ni, flag)	   test_bit(NI_##flag, (ni)->state)
@@ -94,6 +96,17 @@ typedef enum {
 #define NInoSetSparse(ni)		  set_nino_flag(ni, Sparse)
 #define NInoClearSparse(ni)		clear_nino_flag(ni, Sparse)
 
+#define NInoFileNameDirty(ni)			\
+					  test_nino_flag(ni, FileNameDirty)
+#define NInoFileNameSetDirty(ni)		\
+					   set_nino_flag(ni, FileNameDirty)
+#define NInoFileNameClearDirty(ni)		\
+					 clear_nino_flag(ni, FileNameDirty)
+#define NInoFileNameTestAndSetDirty(ni)		\
+				  test_and_set_nino_flag(ni, FileNameDirty)
+#define NInoFileNameTestAndClearDirty(ni)	\
+				test_and_clear_nino_flag(ni, FileNameDirty)
+
 /*
  * The NTFS in-memory inode structure. It is just used as an extension to the
  * fields already provided in the VFS inode.
@@ -126,6 +139,9 @@ struct _ntfs_inode {
 
 	void *private_data;	/* Temp: for directory handling */
 	int ref_count;
+	/* Belows fields needed to update indexes. They valid if != -1. */
+	s64 data_size;
+	s64 allocated_size;
 };
 
 extern ntfs_inode *ntfs_inode_allocate(ntfs_volume *vol);

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.226,1.227

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

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
- Implement FILE_NAME attributes update in index during inode sync and enable code that set/clean sparse bit. Also add new inode state bit FileNameDirty to indicate that FILE_NAME attributes need update. At least after attribute resize we leave absolutely consist volume.
- Bugfixes to collate.c and index.c.
- Minor formating fixed to ntfscp and ntfsinfo.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- ChangeLog	4 Jun 2005 00:57:58 -0000	1.226
+++ ChangeLog	5 Jun 2005 14:55:08 -0000	1.227
@@ -153,6 +153,11 @@ xx/xx/2005 - 2.0.0-WIP
 	  ntfs_is_collation_rule_supported.  (Yura)
 	- Port index.[ch] from kernel to library. New API's: ntfs_index_lookup,
 	  ntfs_index_ctx_{get,put}, ntfs_index_entry_mark_dirty.  (Yura)
+	- Implement FILE_NAME attributes update in index during inode sync and
+	  enable code that set/clean sparse bit. Also add new inode state bit
+	  FileNameDirty to indicate that FILE_NAME attributes need update.
+	  At least after attribute resize we leave absolutely consist
+	  volume.  (Yura)
 
 04/09/2004 - 1.9.4 - Urgent bug fixes.