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

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.123,1.124 sd.c,1.10,1.11

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

Changes by: szaka

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

Modified Files:
	mkntfs.c sd.c 
Log Message:
Don't create SDS entries which aren't needed


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- mkntfs.c	18 Dec 2005 16:27:21 -0000	1.123
+++ mkntfs.c	7 Jan 2006 08:31:09 -0000	1.124
@@ -4710,7 +4710,7 @@ static BOOL mkntfs_create_root_structure
 					return FALSE;
 				init_secure_30(buf_sds_init);
 			} else {
-				buf_sds_first_size = 0x240;
+				buf_sds_first_size = 0xFC;
 				buf_sds_size = 0x40000 + buf_sds_first_size;
 				buf_sds_init = ntfs_calloc(1, buf_sds_first_size);
 				if (!buf_sds_init)

Index: sd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/sd.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sd.c	21 Oct 2005 18:05:14 -0000	1.10
+++ sd.c	7 Jan 2006 08:31:09 -0000	1.11
@@ -1025,272 +1025,6 @@ void init_secure_31(char *sd_val)
 	sid->sub_authority[1] =
 		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
 
-/*
- * security descriptor #3
- */
-	//header
-	sds = (SECURITY_DESCRIPTOR_HEADER*)((char*)sd_val + 0x80 + 0x80);
-	sds->hash = cpu_to_le32(0x0A9F9B62);
-	sds->security_id = cpu_to_le32(0x0102);
-	sds->offset = cpu_to_le64(0x0100);
-	sds->length = cpu_to_le32(0x60);
-
-	//security descriptor relative
-	sd = (SECURITY_DESCRIPTOR_RELATIVE*)((char*)sds +
-		sizeof(SECURITY_DESCRIPTOR_HEADER));
-	sd->revision = 0x01;
-	sd->alignment = 0x00;
-	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x30);
-	sd->group = cpu_to_le32(0x40);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
-
-	//acl
-	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
-	acl->revision = 0x02;
-	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x1C);
-	acl->ace_count = cpu_to_le16(0x01);
-	acl->alignment2 = 0x00;
-
-	//ace1
-	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
-	ace->type = 0x00;
-	ace->flags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE;
-	ace->size = cpu_to_le16(0x14);
-	ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
-			 FILE_LIST_DIRECTORY | FILE_WRITE_DATA |
-			 FILE_ADD_SUBDIRECTORY | FILE_READ_EA | FILE_WRITE_EA |
-			 FILE_TRAVERSE | FILE_DELETE_CHILD |
-			 FILE_READ_ATTRIBUTES;
-	ace->sid.revision = 0x01;
-	ace->sid.sub_authority_count = 0x01;
-	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
-	ace->sid.identifier_authority.value[0] = 0;
-	ace->sid.identifier_authority.value[1] = 0;
-	ace->sid.identifier_authority.value[2] = 0;
-	ace->sid.identifier_authority.value[3] = 0;
-	ace->sid.identifier_authority.value[4] = 0;
-	ace->sid.identifier_authority.value[5] = 5;
-	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
-
-	//owner sid
-	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
-	sid->revision = 0x01;
-	sid->sub_authority_count = 0x02;
-	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
-	sid->identifier_authority.value[0] = 0;
-	sid->identifier_authority.value[1] = 0;
-	sid->identifier_authority.value[2] = 0;
-	sid->identifier_authority.value[3] = 0;
-	sid->identifier_authority.value[4] = 0;
-	sid->identifier_authority.value[5] = 5;
-	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
-	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
-
-	//group sid
-	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
-	sid->revision = 0x01;
-	sid->sub_authority_count = 0x01;
-	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
-	sid->identifier_authority.value[0] = 0;
-	sid->identifier_authority.value[1] = 0;
-	sid->identifier_authority.value[2] = 0;
-	sid->identifier_authority.value[3] = 0;
-	sid->identifier_authority.value[4] = 0;
-	sid->identifier_authority.value[5] = 5;
-	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
-
-/*
- * security descriptor #4
- */
-	//header
-	sds = (SECURITY_DESCRIPTOR_HEADER*)((char*)sd_val + 0x80 + 0x80 + 0x60);
-	sds->hash = cpu_to_le32(0x0A9F9562);
-	sds->security_id = cpu_to_le32(0x0103);
-	sds->offset = cpu_to_le64(0x0160);
-	sds->length = cpu_to_le32(0x60);
-
-	//security descriptor relative
-	sd = (SECURITY_DESCRIPTOR_RELATIVE*)((char*)sds +
-		 sizeof(SECURITY_DESCRIPTOR_HEADER));
-	sd->revision = 0x01;
-	sd->alignment = 0x00;
-	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x30);
-	sd->group = cpu_to_le32(0x40);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
-
-	//acl
-	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
-	acl->revision = 0x02;
-	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x1C);
-	acl->ace_count = cpu_to_le16(0x01);
-	acl->alignment2 = 0x00;
-
-	//ace1
-	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
-	ace->type = 0x00;
-	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x14);
-	ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
-			 FILE_LIST_DIRECTORY | FILE_WRITE_DATA |
-			 FILE_ADD_SUBDIRECTORY | FILE_READ_EA | FILE_WRITE_EA |
-			 FILE_TRAVERSE | FILE_DELETE_CHILD |
-			 FILE_READ_ATTRIBUTES;
-	ace->sid.revision = 0x01;
-	ace->sid.sub_authority_count = 0x01;
-	// SECURITY_NT_SID_AUTHORITY (S-1-5)
-	ace->sid.identifier_authority.value[0] = 0;
-	ace->sid.identifier_authority.value[1] = 0;
-	ace->sid.identifier_authority.value[2] = 0;
-	ace->sid.identifier_authority.value[3] = 0;
-	ace->sid.identifier_authority.value[4] = 0;
-	ace->sid.identifier_authority.value[5] = 5;
-	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
-
-	//owner sid
-	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
-	sid->revision = 0x01;
-	sid->sub_authority_count = 0x02;
-	// SECURITY_NT_SID_AUTHORITY (S-1-5)
-	sid->identifier_authority.value[0] = 0;
-	sid->identifier_authority.value[1] = 0;
-	sid->identifier_authority.value[2] = 0;
-	sid->identifier_authority.value[3] = 0;
-	sid->identifier_authority.value[4] = 0;
-	sid->identifier_authority.value[5] = 5;
-	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
-	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
-	//group sid
-	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
-	sid->revision = 0x01;
-	sid->sub_authority_count = 0x01;
-	// SECURITY_NT_SID_AUTHORITY (S-1-5)
-	sid->identifier_authority.value[0] = 0;
-	sid->identifier_authority.value[1] = 0;
-	sid->identifier_authority.value[2] = 0;
-	sid->identifier_authority.value[3] = 0;
-	sid->identifier_authority.value[4] = 0;
-	sid->identifier_authority.value[5] = 5;
-	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
-
-/*
- * security descriptor #5
- */
-	//header
-	sds = (SECURITY_DESCRIPTOR_HEADER*)((char*)sd_val + 0x80 + 0x80 +
-		 0x60 + 0x60);
-	sds->hash = cpu_to_le32(0x453F0A2E);
-	sds->security_id = cpu_to_le32(0x0104);
-	sds->offset = cpu_to_le64(0x01C0);
-	sds->length = cpu_to_le32(0x78);
-
-	//security descriptor relative
-	sd = (SECURITY_DESCRIPTOR_RELATIVE*)((char*)sds +
-		 sizeof(SECURITY_DESCRIPTOR_HEADER));
-	sd->revision = 0x01;
-	sd->alignment = 0x00;
-	sd->control = SE_SELF_RELATIVE | SE_DACL_PRESENT;
-	sd->owner = cpu_to_le32(0x48);
-	sd->group = cpu_to_le32(0x58);
-	sd->sacl = cpu_to_le32(0x00);
-	sd->dacl = cpu_to_le32(0x14);
-
-	//acl
-	acl = (ACL*)((char*)sd + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
-	acl->revision = 0x02;
-	acl->alignment1 = 0x00;
-	acl->size = cpu_to_le16(0x34);
-	acl->ace_count = cpu_to_le16(0x02);
-	acl->alignment2 = 0x00;
-
-	//ace1
-	ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
-	ace->type = 0x00;
-	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x18);
-	ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
-			 FILE_LIST_DIRECTORY | FILE_WRITE_DATA |
-			 FILE_ADD_SUBDIRECTORY | FILE_READ_EA | FILE_WRITE_EA |
-			 FILE_TRAVERSE | FILE_DELETE_CHILD |
-			 FILE_READ_ATTRIBUTES;
-	ace->sid.revision = 0x01;
-	ace->sid.sub_authority_count = 0x02;
-	// SECURITY_NT_SID_AUTHORITY (S-1-5)
-	ace->sid.identifier_authority.value[0] = 0;
-	ace->sid.identifier_authority.value[1] = 0;
-	ace->sid.identifier_authority.value[2] = 0;
-	ace->sid.identifier_authority.value[3] = 0;
-	ace->sid.identifier_authority.value[4] = 0;
-	ace->sid.identifier_authority.value[5] = 5;
-	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
-	ace->sid.sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
-	//ace2
-	ace = (ACCESS_ALLOWED_ACE*)((char*)ace + ace->size);
-	ace->type = 0x00;
-	ace->flags = 0x00;
-	ace->size = cpu_to_le16(0x14);
-	ace->mask = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES |
-			 FILE_LIST_DIRECTORY | FILE_WRITE_DATA |
-			 FILE_ADD_SUBDIRECTORY | FILE_READ_EA | FILE_WRITE_EA |
-			 FILE_TRAVERSE | FILE_DELETE_CHILD |
-			 FILE_READ_ATTRIBUTES;
-	ace->sid.revision = 0x01;
-	ace->sid.sub_authority_count = 0x01;
-	/* SECURITY_NT_SID_AUTHORITY (S-1-5) */
-	ace->sid.identifier_authority.value[0] = 0;
-	ace->sid.identifier_authority.value[1] = 0;
-	ace->sid.identifier_authority.value[2] = 0;
-	ace->sid.identifier_authority.value[3] = 0;
-	ace->sid.identifier_authority.value[4] = 0;
-	ace->sid.identifier_authority.value[5] = 5;
-	ace->sid.sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
-
-	//owner sid
-	sid = (SID*)((char*)sd + le32_to_cpu(sd->owner));
-	sid->revision = 0x01;
-	sid->sub_authority_count = 0x02;
-	// SECURITY_NT_SID_AUTHORITY (S-1-5)
-	sid->identifier_authority.value[0] = 0;
-	sid->identifier_authority.value[1] = 0;
-	sid->identifier_authority.value[2] = 0;
-	sid->identifier_authority.value[3] = 0;
-	sid->identifier_authority.value[4] = 0;
-	sid->identifier_authority.value[5] = 5;
-	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_BUILTIN_DOMAIN_RID);
-	sid->sub_authority[1] =
-		cpu_to_le32(DOMAIN_ALIAS_RID_ADMINS);
-
-	//group sid
-	sid = (SID*)((char*)sd + le32_to_cpu(sd->group));
-	sid->revision = 0x01;
-	sid->sub_authority_count = 0x01;
-	// SECURITY_NT_SID_AUTHORITY (S-1-5)
-	sid->identifier_authority.value[0] = 0;
-	sid->identifier_authority.value[1] = 0;
-	sid->identifier_authority.value[2] = 0;
-	sid->identifier_authority.value[3] = 0;
-	sid->identifier_authority.value[4] = 0;
-	sid->identifier_authority.value[5] = 5;
-	sid->sub_authority[0] =
-		cpu_to_le32(SECURITY_LOCAL_SYSTEM_RID);
-
 	return;
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.101,1.102

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

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
ntfsinfo: dump $Secure:$SDS in verbose mode


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- ntfsinfo.c	18 Dec 2005 16:27:21 -0000	1.101
+++ ntfsinfo.c	7 Jan 2006 08:20:33 -0000	1.102
@@ -817,15 +817,15 @@ static void ntfs_dump_attr_object_id(ATT
 /**
  * ntfs_dump_acl
  *
- * given an acl, print it in a beautiful & lovley way.
+ * given an acl, print it in a beautiful & lovely way.
  */
-static void ntfs_dump_acl(const char *prefix,ACL *acl)
+static void ntfs_dump_acl(const char *prefix, ACL *acl)
 {
 	unsigned int i;
 	u16 ace_count;
 	ACCESS_ALLOWED_ACE *ace;
 
-	printf("%sRevision\t %u\n",prefix,acl->revision);
+	printf("%sRevision\t %u\n", prefix, acl->revision);
 
 	/* don't recalc le16_to_cpu every iteration (minor speedup on big-endians */
 	ace_count = le16_to_cpu(acl->ace_count);
@@ -834,7 +834,7 @@ static void ntfs_dump_acl(const char *pr
 	ace = (ACCESS_ALLOWED_ACE *)((char *)acl + 8);
 
 	/* iterate through ACE's */
-	for (i=1;i<ace_count;i++) {
+	for (i = 1; i < ace_count; i++) {
 		const char *ace_type;
 		char *sid;
 
@@ -854,12 +854,12 @@ static void ntfs_dump_acl(const char *pr
 			break;
 		}
 
-		printf("%sACE:\t\t type:%s  flags:0x%x  access:0x%x\n",prefix,
+		printf("%sACE:\t\t type:%s  flags:0x%x  access:0x%x\n", prefix,
 			ace_type, (unsigned int)le16_to_cpu(ace->flags),
 			(unsigned int)le32_to_cpu(ace->mask));
 		/* get a SID string */
 		sid = ntfs_sid_to_mbs(&ace->sid, NULL, 0);
-		printf("%s\t\t SID: %s\n",prefix,sid);
+		printf("%s\t\t SID: %s\n", prefix, sid);
 		free(sid);
 
 		/* proceed to next ACE */
@@ -867,6 +867,54 @@ static void ntfs_dump_acl(const char *pr
 	}
 }
 
+
+static void ntfs_dump_security_descriptor(SECURITY_DESCRIPTOR_ATTR *sec_desc,
+					  const char *indent)
+{
+	char *sid;
+	
+	printf("%s\tRevision:\t\t %u\n", indent, sec_desc->revision);
+
+	/* TODO: parse the flags */
+	printf("%s\tFlags:\t\t\t 0x%0x\n", indent, sec_desc->control);
+
+	sid = ntfs_sid_to_mbs((SID *)((char *)sec_desc +
+		le32_to_cpu(sec_desc->owner)), NULL, 0);
+	printf("%s\tOwner SID:\t\t %s\n", indent, sid);
+	free(sid);
+
+	sid = ntfs_sid_to_mbs((SID *)((char *)sec_desc +
+		le32_to_cpu(sec_desc->group)), NULL, 0);
+	printf("%s\tGroup SID:\t\t %s\n", indent, sid);
+	free(sid);
+
+	printf("%s\tSystem ACL:\t\t ", indent);
+	if (sec_desc->control & SE_SACL_PRESENT) {
+		if (sec_desc->control & SE_SACL_DEFAULTED) {
+			printf("defaulted");
+		}
+		printf("\n");
+		ntfs_dump_acl(indent ? "\t\t\t" : "\t\t",
+			      (ACL *)((char *)sec_desc +
+				      le32_to_cpu(sec_desc->sacl)));
+	} else {
+		printf("missing\n");
+	}
+
+	printf("%s\tDiscretionary ACL:\t ", indent);
+	if (sec_desc->control & SE_DACL_PRESENT) {
+		if (sec_desc->control & SE_SACL_DEFAULTED) {
+			printf("defaulted");
+		}
+		printf("\n");
+		ntfs_dump_acl(indent ? "\t\t\t" : "\t\t",
+			      (ACL *)((char *)sec_desc +
+				      le32_to_cpu(sec_desc->dacl)));
+	} else {
+		printf("missing\n");
+	}
+}
+
 /**
  * ntfs_dump_security_descriptor()
  *
@@ -875,7 +923,6 @@ static void ntfs_dump_acl(const char *pr
 static void ntfs_dump_attr_security_descriptor(ATTR_RECORD *attr, ntfs_volume *vol)
 {
 	SECURITY_DESCRIPTOR_ATTR *sec_desc_attr;
-	char *sid;
 
 	printf("Dumping attribute $SECURITY_DESCRIPTOR (0x50)\n");
 
@@ -914,46 +961,10 @@ static void ntfs_dump_attr_security_desc
 				le16_to_cpu(attr->value_offset));
 	}
 
-	printf("\tRevision:\t\t %u\n",sec_desc_attr->revision);
-
-	/* TODO: parse the flags */
-	printf("\tFlags:\t\t\t 0x%0x\n",sec_desc_attr->control);
-
-	sid = ntfs_sid_to_mbs((SID *)((char *)sec_desc_attr +
-		le32_to_cpu(sec_desc_attr->owner)), NULL, 0);
-	printf("\tOwner SID:\t\t %s\n",sid);
-	free(sid);
-
-	sid = ntfs_sid_to_mbs((SID *)((char *)sec_desc_attr +
-		le32_to_cpu(sec_desc_attr->group)), NULL, 0);
-	printf("\tGroup SID:\t\t %s\n",sid);
-	free(sid);
-
-	printf("\tSystem ACL:\t\t ");
-	if (sec_desc_attr->control & SE_SACL_PRESENT) {
-		if (sec_desc_attr->control & SE_SACL_DEFAULTED) {
-			printf("defaulted");
-		}
-		printf("\n");
-		ntfs_dump_acl("\t\t",(ACL *)((char *)sec_desc_attr +
-			le32_to_cpu(sec_desc_attr->sacl)));
-	} else {
-		printf("missing\n");
-	}
-
-	printf("\tDiscretionary ACL:\t\t ");
-	if (sec_desc_attr->control & SE_DACL_PRESENT) {
-		if (sec_desc_attr->control & SE_SACL_DEFAULTED) {
-			printf("Defaulted");
-		}
-		printf("\n");
-		ntfs_dump_acl("\t\t",(ACL *)((char *)sec_desc_attr +
-			le32_to_cpu(sec_desc_attr->dacl)));
-	} else {
-		printf("missing\n");
-	}
-
-	if (attr->non_resident) free(sec_desc_attr);
+	ntfs_dump_security_descriptor(sec_desc_attr, "");
+	
+	if (attr->non_resident) 
+		free(sec_desc_attr);
 }
 
 /**
@@ -1037,13 +1048,86 @@ static void ntfs_dump_attr_volume_inform
 			vol_information->flags & (0xFFFF - VOLUME_FLAGS_MASK));
 }
 
+static ntfschar NTFS_DATA_SDS[5] = { const_cpu_to_le16('$'),
+	const_cpu_to_le16('S'), const_cpu_to_le16('D'), 
+	const_cpu_to_le16('S'), const_cpu_to_le16('\0') };
+
+static void ntfs_dump_sds_entry(SECURITY_DESCRIPTOR_HEADER *sds)
+{
+	SECURITY_DESCRIPTOR_RELATIVE *sd;
+	
+	ntfs_log_verbose("\t\tHash:\t\t\t 0x%08x\n", le32_to_cpu(sds->hash));
+	ntfs_log_verbose("\t\tSecurity id:\t\t %u\n",
+			 le32_to_cpu(sds->security_id));
+	ntfs_log_verbose("\t\tOffset:\t\t\t %llu\n", le64_to_cpu(sds->offset));
+	ntfs_log_verbose("\t\tLength:\t\t\t %u\n", le32_to_cpu(sds->length));
+	
+	sd = (SECURITY_DESCRIPTOR_RELATIVE *)((char *)sds +
+		sizeof(SECURITY_DESCRIPTOR_HEADER));
+	
+	ntfs_dump_security_descriptor(sd, "\t");
+}
+	
+static void ntfs_dump_sds(ATTR_RECORD *attr, ntfs_inode *ni)
+{
+	SECURITY_DESCRIPTOR_HEADER *sds, *sd;
+	ntfs_attr *na;
+	ntfschar *name;
+	int name_len;
+	u64 inode;
+	
+	inode = ni->mft_no;
+	if (ni->nr_extents < 0)
+		inode = ni->base_ni->mft_no;
+	if (FILE_Secure != inode)
+		return;
+	
+	name_len = le16_to_cpu(attr->name_length);
+	if (!name_len)
+		return;
+	
+	name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
+	if (!ntfs_names_are_equal(NTFS_DATA_SDS, sizeof(NTFS_DATA_SDS) / 2 - 1,
+				  name, name_len, 0, NULL, 0))
+		return;
+	
+	na = ntfs_attr_open(ni, AT_DATA, name, name_len);
+	if (!na) {
+		ntfs_log_perror("ntfs_attr_open failed");
+		return;
+	}
+	sds = malloc(na->data_size);
+	if (!sds) {
+		ntfs_log_perror("malloc failed");
+		return;
+	}
+	if (ntfs_attr_pread(na, 0, na->data_size, sds) != na->data_size) {
+		ntfs_log_perror("ntfs_attr_pread failed");
+		free(sds);
+		return;
+	}
+	ntfs_attr_close(na);
+	
+	sd = sds;
+	
+	while (sd->length && sd->length != 32 && sd->hash) {
+		ntfs_dump_sds_entry(sd);
+		sd = (SECURITY_DESCRIPTOR_HEADER *)((char *)sd +
+				(cpu_to_le32(sd->length + 0x0F) &
+				 ~cpu_to_le32(0x0F)));
+	}
+	
+	free(sds);
+}
 /**
  * ntfs_dump_data_attr()
  *
  * dump some info about the data attribute
  */
-static void ntfs_dump_attr_data(ATTR_RECORD *attr, ntfs_volume *vol)
+static void ntfs_dump_attr_data(ATTR_RECORD *attr, ntfs_inode *ni)
 {
+	ntfs_volume *vol = ni->vol;
+	
 	printf("Dumping attribute $DATA (0x80) related info\n");
 
 	/* Dump stream name */
@@ -1112,6 +1196,9 @@ static void ntfs_dump_attr_data(ATTR_REC
 		/* TODO: parse the flags */
 		printf("\tResidence Flags:\t 0x%02hhx\n", attr->resident_flags);
 	}
+	
+	if (opts.verbose)
+		ntfs_dump_sds(attr, ni);
 }
 
 typedef enum {
@@ -2036,7 +2123,7 @@ static void ntfs_dump_file_attributes(nt
 			ntfs_dump_attr_volume_information(ctx->attr);
 			break;
 		case AT_DATA:
-			ntfs_dump_attr_data(ctx->attr, inode->vol);
+			ntfs_dump_attr_data(ctx->attr, inode);
 			break;
 		case AT_INDEX_ROOT:
 			ntfs_dump_attr_index_root(ctx->attr, inode);

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.346,1.347

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
ntfsinfo: dump $Secure:$SDS in verbose mode


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -p -r1.346 -r1.347
--- ChangeLog	3 Dec 2005 18:04:44 -0000	1.346
+++ ChangeLog	7 Jan 2006 08:20:33 -0000	1.347
@@ -93,6 +93,7 @@ xx/xx/2005 - 1.12.2-WIP
 	  in the /$Extend/$Quota:$Q index root attributes.  (Szaka)
 	- ntfsmount: Add FreeBSD support.  (Yura)
 	- ntfsmount: Fix bug with moving non-empty directories.  (Yura)
+	- ntfsinfo: dump $Secure:$SDS in verbose mode.  (Szaka)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.8.in,1.29,1.30

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

Changes by: szaka

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

Modified Files:
	ntfsresize.8.in 
Log Message:
Fix more formatting broken by somebody's "cleanup"


Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ntfsresize.8.in	7 Dec 2005 21:04:37 -0000	1.29
+++ ntfsresize.8.in	7 Jan 2006 06:26:43 -0000	1.30
@@ -123,9 +123,11 @@ factors it might be unable to shrink ver
 size. Although the integrity of your data should be never in risk,
 it's still strongly recommended to make a test run by using the
 \fB\-\-no\-action\fR option before real resizing.
+
 Practically the smallest shrunken size generally is
 at around "used space" + (20\-200 MB). Please also take into account
 that Windows might need about 50\-100 MB free space left to boot safely.
+
 This option never causes any changes to the filesystem, the partition is
 opened read\-only.
 .TP

[Linux-NTFS-cvs] join

[Artem D. <lin...@tu...>]

Hi all !
I'd like to join the team. I've got a lot of time to explore NTFS & 
linux kernel. Have some experience in windows (mfc), unix programming, 
C.  What can I start from to help the project development ?

-- 
Rgds, Artem.

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs support.h,1.7,1.8

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

On Sun, 18 Dec 2005, Yura Pakhuchiy wrote:
> Changes by: cha0smaster
> 
> Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22692/include/ntfs
> 
> Modified Files:
> 	support.h 
> Log Message:
> * Add NTFS_DEV_LIST define. Use it everywhere instead of lin...@li....
> * Replace all ntfs_log_trace where we ask to send mail to us with ntfs_log_error

Doesn't log error by default go to stderr?  If so it should never be used 
inside libntfs.  Libraries never should output anything at all...

Best regards,

	Anton
-- 
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net
WWW: http://linux-ntfs.sf.net/ & http://www-stu.christs.cam.ac.uk/~aia21/

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.122,1.123 ntfsdecrypt.c,1.26,1.27 ntfsinfo.c,1.100,1.101 ntfsresize.c,1.105,1.106 utils.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-serv22692/ntfsprogs

Modified Files:
	mkntfs.c ntfsdecrypt.c ntfsinfo.c ntfsresize.c utils.c 
Log Message:
* Add NTFS_DEV_LIST define. Use it everywhere instead of lin...@li....
* Replace all ntfs_log_trace where we ask to send mail to us with ntfs_log_error


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- mkntfs.c	21 Nov 2005 21:25:14 -0000	1.122
+++ mkntfs.c	18 Dec 2005 16:27:21 -0000	1.123
@@ -2478,11 +2478,12 @@ static int upgrade_to_large_index(MFT_RE
 				NTFS_BLOCK_SIZE + 1);
 	} else {
 		ia_val->usa_count = cpu_to_le16(1);
-		ntfs_log_quiet("Sector size is bigger than index block size. Setting "
-			"usa_count to 1. If Windows\nchkdsk reports this as "
-			"corruption, please email lin...@li...\n"
-			"stating that you saw this message and that the file "
-			"system created was corrupt.\nThank you.");
+		ntfs_log_error("Sector size is bigger than index block size. "
+				"Setting usa_count to 1. If Windows chkdsk "
+				"reports this as corruption, please email %s "
+				"stating that you saw this message and that "
+				"the filesystem created was corrupt.  "
+				"Thank you.", NTFS_DEV_LIST);
 	}
 	/* Set USN to 1. */
 	*(u16*)((char*)ia_val + le16_to_cpu(ia_val->usa_ofs)) =

Index: ntfsdecrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ntfsdecrypt.c	26 Nov 2005 23:53:22 -0000	1.26
+++ ntfsdecrypt.c	18 Dec 2005 16:27:21 -0000	1.27
@@ -1032,10 +1032,9 @@ static ntfs_fek *ntfs_fek_import_from_ra
 		else
 			ntfs_log_error("Unknown crypto algorithm 0x%x\n",
 					le32_to_cpu(fek->alg_id));
-		ntfs_log_error(".  Please email linux-ntfs-dev@lists."
-				"sourceforge.net and say that you saw this "
+		ntfs_log_error(".  Please email %s and say that you saw this "
 				"message.  We will then try to implement "
-				"support for this algorithm.\n");
+				"support for this algorithm.\n", NTFS_DEV_LIST);
 		err = EOPNOTSUPP;
 		goto out;
 	}

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- ntfsinfo.c	21 Nov 2005 21:25:15 -0000	1.100
+++ ntfsinfo.c	18 Dec 2005 16:27:21 -0000	1.101
@@ -1871,8 +1871,8 @@ static void ntfs_hex_dump(void *buf,unsi
 static void ntfs_dump_attr_unknown(ATTR_RECORD *attr)
 {
 	printf("Dumping unknown attribute type 0x%X.\n"
-		"--Please report this to lin...@li...--\n",
-		(unsigned int)le32_to_cpu(attr->type));
+		"--Please report this to %s--\n",
+		(unsigned int)le32_to_cpu(attr->type), NTFS_DEV_LIST);
 
 	printf("\tResident size:\t\t %u\n",(unsigned int)le32_to_cpu(attr->length));
 

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- ntfsresize.c	27 Nov 2005 11:51:10 -0000	1.105
+++ ntfsresize.c	18 Dec 2005 16:27:21 -0000	1.106
@@ -2039,11 +2039,11 @@ static int check_bad_sectors(ntfs_volume
 
 	if (NInoAttrList(ctx->ntfs_ino))
 		err_exit("Hopelessly many bad sectors! Please report to "
-			 "lin...@li...\n");
+			 "%s\n", NTFS_DEV_LIST);
 
 	if (!ctx->attr->non_resident)
 		err_exit("Resident attribute in $BadClust! Please report to "
-			 "lin...@li...\n");
+			 "%s\n", NTFS_DEV_LIST);
 
 	if (!(rl = ntfs_mapping_pairs_decompress(vol, ctx->attr, NULL)))
 		perr_exit("Decompressing $BadClust:$Bad mapping pairs failed");

Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- utils.c	1 Dec 2005 20:44:18 -0000	1.60
+++ utils.c	18 Dec 2005 16:27:21 -0000	1.61
@@ -72,7 +72,7 @@
 #include "version.h"
 #include "logging.h"
 
-const char *ntfs_bugs = "Developers' email address: lin...@li...\n";
+const char *ntfs_bugs = "Developers' email address: "NTFS_DEV_LIST"\n";
 const char *ntfs_home = "Linux NTFS homepage: http://www.linux-ntfs.org\n";
 const char *ntfs_gpl = "This program is free software, released under the GNU "
 	"General Public License\nand you are welcome to redistribute it under "

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.201,1.202 dir.c,1.49,1.50 mft.c,1.43,1.44

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

Changes by: cha0smaster

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

Modified Files:
	attrib.c dir.c mft.c 
Log Message:
* Add NTFS_DEV_LIST define. Use it everywhere instead of lin...@li....
* Replace all ntfs_log_trace where we ask to send mail to us with ntfs_log_error


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- attrib.c	4 Dec 2005 22:42:51 -0000	1.201
+++ attrib.c	18 Dec 2005 16:27:20 -0000	1.202
@@ -1220,9 +1220,9 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 				 * @cur_vcn, because we missed it during
 				 * instantiating of the hole.
 				 */
-				ntfs_log_trace("BUG! Failed to find run after "
+				ntfs_log_error("BUG! Failed to find run after "
 						"instantiating. Please report "
-						"to the lin...@li....\n");
+						"to the %s.\n", NTFS_DEV_LIST);
 				errno = EIO;
 				goto err_out;
 			}
@@ -1231,9 +1231,9 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 				rl++;
 			/* Now LCN shoudn't be less than 0. */
 			if (rl->lcn < 0) {
-				ntfs_log_trace("BUG! LCN is lesser than 0. Please "
-						"report to the "
-						"lin...@li....\n");
+				ntfs_log_error("BUG! LCN is lesser than 0. "
+						"Please report to the %s.\n",
+						NTFS_DEV_LIST);
 				errno = EIO;
 				goto err_out;
 			}
@@ -3969,9 +3969,9 @@ static int ntfs_attr_make_resident(ntfs_
 		 * Bug, because ntfs_attr_record_resize should not fail (we
 		 * already checked that attribute fits MFT record).
 		 */
-		ntfs_log_trace("BUG! Failed to resize attribute record. Please "
-				"report to the lin...@li....  "
-				"Aborting...\n");
+		ntfs_log_error("BUG! Failed to resize attribute record. "
+				"Please report to the %s.  Aborting...\n",
+				NTFS_DEV_LIST);
 		errno = EIO;
 		return -1;
 	}
@@ -4327,11 +4327,12 @@ retry:
 			if (ntfs_attr_record_resize(m, a,
 					le16_to_cpu(a->mapping_pairs_offset) +
 					mp_size)) {
-				ntfs_log_trace("BUG! Ran out of space in mft record. "
-						"Please run chkdsk and if that "
-						"doesn't find any errors please "
-						"report you saw this message to "
-						"lin...@li....\n");
+				ntfs_log_error("BUG! Ran out of space in mft "
+						"record. Please run chkdsk and "
+						"if that doesn't find any "
+						"errors please report you saw "
+						"this message to %s.\n",
+						NTFS_DEV_LIST);
 				err = EIO;
 				goto put_err_out;
 			}
@@ -4357,11 +4358,10 @@ retry:
 			finished_build = TRUE;
 		if (!finished_build && errno != ENOSPC) {
 			err = errno;
-			ntfs_log_trace("BUG!  Mapping pairs build failed.  "
+			ntfs_log_error("BUG!  Mapping pairs build failed.  "
 					"Please run chkdsk and if that doesn't "
 					"find any errors please report you saw "
-					"this message to "
-					"lin...@li....\n");
+					"this message to %s.\n", NTFS_DEV_LIST);
 			goto put_err_out;
 		}
 		a->highest_vcn = cpu_to_sle64(stop_vcn - 1);
@@ -4452,10 +4452,10 @@ retry:
 			stop_vcn, &stop_vcn);
 		if (err < 0 && errno != ENOSPC) {
 			err = errno;
-			ntfs_log_trace("BUG!  Mapping pairs build failed.  Please "
-					"run chkdsk and if that doesn't find "
-					"any errors please report you saw this "
-					"message to lin...@li....\n");
+			ntfs_log_error("BUG!  Mapping pairs build failed.  "
+					"Please run chkdsk and if that doesn't "
+					"find any errors please report you saw "
+					"this message to %s.\n", NTFS_DEV_LIST);
 			if (ntfs_mft_record_free(na->ni->vol, ni))
 				ntfs_log_trace("Couldn't free MFT record.\n");
 			goto put_err_out;

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- dir.c	4 Dec 2005 22:42:51 -0000	1.49
+++ dir.c	18 Dec 2005 16:27:21 -0000	1.50
@@ -193,12 +193,12 @@ found_it:
 				IGNORE_CASE, vol->upcase, vol->upcase_len)) {
 			/* Only one case insensitive matching name allowed. */
 			if (mref) {
-				ntfs_log_debug("Found already cached mft reference "
-						"in phase 1. Please run "
-						"chkdsk and if that doesn't "
-						"find any errors please report "
-						"you saw this message to "
-						"lin...@li....\n");
+				ntfs_log_error("Found already cached mft "
+						"reference in phase 1. Please "
+						"run chkdsk and if that doesn't"
+						" find any errors please report"
+						" you saw this message to %s\n",
+						NTFS_DEV_LIST);
 				goto put_err_out;
 			}
 			mref = le64_to_cpu(ie->indexed_file);
@@ -386,12 +386,12 @@ found_it2:
 				IGNORE_CASE, vol->upcase, vol->upcase_len)) {
 			/* Only one case insensitive matching name allowed. */
 			if (mref) {
-				ntfs_log_debug("Found already cached mft reference "
-						"in phase 2. Please run "
-						"chkdsk and if that doesn't "
-						"find any errors please report "
-						"you saw this message to "
-						"lin...@li....\n");
+				ntfs_log_error("Found already cached mft "
+						"reference in phase 2. Please "
+						"run chkdsk and if that doesn't"
+						" find any errors please report"
+						" you saw this message to %s\n",
+						NTFS_DEV_LIST);
 				goto close_err_out;
 			}
 			mref = le64_to_cpu(ie->indexed_file);

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- mft.c	4 Dec 2005 22:42:51 -0000	1.43
+++ mft.c	18 Dec 2005 16:27:21 -0000	1.44
@@ -315,13 +315,12 @@ int ntfs_mft_record_layout(const ntfs_vo
 				NTFS_BLOCK_SIZE + 1);
 	else {
 		mrec->usa_count = cpu_to_le16(1);
-		ntfs_log_debug("Sector size is bigger than MFT record size.  "
-				"Setting usa_count to 1.  If Windows\n");
-		ntfs_log_debug("chkdsk reports this as corruption, please email "
-				"lin...@li...\n");
-		ntfs_log_debug("stating that you saw this message and that the "
-				"file system created was corrupt.\n");
-		ntfs_log_debug("Thank you.\n");
+		ntfs_log_error("Sector size is bigger than MFT record size.  "
+				"Setting usa_count to 1.  If Windows chkdsk "
+				"reports this as corruption, please email %s "
+				"stating that you saw this message and that "
+				"the file system created was corrupt.  "
+				"Thank you.\n", NTFS_DEV_LIST);
 	}
 	/* Set the update sequence number to 1. */
 	*(u16*)((u8*)mrec + le16_to_cpu(mrec->usa_ofs)) = cpu_to_le16(1);

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs support.h,1.7,1.8

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

Changes by: cha0smaster

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

Modified Files:
	support.h 
Log Message:
* Add NTFS_DEV_LIST define. Use it everywhere instead of lin...@li....
* Replace all ntfs_log_trace where we ask to send mail to us with ntfs_log_error


Index: support.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/support.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- support.h	21 Oct 2005 18:05:13 -0000	1.7
+++ support.h	18 Dec 2005 16:27:20 -0000	1.8
@@ -31,6 +31,11 @@
 #endif
 
 /*
+ * Our mailing list. Use this define to prevent typos in email address.
+ */
+#define NTFS_DEV_LIST	"lin...@li..."
+
+/*
  * Generic macro to convert pointers to values for comparison purposes.
  */
 #ifndef p2n

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.8.in,1.22,1.23

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

Changes by: szaka

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

Modified Files:
	ntfsclone.8.in 
Log Message:
Restore more formatting, etc issues broken by white space, etc cleanups


Index: ntfsclone.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.8.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ntfsclone.8.in	22 Nov 2005 00:17:23 -0000	1.22
+++ ntfsclone.8.in	7 Dec 2005 21:52:46 -0000	1.23
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2004 Per Olofsson.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCLONE 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSCLONE 8 "2005\-12\-08" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsclone \- Efficiently clone, image, restore or rescue an NTFS
 .SH SYNOPSIS
@@ -31,11 +31,13 @@ copies only the used data. Unused disk s
 sparse file), encoded with control codes (saving in special image format),
 left unchanged (cloning to a disk/partition) or
 filled with zeros (cloning to standard output).
+
 .B ntfsclone
 can be useful to make backups, an exact snapshot of an NTFS filesystem
 and restore it later on, or for developers to test NTFS read/write
 functionality, troubleshoot/investigate users' issues using the clone
 without the risk of destroying the original filesystem.
+
 The clone, if not using the special image format, is an exact copy of the
 original NTFS filesystem from sector to sector thus it can be also mounted
 just like the original NTFS filesystem.
@@ -60,22 +62,24 @@ cp, gzip, gunzip, bzip2, bunzip2, cat, e
 The only main Linux filesystem
 having support for efficient sparse file handling is XFS by the
 XFS_IOC_GETBMAPX
-.BR ioctl .
+.BR ioctl (2) .
 However none of the common utilities supports it.
 This means when you tar, cp, gzip, bzip2, etc a large sparse file
 they will always read the entire file, even if you use the "sparse support"
 options.
-.B bzip2
+
+.BR bzip2 (1)
 compresses large sparse files much better than
-.B gzip
+.BR gzip (1)
 but it does so
 also much slower. Moreover neither of them handles large sparse
 files efficiently during uncompression from disk space usage point
 of view.
+
 At present the most efficient way, both speed and space\-wise, to
 compress and uncompress large sparse files by common tools
 is using
-.B tar
+.BR tar (1)
 with the options
 .B \-S
 (handle sparse files "efficiently") and
@@ -100,6 +104,7 @@ filesystem images over the network and s
 replacement for Ghost or Partition Image if it is combined with other
 tools. The downside is that you can't mount the image directly, you
 need to restore it first.
+
 To save an image using the special image format, use the
 .B \-s
 or the
@@ -122,9 +127,11 @@ or
 and the clone still will be
 mountable. In this case all non\-metadata file content will be lost and
 reading them back will result always zeros.
+
 The metadata\-only image can be compressed very
 well, usually to not more than 1\-3 MB thus it's relatively easy to transfer
 for investigation, troubleshooting.
+
 In this mode of ntfsclone,
 .B NONE
 of the user's data is saved, including the resident user's data
@@ -132,6 +139,7 @@ embedded into metadata. All is filled wi
 Moreover all the file timestamps, deleted and unused spaces inside
 the metadata are filled with zeros. Thus this mode is inappropriate
 for example for forensic analyses.
+
 Please note, filenames are not wiped out. They might contain
 sensitive information, so think twice before sending such an
 image to anybody.
@@ -142,12 +150,12 @@ accepts.  Nearly all options have two eq
 preceded by
 .B \-
 and the long name is preceded by
-.BR \-\- .
+.B \-\- .
 Any single letter options, that don't take an argument, can be combined into a
 single command, e.g.
 .B \-fv
 is equivalent to
-.BR "\-f \-v" .
+.B "\-f \-v" .
 Long named options can be abbreviated to any unique prefix of their name.
 .TP
 \fB\-o\fR, \fB\-\-output\fR FILE
@@ -268,7 +276,7 @@ Pack NTFS metadata for NTFS experts
 .B tar \-cjSf ntfsmeta.img.tar.bz2 ntfsmeta.img
 .sp
 .RE
-.SH BUGS
+.SH KNOWN ISSUES
 There are no known problems with
 .BR ntfsclone .
 If you find a bug please send an email describing the problem to the
@@ -287,8 +295,8 @@ XFS, JFS and ext3 don't have this proble
 .hy
 .SH AUTHORS
 .B ntfsclone
-was written by Szabolcs Szakacsits and Anton Altaparmakov, with contributions
-from Per Olofsson.
+was written by Szabolcs Szakacsits with contributions from Per Olofsson 
+(special image format support) and Anton Altaparmakov.
 .SH AVAILABILITY
 .B ntfsclone
 is part of the

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.8.in,1.28,1.29

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

Changes by: szaka

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

Modified Files:
	ntfsresize.8.in 
Log Message:
Fix --info option description which got broken by a white space cleanup


Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntfsresize.8.in	22 Nov 2005 00:17:23 -0000	1.28
+++ ntfsresize.8.in	7 Dec 2005 21:04:37 -0000	1.29
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSRESIZE 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSRESIZE 8 "2005\-12\-08" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsresize \- resize an NTFS filesystem without data loss
 .SH SYNOPSIS
@@ -122,9 +122,7 @@ smaller size than what you got by this o
 factors it might be unable to shrink very close to this theoretical
 size. Although the integrity of your data should be never in risk,
 it's still strongly recommended to make a test run by using the
-.TP
-\fB\-n\fR, \fB\-\-no\-action\fR
-option before real resizing.
+\fB\-\-no\-action\fR option before real resizing.
 Practically the smallest shrunken size generally is
 at around "used space" + (20\-200 MB). Please also take into account
 that Windows might need about 50\-100 MB free space left to boot safely.

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.200,1.201 collate.c,1.14,1.15 dir.c,1.48,1.49 index.c,1.23,1.24 logfile.c,1.15,1.16 mft.c,1.42,1.43 runlist.c,1.66,1.67 tree.c,1.9,1.10 unix_io.c,1.8,1.9 win32_io.c,1.44,1.45

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

Changes by: flatcap

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

Modified Files:
	attrib.c collate.c dir.c index.c logfile.c mft.c runlist.c 
	tree.c unix_io.c win32_io.c 
Log Message:
The addition of one hundred and forty-five linefeeds.  Thanks Yura!


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- attrib.c	26 Nov 2005 01:08:12 -0000	1.200
+++ attrib.c	4 Dec 2005 22:42:51 -0000	1.201
@@ -1204,7 +1204,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 				if (ntfs_cluster_free_from_rl(vol, rlc)) {
 					ntfs_log_trace("Failed to free just "
 						"allocated clusters. Leaving "
-						"inconstant metadata. Run chkdsk");
+						"inconstant metadata. Run chkdsk\n");
 				}
 				errno = eo;
 				goto err_out;

Index: collate.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- collate.c	2 Nov 2005 18:06:48 -0000	1.14
+++ collate.c	4 Dec 2005 22:42:51 -0000	1.15
@@ -59,7 +59,7 @@ static int ntfs_collate_binary(ntfs_volu
 		else
 			rc = 1;
 	}
-	ntfs_log_trace("Done, returning %i.", rc);
+	ntfs_log_trace("Done, returning %i.\n", rc);
 	return rc;
 }
 
@@ -84,7 +84,7 @@ static int ntfs_collate_ntofs_ulong(ntfs
 
 	ntfs_log_trace("Entering.\n");
 	if (data1_len != data2_len || data1_len != 4) {
-		ntfs_log_error("data1_len or/and data2_len not equal to 4.");
+		ntfs_log_error("data1_len or/and data2_len not equal to 4.\n");
 		return NTFS_COLLATION_ERROR;
 	}
 	d1 = le32_to_cpup(data1);
@@ -172,7 +172,7 @@ int ntfs_collate(ntfs_volume *vol, COLLA
 
 	ntfs_log_trace("Entering.\n");
 	if (!vol || !data1 || !data2 || data1_len < 0 || data2_len < 0) {
-		ntfs_log_error("Invalid arguments passed.");
+		ntfs_log_error("Invalid arguments passed.\n");
 		return NTFS_COLLATION_ERROR;
 	}
 	/*

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- dir.c	3 Dec 2005 18:04:45 -0000	1.48
+++ dir.c	4 Dec 2005 22:42:51 -0000	1.49
@@ -1113,13 +1113,13 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	ntfs_log_trace("Entering.\n");
 	/* Sanity checks. */
 	if (!dir_ni || !name || !name_len) {
-		ntfs_log_error("Invalid arguments.");
+		ntfs_log_error("Invalid arguments.\n");
 		return NULL;
 	}
 	/* Allocate MFT record for new file. */
 	ni = ntfs_mft_record_alloc(dir_ni->vol, NULL);
 	if (!ni) {
-		ntfs_log_error("Failed to allocate new MFT record.");
+		ntfs_log_error("Failed to allocate new MFT record.\n");
 		return NULL;
 	}
 	/*
@@ -1130,7 +1130,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	si = calloc(1, si_len);
 	if (!si) {
 		err = errno;
-		ntfs_log_error("Not enough memory.");
+		ntfs_log_error("Not enough memory.\n");
 		goto err_out;
 	}
 	si->creation_time = utc2ntfs(ni->creation_time);
@@ -1145,7 +1145,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	if (ntfs_attr_add(ni, AT_STANDARD_INFORMATION, AT_UNNAMED, 0,
 			(u8*)si, si_len)) {
 		err = errno;
-		ntfs_log_error("Failed to add STANDARD_INFORMATION attribute.");
+		ntfs_log_error("Failed to add STANDARD_INFORMATION attribute.\n");
 		goto err_out;
 	}
 	if (S_ISDIR(type)) {
@@ -1159,7 +1159,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
 		ir = calloc(1, ir_len);
 		if (!ir) {
 			err = errno;
-			ntfs_log_error("Not enough memory.");
+			ntfs_log_error("Not enough memory.\n");
 			goto err_out;
 		}
 		ir->type = AT_FILE_NAME;
@@ -1183,7 +1183,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
 		if (ntfs_attr_add(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4, (u8*)ir, ir_len)) {
 			err = errno;
 			free(ir);
-			ntfs_log_error("Failed to add INDEX_ROOT attribute.");
+			ntfs_log_error("Failed to add INDEX_ROOT attribute.\n");
 			goto err_out;
 		}
 	} else {
@@ -1237,7 +1237,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
 		if (ntfs_attr_add(ni, AT_DATA, AT_UNNAMED, 0, (u8*)data,
 				data_len)) {
 			err = errno;
-			ntfs_log_error("Failed to add DATA attribute.");
+			ntfs_log_error("Failed to add DATA attribute.\n");
 			goto err_out;
 		}
 		if (data)
@@ -1248,7 +1248,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	fn = calloc(1, fn_len);
 	if (!fn) {
 		err = errno;
-		ntfs_log_error("Not enough memory.");
+		ntfs_log_error("Not enough memory.\n");
 		goto err_out;
 	}
 	fn->parent_directory = MK_LE_MREF(dir_ni->mft_no,
@@ -1267,14 +1267,14 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	/* Add FILE_NAME attribute to inode. */
 	if (ntfs_attr_add(ni, AT_FILE_NAME, AT_UNNAMED, 0, (u8*)fn, fn_len)) {
 		err = errno;
-		ntfs_log_error("Failed to add FILE_NAME attribute.");
+		ntfs_log_error("Failed to add FILE_NAME attribute.\n");
 		goto err_out;
 	}
 	/* Add FILE_NAME attribute to index. */
 	if (ntfs_index_add_filename(dir_ni, fn, MK_MREF(ni->mft_no,
 			le16_to_cpu(ni->mrec->sequence_number)))) {
 		err = errno;
-		ntfs_log_error("Failed to add entry to the index.");
+		ntfs_log_error("Failed to add entry to the index.\n");
 		goto err_out;
 	}
 	/* Set hard links count and directory flag. */
@@ -1291,7 +1291,7 @@ err_out:
 	ntfs_log_trace("Failed.\n");
 	if (ntfs_mft_record_free(ni->vol, ni))
 		ntfs_log_error("Failed to free MFT record.  "
-				"Leaving inconsistent metadata. Run chkdsk.");
+				"Leaving inconsistent metadata. Run chkdsk.\n");
 	free(fn);
 	free(si);
 	errno = err;
@@ -1307,7 +1307,7 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_
 {
 	if (type != S_IFREG && type != S_IFDIR && type != S_IFIFO &&
 			type != S_IFSOCK) {
-		ntfs_log_error("Invalid arguments.");
+		ntfs_log_error("Invalid arguments.\n");
 		return NULL;
 	}
 	return __ntfs_create(dir_ni, name, name_len, type, 0, NULL, 0);
@@ -1317,7 +1317,7 @@ ntfs_inode *ntfs_create_device(ntfs_inod
 		dev_t type, dev_t dev)
 {
 	if (type != S_IFCHR && type != S_IFBLK) {
-		ntfs_log_error("Invalid arguments.");
+		ntfs_log_error("Invalid arguments.\n");
 		return NULL;
 	}
 	return __ntfs_create(dir_ni, name, name_len, type, dev, NULL, 0);
@@ -1327,7 +1327,7 @@ ntfs_inode *ntfs_create_symlink(ntfs_ino
 		ntfschar *target, u8 target_len)
 {
 	if (!target || !target_len) {
-		ntfs_log_error("Invalid arguments.");
+		ntfs_log_error("Invalid arguments.\n");
 		return NULL;
 	}
 	return __ntfs_create(dir_ni, name, name_len, S_IFLNK, 0,
@@ -1357,7 +1357,7 @@ int ntfs_delete(ntfs_inode *ni, ntfs_ino
 
 	ntfs_log_trace("Entering.\n");
 	if (!ni || !dir_ni || !name || !name_len) {
-		ntfs_log_error("Invalid arguments.");
+		ntfs_log_error("Invalid arguments.\n");
 		errno = EINVAL;
 		goto err_out;
 	}
@@ -1429,7 +1429,7 @@ search:
 
 		na = ntfs_attr_open(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4);
 		if (!na) {
-			ntfs_log_error("Corrupt directory or library bug.");
+			ntfs_log_error("Corrupt directory or library bug.\n");
 			errno = EIO;
 			goto err_out;
 		}
@@ -1445,7 +1445,7 @@ search:
 				(fn->file_name_type == FILE_NAME_WIN32 ||
 				fn->file_name_type == FILE_NAME_DOS)))) {
 			ntfs_attr_close(na);
-			ntfs_log_error("Directory is not empty.");
+			ntfs_log_error("Directory is not empty.\n");
 			errno = ENOTEMPTY;
 			goto err_out;
 		}
@@ -1504,13 +1504,13 @@ search:
 			if (!rl) {
 				err = errno;
 				ntfs_log_error("Failed to decompress runlist.  "
-						"Leaving inconsistent metadata.");
+						"Leaving inconsistent metadata.\n");
 				continue;
 			}
 			if (ntfs_cluster_free_from_rl(ni->vol, rl)) {
 				err = errno;
 				ntfs_log_error("Failed to free clusters.  "
-						"Leaving inconsistent metadata.");
+						"Leaving inconsistent metadata.\n");
 				continue;
 			}
 			free(rl);
@@ -1519,19 +1519,19 @@ search:
 	if (errno != ENOENT) {
 		err = errno;
 		ntfs_log_error("Attribute enumeration failed.  "
-				"Probably leaving inconsistent metadata.");
+				"Probably leaving inconsistent metadata.\n");
 	}
 	/* All extents should be attached after attribute walk. */
 	while (ni->nr_extents)
 		if (ntfs_mft_record_free(ni->vol, *(ni->extent_nis))) {
 			err = errno;
 			ntfs_log_error("Failed to free extent MFT record.  "
-					"Leaving inconsistent metadata.");
+					"Leaving inconsistent metadata.\n");
 		}
 	if (ntfs_mft_record_free(ni->vol, ni)) {
 		err = errno;
 		ntfs_log_error("Failed to free base MFT record.  "
-				"Leaving inconsistent metadata.");
+				"Leaving inconsistent metadata.\n");
 	}
 	ni = NULL;
 out:
@@ -1576,7 +1576,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
 	ntfs_log_trace("Entering.\n");
 	if (!ni || !dir_ni || !name || !name_len) {
 		err = errno;
-		ntfs_log_error("Invalid arguments.");
+		ntfs_log_error("Invalid arguments.\n");
 		goto err_out;
 	}
 	/* Create FILE_NAME attribute. */
@@ -1584,7 +1584,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
 	fn = calloc(1, fn_len);
 	if (!fn) {
 		err = errno;
-		ntfs_log_error("Not enough memory.");
+		ntfs_log_error("Not enough memory.\n");
 		goto err_out;
 	}
 	fn->parent_directory = MK_LE_MREF(dir_ni->mft_no,
@@ -1605,7 +1605,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
 	if (ntfs_index_add_filename(dir_ni, fn, MK_MREF(ni->mft_no,
 			le16_to_cpu(ni->mrec->sequence_number)))) {
 		err = errno;
-		ntfs_log_error("Failed to add entry to the index.");
+		ntfs_log_error("Failed to add entry to the index.\n");
 		goto err_out;
 	}
 	/* Add FILE_NAME attribute to inode. */
@@ -1613,7 +1613,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
 		ntfs_index_context *ictx;
 
 		err = errno;
-		ntfs_log_error("Failed to add FILE_NAME attribute.");
+		ntfs_log_error("Failed to add FILE_NAME attribute.\n");
 		/* Try to remove just added attribute from index. */
 		ictx = ntfs_index_ctx_get(dir_ni, NTFS_INDEX_I30, 4);
 		if (!ictx)
@@ -1637,7 +1637,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
 	ntfs_log_trace("Done.\n");
 	return 0;
 rollback_failed:
-	ntfs_log_error("Rollback failed. Leaving inconsistent metadata.");
+	ntfs_log_error("Rollback failed. Leaving inconsistent metadata.\n");
 err_out:
 	ntfs_log_error("Failed.\n");
 	free(fn);

Index: index.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- index.c	2 Nov 2005 18:06:49 -0000	1.23
+++ index.c	4 Dec 2005 22:42:51 -0000	1.24
@@ -95,7 +95,7 @@ void ntfs_index_ctx_put(ntfs_index_conte
 						1, ictx->block_size,
 						ictx->ia) != 1)
 					ntfs_log_error("Failed to write out "
-							"index block.");
+							"index block.\n");
 			}
 			/* Free resources. */
 			free(ictx->ia);
@@ -127,7 +127,7 @@ void ntfs_index_ctx_reinit(ntfs_index_co
 						1, ictx->block_size,
 						ictx->ia) != 1)
 					ntfs_log_error("Failed to write out "
-							"index block.");
+							"index block.\n");
 			}
 			/* Free resources. */
 			free(ictx->ia);
@@ -206,7 +206,7 @@ int ntfs_index_lookup(const void *key, c
 	if (err) {
 		if (errno == ENOENT) {
 			ntfs_log_error("Index root attribute missing in inode "
-					"0x%llx.", ni->mft_no);
+					"0x%llx.\n", ni->mft_no);
 			err = EIO;
 		} else
 			err = errno;
@@ -222,7 +222,7 @@ int ntfs_index_lookup(const void *key, c
 	cr = ir->collation_rule;
 	if (!ntfs_is_collation_rule_supported(cr)) {
 		ntfs_log_error("Index uses unsupported collation rule 0x%x.  "
-				"Aborting lookup.", (unsigned)le32_to_cpu(cr));
+				"Aborting lookup.\n", (unsigned)le32_to_cpu(cr));
 		err = EOPNOTSUPP;
 		goto err_out;
 	}
@@ -272,7 +272,7 @@ done:
 				le16_to_cpu(ie->key_length));
 		if (rc == NTFS_COLLATION_ERROR) {
 			ntfs_log_error("Collation error. Probably filename "
-					"contain invalid characters.");
+					"contain invalid characters.\n");
 			err = ERANGE;
 			goto err_out;
 		}
@@ -312,14 +312,14 @@ done:
 	if (!na) {
 		ntfs_log_error("No index allocation attribute but index entry "
 				"requires one.  Inode 0x%llx is corrupt or "
-				"library bug.", ni->mft_no);
+				"library bug.\n", ni->mft_no);
 		goto err_out;
 	}
 	/* Allocate memory to store index block. */
 	ia = malloc(ictx->block_size);
 	if (!ia) {
 		ntfs_log_error("Not enough memory to allocate buffer for index"
-				" allocation.");
+				" allocation.\n");
 		err = ENOMEM;
 		goto err_out;
 	}
@@ -328,20 +328,20 @@ descend_into_child_node:
 	/* Read index allocation block. */
 	if (ntfs_attr_mst_pread(na, vcn << vol->cluster_size_bits, 1,
 				ictx->block_size, ia) != 1) {
-		ntfs_log_error("Failed to read index allocation.");
+		ntfs_log_error("Failed to read index allocation.\n");
 		goto err_out;
 	}
 	/* Catch multi sector transfer fixup errors. */
 	if (!ntfs_is_indx_record(ia->magic)) {
 		ntfs_log_error("Index record with vcn 0x%llx is corrupt.  "
-				"Corrupt inode 0x%llx.  Run chkdsk.",
+				"Corrupt inode 0x%llx.  Run chkdsk.\n",
 				(long long)vcn, ni->mft_no);
 		goto err_out;
 	}
 	if (sle64_to_cpu(ia->index_block_vcn) != vcn) {
 		ntfs_log_error("Actual VCN (0x%llx) of index buffer is "
 				"different from expected VCN (0x%llx).  Inode "
-				"0x%llx is corrupt or driver bug.",
+				"0x%llx is corrupt or driver bug.\n",
 				(unsigned long long)
 				sle64_to_cpu(ia->index_block_vcn),
 				(unsigned long long)vcn, ni->mft_no);
@@ -351,7 +351,7 @@ descend_into_child_node:
 		ntfs_log_error("Index buffer (VCN 0x%llx) of inode 0x%llx has "
 				"a size (%u) differing from the index "
 				"specified size (%u).  Inode is corrupt or "
-				"driver bug.", (unsigned long long)vcn,
+				"driver bug.\n", (unsigned long long)vcn,
 				ni->mft_no, (unsigned)
 				le32_to_cpu(ia->index.allocated_size) + 0x18,
 				(unsigned)ictx->block_size);
@@ -360,7 +360,7 @@ descend_into_child_node:
 	index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
 	if (index_end > (u8*)ia + ictx->block_size) {
 		ntfs_log_error("Size of index buffer (VCN 0x%llx) of inode "
-				"0x%llx exceeds maximum size.",
+				"0x%llx exceeds maximum size.\n",
 				(unsigned long long)vcn, ni->mft_no);
 		goto err_out;
 	}
@@ -378,7 +378,7 @@ descend_into_child_node:
 				sizeof(INDEX_ENTRY_HEADER) > index_end ||
 				(u8*)ie + le16_to_cpu(ie->length) > index_end) {
 			ntfs_log_error("Index entry out of bounds in inode "
-					"0x%llx.", ni->mft_no);
+					"0x%llx.\n", ni->mft_no);
 			goto err_out;
 		}
 		/*
@@ -406,7 +406,7 @@ ia_done:
 				le16_to_cpu(ie->key_length));
 		if (rc == NTFS_COLLATION_ERROR) {
 			ntfs_log_error("Collation error. Probably filename "
-					"contain invalid characters.");
+					"contain invalid characters.\n");
 			err = ERANGE;
 			goto err_out;
 		}
@@ -436,14 +436,14 @@ ia_done:
 	}
 	if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
 		ntfs_log_error("Index entry with child node found in a leaf "
-				"node in inode 0x%llx.", ni->mft_no);
+				"node in inode 0x%llx.\n", ni->mft_no);
 		goto err_out;
 	}
 	/* Child node present, descend into it. */
 	vcn = sle64_to_cpup((sle64*)((u8*)ie + le16_to_cpu(ie->length) - 8));
 	if (vcn >= 0)
 		goto descend_into_child_node;
-	ntfs_log_error("Negative child node vcn in inode 0x%llx.", ni->mft_no);
+	ntfs_log_error("Negative child node vcn in inode 0x%llx.\n", ni->mft_no);
 err_out:
 	if (na)
 		ntfs_attr_close(na);
@@ -455,7 +455,7 @@ err_out:
 	errno = err;
 	return -1;
 idx_err_out:
-	ntfs_log_error("Corrupt index.  Aborting lookup.");
+	ntfs_log_error("Corrupt index.  Aborting lookup.\n");
 	goto err_out;
 }
 
@@ -479,7 +479,7 @@ int ntfs_index_add_filename(ntfs_inode *
 
 	ntfs_log_trace("Entering.\n");
 	if (!ni || !fn) {
-		ntfs_log_error("Invalid arguments.");
+		ntfs_log_error("Invalid arguments.\n");
 		errno = EINVAL;
 		return -1;
 	}
@@ -493,12 +493,12 @@ retry:
 	/* Find place where insert new entry. */
 	if (!ntfs_index_lookup(fn, fn_size, ictx)) {
 		err = EEXIST;
-		ntfs_log_error("Index already have such entry.");
+		ntfs_log_error("Index already have such entry.\n");
 		goto err_out;
 	}
 	if (errno != ENOENT) {
 		err = errno;
-		ntfs_log_error("Failed to find place where to insert new entry.");
+		ntfs_log_error("Failed to find place where to insert new entry.\n");
 		goto err_out;
 	}
 	/* Some setup. */
@@ -520,14 +520,14 @@ retry:
 					ictx->name_len);
 			if (!na) {
 				err = errno;
-				ntfs_log_error("Failed to open INDEX_ROOT.");
+				ntfs_log_error("Failed to open INDEX_ROOT.\n");
 				goto err_out;
 			}
 			if (ntfs_attr_truncate(na, allocated_size + offsetof(
 					INDEX_ROOT, index))) {
 				err = EOPNOTSUPP;
 				ntfs_attr_close(na);
-				ntfs_log_error("Failed to truncate INDEX_ROOT.");
+				ntfs_log_error("Failed to truncate INDEX_ROOT.\n");
 				goto err_out;
 			}
 			ntfs_attr_close(na);
@@ -590,7 +590,7 @@ int ntfs_index_rm(ntfs_index_context *ic
 	ntfs_log_trace("Entering.\n");
 	if (!ictx || (!ictx->ia && !ictx->ir) ||
 			ictx->entry->flags & INDEX_ENTRY_END) {
-		ntfs_log_error("Invalid arguments.");
+		ntfs_log_error("Invalid arguments.\n");
 		err = EINVAL;
 		goto err_out;
 	}
@@ -630,7 +630,7 @@ int ntfs_index_rm(ntfs_index_context *ic
 		if (!na) {
 			err = errno;
 			ntfs_log_error("Failed to open INDEX_ROOT attribute.  "
-					"Leaving inconsistent metadata.");
+					"Leaving inconsistent metadata.\n");
 			goto err_out;
 		}
 		if (ntfs_attr_truncate(na, new_index_length + offsetof(
@@ -638,7 +638,7 @@ int ntfs_index_rm(ntfs_index_context *ic
 			err = errno;
 			ntfs_log_error("Failed to truncate INDEX_ROOT "
 					"attribute.  Leaving inconsistent "
-					"metadata.");
+					"metadata.\n");
 			goto err_out;
 		}
 		ntfs_attr_close(na);

Index: logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- logfile.c	2 Nov 2005 18:06:49 -0000	1.15
+++ logfile.c	4 Dec 2005 22:42:51 -0000	1.16
@@ -70,7 +70,7 @@ static BOOL ntfs_check_restart_page_head
 			logfile_system_page_size &
 			(logfile_system_page_size - 1) ||
 			logfile_log_page_size & (logfile_log_page_size - 1)) {
-		ntfs_log_error("$LogFile uses unsupported page size.");
+		ntfs_log_error("$LogFile uses unsupported page size.\n");
 		return FALSE;
 	}
 	/*
@@ -79,7 +79,7 @@ static BOOL ntfs_check_restart_page_head
 	 */
 	if (pos && pos != logfile_system_page_size) {
 		ntfs_log_error("Found restart area in incorrect "
-				"position in $LogFile.");
+				"position in $LogFile.\n");
 		return FALSE;
 	}
 	/* We only know how to handle version 1.1. */
@@ -87,7 +87,7 @@ static BOOL ntfs_check_restart_page_head
 			sle16_to_cpu(rp->minor_ver) != 1) {
 		ntfs_log_error("$LogFile version %i.%i is not "
 				"supported.  (This driver supports version "
-				"1.1 only.)", (int)sle16_to_cpu(rp->major_ver),
+				"1.1 only.)\n", (int)sle16_to_cpu(rp->major_ver),
 				(int)sle16_to_cpu(rp->minor_ver));
 		return FALSE;
 	}
@@ -103,7 +103,7 @@ static BOOL ntfs_check_restart_page_head
 	usa_count = 1 + (logfile_system_page_size >> NTFS_BLOCK_SIZE_BITS);
 	if (usa_count != le16_to_cpu(rp->usa_count)) {
 		ntfs_log_error("$LogFile restart page specifies "
-				"inconsistent update sequence array count.");
+				"inconsistent update sequence array count.\n");
 		return FALSE;
 	}
 	/* Verify the position of the update sequence array. */
@@ -112,7 +112,7 @@ static BOOL ntfs_check_restart_page_head
 	if (usa_ofs < sizeof(RESTART_PAGE_HEADER) ||
 			usa_end > NTFS_BLOCK_SIZE - sizeof(u16)) {
 		ntfs_log_error("$LogFile restart page specifies "
-				"inconsistent update sequence array offset.");
+				"inconsistent update sequence array offset.\n");
 		return FALSE;
 	}
 skip_usa_checks:
@@ -127,7 +127,7 @@ skip_usa_checks:
 			ra_ofs < sizeof(RESTART_PAGE_HEADER)) ||
 			ra_ofs > logfile_system_page_size) {
 		ntfs_log_error("$LogFile restart page specifies "
-				"inconsistent restart area offset.");
+				"inconsistent restart area offset.\n");
 		return FALSE;
 	}
 	/*
@@ -136,7 +136,7 @@ skip_usa_checks:
 	 */
 	if (!ntfs_is_chkd_record(rp->magic) && sle64_to_cpu(rp->chkdsk_lsn)) {
 		ntfs_log_error("$LogFile restart page is not modified "
-				"by chkdsk but a chkdsk LSN is specified.");
+				"by chkdsk but a chkdsk LSN is specified.\n");
 		return FALSE;
 	}
 	ntfs_log_trace("Done.\n");
@@ -174,7 +174,7 @@ static BOOL ntfs_check_restart_area(REST
 	if (ra_ofs + offsetof(RESTART_AREA, file_size) >
 			NTFS_BLOCK_SIZE - sizeof(u16)) {
 		ntfs_log_error("$LogFile restart area specifies "
-				"inconsistent file offset.");
+				"inconsistent file offset.\n");
 		return FALSE;
 	}
 	/*
@@ -189,7 +189,7 @@ static BOOL ntfs_check_restart_area(REST
 			ra_ofs + ca_ofs > (u16)(NTFS_BLOCK_SIZE -
 			sizeof(u16))) {
 		ntfs_log_error("$LogFile restart area specifies "
-				"inconsistent client array offset.");
+				"inconsistent client array offset.\n");
 		return FALSE;
 	}
 	/*
@@ -206,7 +206,7 @@ static BOOL ntfs_check_restart_area(REST
 		ntfs_log_error("$LogFile restart area is out of bounds "
 				"of the system page size specified by the "
 				"restart page header and/or the specified "
-				"restart area length is inconsistent.");
+				"restart area length is inconsistent.\n");
 		return FALSE;
 	}
 	/*
@@ -221,7 +221,7 @@ static BOOL ntfs_check_restart_area(REST
 			le16_to_cpu(ra->client_in_use_list) >=
 			le16_to_cpu(ra->log_clients))) {
 		ntfs_log_error("$LogFile restart area specifies "
-				"overflowing client free and/or in use lists.");
+				"overflowing client free and/or in use lists.\n");
 		return FALSE;
 	}
 	/*
@@ -236,21 +236,21 @@ static BOOL ntfs_check_restart_area(REST
 	}
 	if (le32_to_cpu(ra->seq_number_bits) != (u32)(67 - fs_bits)) {
 		ntfs_log_error("$LogFile restart area specifies "
-				"inconsistent sequence number bits.");
+				"inconsistent sequence number bits.\n");
 		return FALSE;
 	}
 	/* The log record header length must be a multiple of 8. */
 	if (((le16_to_cpu(ra->log_record_header_length) + 7) & ~7) !=
 			le16_to_cpu(ra->log_record_header_length)) {
 		ntfs_log_error("$LogFile restart area specifies "
-				"inconsistent log record header length.");
+				"inconsistent log record header length.\n");
 		return FALSE;
 	}
 	/* Ditto for the log page data offset. */
 	if (((le16_to_cpu(ra->log_page_data_offset) + 7) & ~7) !=
 			le16_to_cpu(ra->log_page_data_offset)) {
 		ntfs_log_error("$LogFile restart area specifies "
-				"inconsistent log page data offset.");
+				"inconsistent log page data offset.\n");
 		return FALSE;
 	}
 	ntfs_log_trace("Done.\n");
@@ -316,7 +316,7 @@ check_list:
 	ntfs_log_trace("Done.\n");
 	return TRUE;
 err_out:
-	ntfs_log_error("$LogFile log client array is corrupt.");
+	ntfs_log_error("$LogFile log client array is corrupt.\n");
 	return FALSE;
 }
 
@@ -374,7 +374,7 @@ static int ntfs_check_and_load_restart_p
 	trp = malloc(le32_to_cpu(rp->system_page_size));
 	if (!trp) {
 		ntfs_log_error("Failed to allocate memory for $LogFile "
-				"restart page buffer.");
+				"restart page buffer.\n");
 		return ENOMEM;
 	}
 	/*
@@ -389,7 +389,7 @@ static int ntfs_check_and_load_restart_p
 			le32_to_cpu(rp->system_page_size)) {
 		err = errno;
 		ntfs_log_error("Failed to read whole restart page into the "
-				"buffer.");
+				"buffer.\n");
 		if (err != ENOMEM)
 			err = EIO;
 		goto err_out;
@@ -410,7 +410,7 @@ static int ntfs_check_and_load_restart_p
 				le16_to_cpu(ra->restart_area_length) >
 				NTFS_BLOCK_SIZE - (int)sizeof(u16)) {
 			ntfs_log_error("Multi sector transfer error "
-				   "detected in $LogFile restart page.");
+				   "detected in $LogFile restart page.\n");
 			err = EINVAL;
 			goto err_out;
 		}
@@ -496,13 +496,13 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n
 	 */
 	if (size < log_page_size * 2 || (size - log_page_size * 2) >>
 			log_page_bits < MinLogRecordPages) {
-		ntfs_log_error("$LogFile is too small.");
+		ntfs_log_error("$LogFile is too small.\n");
 		return FALSE;
 	}
 	/* Allocate memory for restart page. */
 	kaddr = malloc(NTFS_BLOCK_SIZE);
 	if (!kaddr) {
-		ntfs_log_error("Not enough memory.");
+		ntfs_log_error("Not enough memory.\n");
 		return FALSE;
 	}
 	/*
@@ -520,7 +520,7 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n
 		if (ntfs_attr_pread(log_na, pos, NTFS_BLOCK_SIZE, kaddr) !=
 				NTFS_BLOCK_SIZE) {
 			ntfs_log_error("Failed to read first NTFS_BLOCK_SIZE "
-					"bytes of potential restart page.");
+					"bytes of potential restart page.\n");
 			goto err_out;
 		}
 
@@ -593,9 +593,9 @@ is_empty:
 	}
 	if (!rstr1_ph) {
 		if (rstr2_ph)
-			ntfs_log_error("BUG: rstr2_ph isn't NULL!");
+			ntfs_log_error("BUG: rstr2_ph isn't NULL!\n");
 		ntfs_log_error("Did not find any restart pages in "
-			   "$LogFile and it was not empty.");
+			   "$LogFile and it was not empty.\n");
 		return FALSE;
 	}
 	/* If both restart pages were found, use the more recent one. */
@@ -662,7 +662,7 @@ BOOL ntfs_is_logfile_clean(ntfs_attr *lo
 		return TRUE;
 	}
 	if (!rp) {
-		ntfs_log_error("Restart page header is NULL.");
+		ntfs_log_error("Restart page header is NULL.\n");
 		return FALSE;
 	}
 	if (!ntfs_is_rstr_record(rp->magic) &&
@@ -670,7 +670,7 @@ BOOL ntfs_is_logfile_clean(ntfs_attr *lo
 		ntfs_log_error("Restart page buffer is invalid.  This is "
 			   "probably a bug in that the $LogFile should "
 			   "have been consistency checked before calling "
-			   "this function.");
+			   "this function.\n");
 		return FALSE;
 	}
 

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- mft.c	7 Nov 2005 20:37:08 -0000	1.42
+++ mft.c	4 Dec 2005 22:42:51 -0000	1.43
@@ -481,7 +481,7 @@ static int ntfs_mft_bitmap_find_free_rec
 		ll = ntfs_attr_pread(mftbmp_na, ofs, size, buf);
 		if (ll < 0) {
 			ntfs_log_error("Failed to read mft bitmap "
-					"attribute, aborting.");
+					"attribute, aborting.\n");
 			free(buf);
 			return -1;
 		}
@@ -582,7 +582,7 @@ static int ntfs_mft_bitmap_extend_alloca
 			vol->cluster_size_bits);
 	if (!rl || !rl->length || rl->lcn < 0) {
 		ntfs_log_error("Failed to determine last allocated "
-				"cluster of mft bitmap attribute.");
+				"cluster of mft bitmap attribute.\n");
 		if (rl)
 			errno = EIO;
 		return -1;
@@ -595,7 +595,7 @@ static int ntfs_mft_bitmap_extend_alloca
 	 */
 	ret = (int)ntfs_attr_pread(lcnbmp_na, lcn >> 3, 1, &b);
 	if (ret < 0) {
-		ntfs_log_error("Failed to read from lcn bitmap.");
+		ntfs_log_error("Failed to read from lcn bitmap.\n");
 		return -1;
 	}
 	ntfs_log_debug("Read %i byte%s.\n", ret, ret == 1 ? "" : "s");
@@ -606,7 +606,7 @@ static int ntfs_mft_bitmap_extend_alloca
 		ret = (int)ntfs_attr_pwrite(lcnbmp_na, lcn >> 3, 1, &b);
 		if (ret < 1) {
 			ntfs_log_error("Failed to write to lcn "
-					"bitmap.");
+					"bitmap.\n");
 			if (!ret)
 				errno = EIO;
 			return -1;
@@ -621,17 +621,17 @@ static int ntfs_mft_bitmap_extend_alloca
 		rl2 = ntfs_cluster_alloc(vol, rl[1].vcn, 1, lcn, DATA_ZONE);
 		if (!rl2) {
 			ntfs_log_error("Failed to allocate a cluster for "
-					"the mft bitmap.");
+					"the mft bitmap.\n");
 			return -1;
 		}
 		rl = ntfs_runlists_merge(mftbmp_na->rl, rl2);
 		if (!rl) {
 			ret = errno;
 			ntfs_log_error("Failed to merge runlists for mft "
-					"bitmap.");
+					"bitmap.\n");
 			if (ntfs_cluster_free_from_rl(vol, rl2))
 				ntfs_log_error("Failed to deallocate "
-						"cluster.%s", es);
+						"cluster.%s\n", es);
 			free(rl2);
 			errno = ret;
 			return -1;
@@ -649,13 +649,13 @@ static int ntfs_mft_bitmap_extend_alloca
 	 */
 	ctx = ntfs_attr_get_search_ctx(mftbmp_na->ni, NULL);
 	if (!ctx) {
-		ntfs_log_error("Failed to get search context.");
+		ntfs_log_error("Failed to get search context.\n");
 		goto undo_alloc;
 	}
 	if (ntfs_attr_lookup(mftbmp_na->type, mftbmp_na->name,
 			mftbmp_na->name_len, 0, rl[1].vcn, NULL, 0, ctx)) {
 		ntfs_log_error("Failed to find last attribute extent of "
-				"mft bitmap attribute.");
+				"mft bitmap attribute.\n");
 		goto undo_alloc;
 	}
 	m = ctx->mrec;
@@ -664,7 +664,7 @@ static int ntfs_mft_bitmap_extend_alloca
 	rl2 = ntfs_attr_find_vcn(mftbmp_na, ll);
 	if (!rl2 || !rl2->length) {
 		ntfs_log_error("Failed to determine previous last "
-				"allocated cluster of mft bitmap attribute.");
+				"allocated cluster of mft bitmap attribute.\n");
 		if (rl2)
 			errno = EIO;
 		goto undo_alloc;
@@ -673,7 +673,7 @@ static int ntfs_mft_bitmap_extend_alloca
 	mp_size = ntfs_get_size_for_mapping_pairs(vol, rl2, ll);
 	if (mp_size <= 0) {
 		ntfs_log_error("Get size for mapping pairs failed for "
-				"mft bitmap attribute extent.");
+				"mft bitmap attribute extent.\n");
 		goto undo_alloc;
 	}
 	/* Expand the attribute record if necessary. */
@@ -682,14 +682,14 @@ static int ntfs_mft_bitmap_extend_alloca
 			le16_to_cpu(a->mapping_pairs_offset))) {
 		if (errno != ENOSPC) {
 			ntfs_log_error("Failed to resize attribute "
-					"record for mft bitmap attribute.");
+					"record for mft bitmap attribute.\n");
 			goto undo_alloc;
 		}
 		// TODO: Deal with this by moving this extent to a new mft
 		// record or by starting a new extent in a new mft record.
 		ntfs_log_error("Not enough space in this mft record to "
 				"accommodate extended mft bitmap attribute "
-				"extent.  Cannot handle this yet.");
+				"extent.  Cannot handle this yet.\n");
 		errno = EOPNOTSUPP;
 		goto undo_alloc;
 	}
@@ -699,7 +699,7 @@ static int ntfs_mft_bitmap_extend_alloca
 			le16_to_cpu(a->mapping_pairs_offset), mp_size, rl2, ll,
 			NULL)) {
 		ntfs_log_error("Failed to build mapping pairs array for "
-				"mft bitmap attribute.");
+				"mft bitmap attribute.\n");
 		errno = EIO;
 		goto undo_alloc;
 	}
@@ -719,7 +719,7 @@ static int ntfs_mft_bitmap_extend_alloca
 		if (ntfs_attr_lookup(mftbmp_na->type, mftbmp_na->name,
 				mftbmp_na->name_len, 0, 0, NULL, 0, ctx)) {
 			ntfs_log_error("Failed to find first attribute "
-					"extent of mft bitmap attribute.");
+					"extent of mft bitmap attribute.\n");
 			goto restore_undo_alloc;
 		}
 		a = ctx->attr;
@@ -736,7 +736,7 @@ restore_undo_alloc:
 	if (ntfs_attr_lookup(mftbmp_na->type, mftbmp_na->name,
 			mftbmp_na->name_len, 0, rl[1].vcn, NULL, 0, ctx)) {
 		ntfs_log_error("Failed to find last attribute extent of "
-				"mft bitmap attribute.%s", es);
+				"mft bitmap attribute.%s\n", es);
 		ntfs_attr_put_search_ctx(ctx);
 		mftbmp_na->allocated_size += vol->cluster_size;
 		/*
@@ -764,18 +764,17 @@ undo_alloc:
 	}
 	/* Deallocate the cluster. */
 	if (ntfs_bitmap_clear_bit(lcnbmp_na, lcn))
-		ntfs_log_error("Failed to free cluster.%s", es);
+		ntfs_log_error("Failed to free cluster.%s\n", es);
 	if (status.mp_rebuilt) {
 		if (ntfs_mapping_pairs_build(vol, (u8*)a +
 				le16_to_cpu(a->mapping_pairs_offset),
 				old_alen - le16_to_cpu(a->mapping_pairs_offset),
 				rl2, ll, NULL))
 			ntfs_log_error("Failed to restore mapping "
-					"pairs array.%s", es);
+					"pairs array.%s\n", es);
 		if (ntfs_attr_record_resize(m, a, old_alen))
 			ntfs_log_error("Failed to restore attribute "
-					"record.%s",
-					es);
+					"record.%s\n", es);
 		ntfs_inode_mark_dirty(ctx->ntfs_ino);
 	}
 	if (ctx)
@@ -807,13 +806,13 @@ static int ntfs_mft_bitmap_extend_initia
 	mftbmp_na = vol->mftbmp_na;
 	ctx = ntfs_attr_get_search_ctx(mftbmp_na->ni, NULL);
 	if (!ctx) {
-		ntfs_log_error("Failed to get search context.");
+		ntfs_log_error("Failed to get search context.\n");
 		return -1;
 	}
 	if (ntfs_attr_lookup(mftbmp_na->type, mftbmp_na->name,
 			mftbmp_na->name_len, 0, 0, NULL, 0, ctx)) {
 		ntfs_log_error("Failed to find first attribute extent of "
-				"mft bitmap attribute.");
+				"mft bitmap attribute.\n");
 		err = errno;
 		goto put_err_out;
 	}
@@ -836,20 +835,20 @@ static int ntfs_mft_bitmap_extend_initia
 		ntfs_log_debug("Wrote eight initialized bytes to mft bitmap.\n");
 		return 0;
 	}
-	ntfs_log_error("Failed to write to mft bitmap.");
+	ntfs_log_error("Failed to write to mft bitmap.\n");
 	err = errno;
 	if (ll >= 0)
 		err = EIO;
 	/* Try to recover from the error. */
 	ctx = ntfs_attr_get_search_ctx(mftbmp_na->ni, NULL);
 	if (!ctx) {
-		ntfs_log_error("Failed to get search context.%s", es);
+		ntfs_log_error("Failed to get search context.%s\n", es);
 		goto err_out;
 	}
 	if (ntfs_attr_lookup(mftbmp_na->type, mftbmp_na->name,
 			mftbmp_na->name_len, 0, 0, NULL, 0, ctx)) {
 		ntfs_log_error("Failed to find first attribute extent of "
-				"mft bitmap attribute.%s", es);
+				"mft bitmap attribute.%s\n", es);
 put_err_out:
 		ntfs_attr_put_search_ctx(ctx);
 		goto err_out;
@@ -911,7 +910,7 @@ static int ntfs_mft_data_extend_allocati
 			(mft_na->allocated_size - 1) >> vol->cluster_size_bits);
 	if (!rl || !rl->length || rl->lcn < 0) {
 		ntfs_log_error("Failed to determine last allocated "
-				"cluster of mft data attribute.");
+				"cluster of mft data attribute.\n");
 		if (rl)
 			errno = EIO;
 		return -1;
@@ -936,7 +935,7 @@ static int ntfs_mft_data_extend_allocati
 		if (errno != ENOSPC || nr == min_nr) {
 			ntfs_log_error("Failed to allocate the minimal "
 					"number of clusters (%lli) for the "
-					"mft data attribute.", (long long)nr);
+					"mft data attribute.\n", (long long)nr);
 			return -1;
 		}
 		/*
@@ -952,10 +951,10 @@ static int ntfs_mft_data_extend_allocati
 	if (!rl) {
 		err = errno;
 		ntfs_log_error("Failed to merge runlists for mft data "
-				"attribute.");
+				"attribute.\n");
 		if (ntfs_cluster_free_from_rl(vol, rl2))
 			ntfs_log_error("Failed to deallocate clusters "
-					"from the mft data attribute.%s", es);
+					"from the mft data attribute.%s\n", es);
 		free(rl2);
 		errno = err;
 		return -1;
@@ -968,13 +967,13 @@ static int ntfs_mft_data_extend_allocati
 	/* Update the attribute record as well. */
 	ctx = ntfs_attr_get_search_ctx(mft_na->ni, NULL);
 	if (!ctx) {
-		ntfs_log_error("Failed to get search context.");
+		ntfs_log_error("Failed to get search context.\n");
 		goto undo_alloc;
 	}
 	if (ntfs_attr_lookup(mft_na->type, mft_na->name, mft_na->name_len, 0,
 			rl[1].vcn, NULL, 0, ctx)) {
 		ntfs_log_error("Failed to find last attribute extent of "
-				"mft data attribute.");
+				"mft data attribute.\n");
 		goto undo_alloc;
 	}
 	m = ctx->mrec;
@@ -983,7 +982,7 @@ static int ntfs_mft_data_extend_allocati
 	rl2 = ntfs_attr_find_vcn(mft_na, ll);
 	if (!rl2 || !rl2->length) {
 		ntfs_log_error("Failed to determine previous last "
-				"allocated cluster of mft data attribute.");
+				"allocated cluster of mft data attribute.\n");
 		if (rl2)
 			errno = EIO;
 		goto undo_alloc;
@@ -992,7 +991,7 @@ static int ntfs_mft_data_extend_allocati
 	mp_size = ntfs_get_size_for_mapping_pairs(vol, rl2, ll);
 	if (mp_size <= 0) {
 		ntfs_log_error("Get size for mapping pairs failed for "
-				"mft data attribute extent.");
+				"mft data attribute extent.\n");
 		goto undo_alloc;
 	}
 	/* Expand the attribute record if necessary. */
@@ -1001,7 +1000,7 @@ static int ntfs_mft_data_extend_allocati
 			mp_size + le16_to_cpu(a->mapping_pairs_offset))) {
 		if (errno != ENOSPC) {
 			ntfs_log_error("Failed to resize attribute "
-					"record for mft data attribute.");
+					"record for mft data attribute.\n");
 			goto undo_alloc;
 		}
 		// TODO: Deal with this by moving this extent to a new mft
@@ -1011,7 +1010,7 @@ static int ntfs_mft_data_extend_allocati
 		// question.
 		ntfs_log_error("Not enough space in this mft record to "
 				"accommodate extended mft data attribute "
-				"extent.  Cannot handle this yet.");
+				"extent.  Cannot handle this yet.\n");
 		errno = EOPNOTSUPP;
 		goto undo_alloc;
 	}
@@ -1023,7 +1022,7 @@ static int ntfs_mft_data_extend_allocati
 			(u8*)a + le16_to_cpu(a->mapping_pairs_offset), mp_size,
 			rl2, ll, NULL)) {
 		ntfs_log_error("Failed to build mapping pairs array of "
-				"mft data attribute.");
+				"mft data attribute.\n");
 		errno = EIO;
 		goto undo_alloc;
 	}
@@ -1045,7 +1044,7 @@ static int ntfs_mft_data_extend_allocati
 		if (ntfs_attr_lookup(mft_na->type, mft_na->name,
 				mft_na->name_len, 0, 0, NULL, 0, ctx)) {
 			ntfs_log_error("Failed to find first attribute "
-					"extent of mft data attribute.");
+					"extent of mft data attribute.\n");
 			goto restore_undo_alloc;
 		}
 		a = ctx->attr;
@@ -1062,7 +1061,7 @@ restore_undo_alloc:
 	if (ntfs_attr_lookup(mft_na->type, mft_na->name, mft_na->name_len, 0,
 			rl[1].vcn, NULL, 0, ctx)) {
 		ntfs_log_error("Failed to find last attribute extent of "
-				"mft data attribute.%s", es);
+				"mft data attribute.%s\n", es);
 		ntfs_attr_put_search_ctx(ctx);
 		mft_na->allocated_size += nr << vol->cluster_size_bits;
 		/*
@@ -1080,20 +1079,20 @@ undo_alloc:
 	err = errno;
 	if (ntfs_cluster_free(vol, mft_na, old_last_vcn, -1) < 0)
 		ntfs_log_error("Failed to free clusters from mft data "
-				"attribute.%s", es);
+				"attribute.%s\n", es);
 	if (ntfs_rl_truncate(&mft_na->rl, old_last_vcn))
 		ntfs_log_error("Failed to truncate mft data attribute "
-				"runlist.%s", es);
+				"runlist.%s\n", es);
 	if (mp_rebuilt) {
 		if (ntfs_mapping_pairs_build(vol, (u8*)a +
 				le16_to_cpu(a->mapping_pairs_offset),
 				old_alen - le16_to_cpu(a->mapping_pairs_offset),
 				rl2, ll, NULL))
 			ntfs_log_error("Failed to restore mapping pairs "
-					"array.%s", es);
+					"array.%s\n", es);
 		if (ntfs_attr_record_resize(m, a, old_alen))
 			ntfs_log_error("Failed to restore attribute "
-					"record.%s", es);
+					"record.%s\n", es);
 		ntfs_inode_mark_dirty(ctx->ntfs_ino);
 	}
 	if (ctx)
@@ -1198,7 +1197,7 @@ ntfs_inode *ntfs_mft_record_alloc(ntfs_v
 
 	if (base_ni)
 		ntfs_log_trace("Entering (allocating an extent mft record for "
-				"base mft record 0x%llx).",
+				"base mft record 0x%llx).\n",
 				(long long)base_ni->mft_no);
 	else
 		ntfs_log_trace("Entering (allocating a base mft record).\n");
@@ -1275,7 +1274,7 @@ found_free_rec:
 	/* @bit is the found free mft record, allocate it in the mft bitmap. */
 	ntfs_log_debug("At found_free_rec.\n");
 	if (ntfs_bitmap_set_bit(mftbmp_na, bit)) {
-		ntfs_log_error("Failed to allocate bit in mft bitmap.");
+		ntfs_log_error("Failed to allocate bit in mft bitmap.\n");
 		goto err_out;
 	}
 	ntfs_log_debug("Set bit 0x%llx in mft bitmap.\n", (long long)bit);
@@ -1325,20 +1324,20 @@ found_free_rec:
 		ntfs_log_debug("Initializing mft record 0x%llx.\n", (long long)ll2);
 		err = ntfs_mft_record_format(vol, ll2);
 		if (err) {
-			ntfs_log_error("Failed to format mft record.");
+			ntfs_log_error("Failed to format mft record.\n");
 			goto undo_data_init;
 		}
 	}
 	/* Update the mft data attribute record to reflect the new sizes. */
 	ctx = ntfs_attr_get_search_ctx(mft_na->ni, NULL);
 	if (!ctx) {
-		ntfs_log_error("Failed to get search context.");
+		ntfs_log_error("Failed to get search context.\n");
 		goto undo_data_init;
 	}
 	if (ntfs_attr_lookup(mft_na->type, mft_na->name, mft_na->name_len, 0,
 			0, NULL, 0, ctx)) {
 		ntfs_log_error("Failed to find first attribute extent of "
-				"mft data attribute.");
+				"mft data attribute.\n");
 		ntfs_attr_put_search_ctx(ctx);
 		goto undo_data_init;
 	}
@@ -1370,12 +1369,12 @@ mft_rec_already_initialized:
 	m = (MFT_RECORD*)malloc(vol->mft_record_size);
 	if (!m) {
 		ntfs_log_error("Failed to allocate buffer for mft "
-				"record.");
+				"record.\n");
 		goto undo_mftbmp_alloc;
 	}
 	if (ntfs_mft_record_read(vol, bit, m)) {
 		err = errno;
-		ntfs_log_error("Failed to read mft record.");
+		ntfs_log_error("Failed to read mft record.\n");
 		free(m);
 		errno = err;
 		goto undo_mftbmp_alloc;
@@ -1385,7 +1384,7 @@ mft_rec_already_initialized:
 		ntfs_log_error("Mft record 0x%llx was marked unused in "
 				"mft bitmap but is marked used itself.  "
 				"Corrupt filesystem or library bug!  "
-				"Run chkdsk immediately!", (long long)bit);
+				"Run chkdsk immediately!\n", (long long)bit);
 		free(m);
 		errno = EIO;
 		goto undo_mftbmp_alloc;
@@ -1394,7 +1393,7 @@ mft_rec_already_initialized:
 	usn = *(u16*)((u8*)m + le16_to_cpu(m->usa_ofs));
 	if (ntfs_mft_record_layout(vol, bit, m)) {
 		err = errno;
-		ntfs_log_error("Failed to re-format mft record.");
+		ntfs_log_error("Failed to re-format mft record.\n");
 		free(m);
 		errno = err;
 		goto undo_mftbmp_alloc;
@@ -1410,7 +1409,7 @@ mft_rec_already_initialized:
 	ni = ntfs_inode_allocate(vol);
 	if (!ni) {
 		err = errno;
-		ntfs_log_error("Failed to allocate buffer for inode.");
+		ntfs_log_error("Failed to allocate buffer for inode.\n");
 		free(m);
 		errno = err;
 		goto undo_mftbmp_alloc;
@@ -1441,7 +1440,7 @@ mft_rec_already_initialized:
 				err = errno;
 				ntfs_log_error("Failed to allocate "
 						"buffer for extent inodes "
-						"array.");
+						"array.\n");
 				free(m);
 				free(ni);
 				errno = err;
@@ -1477,7 +1476,7 @@ undo_data_init:
 undo_mftbmp_alloc:
 	err = errno;
 	if (ntfs_bitmap_clear_bit(mftbmp_na, bit))
-		ntfs_log_error("Failed to clear bit in mft bitmap.%s", es);
+		ntfs_log_error("Failed to clear bit in mft bitmap.%s\n", es);
 	errno = err;
 err_out:
 	if (!errno)

Index: runlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- runlist.c	2 Nov 2005 17:34:08 -0000	1.66
+++ runlist.c	4 Dec 2005 22:42:51 -0000	1.67
@@ -912,7 +912,7 @@ mpa_err:
 				rlpos++;
 			} else if (deltaxcn > max_cluster) {
 				ntfs_log_debug("Corrupt attribute. deltaxcn = "
-						"0x%llx, max_cluster = 0x%llx",
+						"0x%llx, max_cluster = 0x%llx\n",
 						(long long)deltaxcn,
 						(long long)max_cluster);
 				goto mpa_err;

Index: tree.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/tree.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tree.c	2 Nov 2005 17:34:08 -0000	1.9
+++ tree.c	4 Dec 2005 22:42:51 -0000	1.10
@@ -2000,7 +2000,7 @@ int ntfs_dt_alloc_add(struct ntfs_dt *pa
 
 	ntfs_log_debug("need %d, have %d\n", need, space);
 	if (need > space) {
-		ntfs_log_debug("no room");
+		ntfs_log_debug("no room\n");
 		return 0;
 	}
 
@@ -2101,7 +2101,7 @@ int ntfs_dt_root_add(struct ntfs_dt *par
 
 	ntfs_log_debug("need %d, have %d\n", need, space);
 	if (need > space) {
-		ntfs_log_debug("no room");
+		ntfs_log_debug("no room\n");
 		return -1;
 	}
 

Index: unix_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unix_io.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- unix_io.c	2 Nov 2005 17:34:08 -0000	1.8
+++ unix_io.c	4 Dec 2005 22:42:51 -0000	1.9
@@ -104,7 +104,7 @@ static int ntfs_device_unix_io_open(stru
 	flk.l_start = flk.l_len = 0LL;
 	if (fcntl(DEV_FD(dev), F_SETLK, &flk)) {
 		err = errno;
-		ntfs_log_debug("ntfs_device_unix_io_open: Could not lock %s for %s",
+		ntfs_log_debug("ntfs_device_unix_io_open: Could not lock %s for %s\n",
 				dev->d_name, NDevReadOnly(dev) ? "reading" : "writing");
 		if (close(DEV_FD(dev)))
 			ntfs_log_perror("ntfs_device_unix_io_open: Warning: Could not "

Index: win32_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- win32_io.c	6 Nov 2005 14:16:24 -0000	1.44
+++ win32_io.c	4 Dec 2005 22:42:51 -0000	1.45
@@ -701,7 +701,7 @@ static BOOL ntfs_device_win32_find_parti
 		err = GetLastError();
 		free(drive_layout);
 		if (err != ERROR_INSUFFICIENT_BUFFER) {
-			ntfs_log_trace("GetDriveLayout failed.");
+			ntfs_log_trace("GetDriveLayout failed.\n");
 			errno = ntfs_w32error_to_errno(err);
 			return FALSE;
 		}

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.345,1.346

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

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
dir.c::ntfs_delete(): Fix bug with deletion hard links to directories. See comment to ntfs_link() if care for why we support this case.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -p -r1.345 -r1.346
--- ChangeLog	1 Dec 2005 13:16:34 -0000	1.345
+++ ChangeLog	3 Dec 2005 18:04:44 -0000	1.346
@@ -92,6 +92,7 @@ xx/xx/2005 - 1.12.2-WIP
 	- ntfsclone: --metadata also wipes out the timestamps in the $I30 and
 	  in the /$Extend/$Quota:$Q index root attributes.  (Szaka)
 	- ntfsmount: Add FreeBSD support.  (Yura)
+	- ntfsmount: Fix bug with moving non-empty directories.  (Yura)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.47,1.48

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

Changes by: cha0smaster

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

Modified Files:
	dir.c 
Log Message:
dir.c::ntfs_delete(): Fix bug with deletion hard links to directories. See comment to ntfs_link() if care for why we support this case.


Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- dir.c	3 Dec 2005 16:18:15 -0000	1.47
+++ dir.c	3 Dec 2005 18:04:45 -0000	1.48
@@ -1365,25 +1365,6 @@ int ntfs_delete(ntfs_inode *ni, ntfs_ino
 		ni = ni->base_ni;
 	if (dir_ni->nr_extents == -1)
 		dir_ni = dir_ni->base_ni;
-	/* If deleting directory check it to be empty. */
-	if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) {
-		ntfs_attr *na;
-
-		na = ntfs_attr_open(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4);
-		if (!na) {
-			ntfs_log_error("Corrupt directory or library bug.");
-			errno = EIO;
-			goto err_out;
-		}
-		if (na->data_size != sizeof(INDEX_ROOT) +
-				sizeof(INDEX_ENTRY_HEADER)) {
-			ntfs_attr_close(na);
-			ntfs_log_error("Directory is not empty.");
-			errno = ENOTEMPTY;
-			goto err_out;
-		}
-		ntfs_attr_close(na);
-	}
 	/*
 	 * Search for FILE_NAME attribute with such name. If it's in POSIX or
 	 * WIN32_AND_DOS namespace, then simply remove it from index and inode.
@@ -1442,6 +1423,34 @@ search:
 		}
 		goto err_out;
 	}
+	/* If deleting directory check it to be empty. */
+	if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) {
+		ntfs_attr *na;
+
+		na = ntfs_attr_open(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4);
+		if (!na) {
+			ntfs_log_error("Corrupt directory or library bug.");
+			errno = EIO;
+			goto err_out;
+		}
+		/*
+		 * Do not allow non-empty directory deletion if hard links count
+		 * is 1 or 2 (in case if one of the names in DOS namespace and
+		 * another in WIN32 namespace).
+		 */
+		if ((na->data_size != sizeof(INDEX_ROOT) + sizeof(
+				INDEX_ENTRY_HEADER)) && (le16_to_cpu(
+				ni->mrec->link_count) == 1 ||
+				(le16_to_cpu(ni->mrec->link_count) == 2 &&
+				(fn->file_name_type == FILE_NAME_WIN32 ||
+				fn->file_name_type == FILE_NAME_DOS)))) {
+			ntfs_attr_close(na);
+			ntfs_log_error("Directory is not empty.");
+			errno = ENOTEMPTY;
+			goto err_out;
+		}
+		ntfs_attr_close(na);
+	}
 	/* Search for such FILE_NAME in index. */
 	ictx = ntfs_index_ctx_get(dir_ni, NTFS_INDEX_I30, 4);
 	if (!ictx)
@@ -1481,7 +1490,7 @@ search:
 	/*
 	 * If hard link count is not equal to zero then we are done. In other
 	 * case there are no reference to this inode left, so we should free all
-	 * non-resident attributes and mark inode as not in use.
+	 * non-resident attributes and mark all MFT record as not in use.
 	 */
 	if (ni->mrec->link_count)
 		goto out;
@@ -1551,6 +1560,12 @@ err_out:
  * @name:	unicode name of the new link
  * @name_len:	length of the name in unicode characters
  *
+ * NOTE: At present we allow creating hardlinks to directories, we use them
+ * in a temporary state during rename. But it's defenitely bad idea to have
+ * hard links to directories as a result of operation.
+ * FIXME: Create internal  __ntfs_link that allows hard links to a directories
+ * and external ntfs_link that do not. Write ntfs_rename that uses __ntfs_link.
+ *
  * Return 0 on success or -1 on error with errno set to the error code.
  */
 int ntfs_link(ntfs_inode *ni, ntfs_inode *dir_ni, ntfschar *name, u8 name_len)

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

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
determine to where pass kernel_cache option without #if's


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- ntfsmount.c	2 Dec 2005 17:09:41 -0000	1.72
+++ ntfsmount.c	3 Dec 2005 16:40:20 -0000	1.73
@@ -1766,13 +1766,13 @@ int main(int argc, char *argv[])
 	}
 	free(parsed_options);
 	if (!ctx->debug) {
-#if FUSE_MINOR_VERSION >= 4
-		fh = fuse_new(ffd, "use_ino,kernel_cache", &ntfs_fuse_oper,
-				sizeof(ntfs_fuse_oper));
-#else
-		fh = fuse_new(ffd, "use_ino", &ntfs_fuse_oper,
-				sizeof(ntfs_fuse_oper));
-#endif
+		if (fuse_is_lib_option("kernel_cache"))
+			fh = fuse_new(ffd, "use_ino,kernel_cache",
+					&ntfs_fuse_oper,
+					sizeof(ntfs_fuse_oper));
+		else
+			fh = fuse_new(ffd, "use_ino", &ntfs_fuse_oper,
+					sizeof(ntfs_fuse_oper));
 	} else
 		fh = fuse_new(ffd, "debug,use_ino" , &ntfs_fuse_oper,
 				sizeof(ntfs_fuse_oper));

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.46,1.47

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

Changes by: cha0smaster

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

Modified Files:
	dir.c 
Log Message:
minor fixes to comments


Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- dir.c	11 Nov 2005 23:35:57 -0000	1.46
+++ dir.c	3 Dec 2005 16:18:15 -0000	1.47
@@ -1080,7 +1080,7 @@ err_out:
  * @target:	target in unicode (only for symlinks)
  * @target_len:	length of target in unicode charcters
  *
- * Internal, use ntfs_create{_device,_symlink} wrappers instead.
+ * Internal, use ntfs_create{,_device,_symlink} wrappers instead.
  *
  * @type can be:
  *	S_IFREG		to create regular file
@@ -1092,8 +1092,11 @@ err_out:
  *	S_IFSOCK	to create socket
  * other values are invalid.
  *
- * @dev is only used if @type is S_IFBLK or S_IFCHR, in other cases it's value
- * is ignored.
+ * @dev is used only if @type is S_IFBLK or S_IFCHR, in other cases its value
+ * ignored.
+ *
+ * @target and @target_len are used only if @type is S_IFLNK, in other cases
+ * their value ignored.
  *
  * Return opened ntfs inode that describes created object on success or NULL
  * on error with errno set to the error code.
@@ -1338,8 +1341,8 @@ ntfs_inode *ntfs_create_symlink(ntfs_ino
  * @name:	unicode name of the object to delete
  * @name_len:	length of the name in unicode characters
  *
- * @ni is always closed after using of this function (even if it failed),
- * user do not need to call ntfs_inode_close himself.
+ * @ni is always closed after the call to this function (even if it failed),
+ * user does not need to call ntfs_inode_close himself.
  *
  * Return 0 on success or -1 on error with errno set to the error code.
  */

[Linux-NTFS-cvs] CVS: ntfsprogs configure.ac,1.94,1.95

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

Changes by: cha0smaster

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

Modified Files:
	configure.ac 
Log Message:
require FUSE-2.4.2 under FreeBSD, because eariler versions have problems with readdir


Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- configure.ac	30 Nov 2005 16:54:11 -0000	1.94
+++ configure.ac	2 Dec 2005 17:32:34 -0000	1.95
@@ -215,12 +215,12 @@ if test "$enable_fuse_module" != "no"; t
 			fi
 		]);;
 	freebsd*)
-		PKG_CHECK_MODULES(FUSE_MODULE, fuse >= 2.3.0, [ compile_fuse_module=true ],
+		PKG_CHECK_MODULES(FUSE_MODULE, fuse >= 2.4.2, [ compile_fuse_module=true ],
 		[
 			if test "$enable_fuse_module" = "yes"; then
-				AC_MSG_ERROR([ntfsmount requires FUSE version >= 2.3.0.])
+				AC_MSG_ERROR([ntfsmount requires FUSE version >= 2.4.2 under FreeBSD, because earlier versions have problems with readdir.])
 			else
-				AC_MSG_WARN([ntfsmount requires FUSE version >= 2.3.0.])
+				AC_MSG_WARN([ntfsmount requires FUSE version >= 2.4.2 under FreeBSD, because earlier versions have problems with readdir.])
 			fi
 		]);;
 	*) AC_MSG_ERROR([ntfsmount can be built only under Linux and FreeBSD.]);;

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

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
more warning fixes


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- ntfsmount.c	1 Dec 2005 20:46:03 -0000	1.71
+++ ntfsmount.c	2 Dec 2005 17:09:41 -0000	1.72
@@ -89,8 +89,8 @@ typedef struct {
 	long free_mft;
 	unsigned int uid;
 	unsigned int gid;
-	mode_t fmask;
-	mode_t dmask;
+	unsigned int fmask;
+	unsigned int dmask;
 	ntfs_fuse_streams_interface streams;
 	BOOL ro;
 	BOOL show_sys_files;

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

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
fix error message


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- ntfsmount.c	1 Dec 2005 13:15:49 -0000	1.70
+++ ntfsmount.c	1 Dec 2005 20:46:03 -0000	1.71
@@ -1709,7 +1709,7 @@ static int parse_options(int argc, char 
 		opts.quiet = 0;
 	} else {
 		if (!opts.device) {
-			ntfs_log_error("No mount point specified.\n");
+			ntfs_log_error("No device specified.\n");
 			err++;
 		}
 

[Linux-NTFS-cvs] CVS: ntfsprogs README,1.18,1.19 ntfsprogs.spec.in,1.18,1.19

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

Changes by: cha0smaster

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

Modified Files:
	README ntfsprogs.spec.in 
Log Message:
update site


Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/README,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- README	4 Aug 2005 19:49:38 -0000	1.18
+++ README	1 Dec 2005 20:44:18 -0000	1.19
@@ -22,7 +22,7 @@ The Linux-NTFS ntfsprogs package current
 (ntfsprogs).
 
 The Linux-NTFS home page is at:
-	http://linux-ntfs.sourceforge.net/
+	http://www.linux-ntfs.org/
 
 The SourceForge.net Linux-NTFS project page is at:
 	http://sourceforge.net/projects/linux-ntfs/

Index: ntfsprogs.spec.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs.spec.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ntfsprogs.spec.in	7 Oct 2005 23:01:23 -0000	1.18
+++ ntfsprogs.spec.in	1 Dec 2005 20:44:18 -0000	1.19
@@ -17,7 +17,7 @@ Packager	: Anton Altaparmakov <aia21@can
 License		: GPL
 Group		: System Environment/Base
 %description
-The Linux-NTFS project (http://linux-ntfs.sf.net/) aims to bring full support
+The Linux-NTFS project (http://www.linux-ntfs.org/) aims to bring full support
 for the NTFS filesystem to the Linux operating system.  The ntfsprogs package
 currently consists of a static library and utilities such as mkntfs, ntfscat,
 ntfsls, ntfsresize, and ntfsundelete (for a full list of included utilities

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs libntfs-gnomevfs.8.in,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-serv1670/libntfs

Modified Files:
	libntfs-gnomevfs.8.in 
Log Message:
update site


Index: libntfs-gnomevfs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/libntfs-gnomevfs.8.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libntfs-gnomevfs.8.in	10 Mar 2004 22:03:54 -0000	1.3
+++ libntfs-gnomevfs.8.in	1 Dec 2005 20:44:18 -0000	1.4
@@ -103,9 +103,9 @@ The
 .BR ntfsprogs
 package which contains the
 .BR libntfs-gnomevfs
-module can be downloaded from http://linux-ntfs.sourceforge.net/downloads.html
+module can be downloaded from http://www.linux-ntfs.org/content/view/19/37/
 .BR
-These manual pages can be viewed online at http://linux-ntfs.sourceforge.net/man/ntfsprogs.html
+These manual pages can be viewed online at http://man.linux-ntfs.org/ntfsprogs.8.html
 
 .SH SEE ALSO
 .BR ntfsprogs (8)

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

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

Changes by: cha0smaster

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

Modified Files:
	utils.c 
Log Message:
update site


Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- utils.c	2 Nov 2005 17:34:08 -0000	1.59
+++ utils.c	1 Dec 2005 20:44:18 -0000	1.60
@@ -73,7 +73,7 @@
 #include "logging.h"
 
 const char *ntfs_bugs = "Developers' email address: lin...@li...\n";
-const char *ntfs_home = "Linux NTFS homepage: http://linux-ntfs.sourceforge.net\n";
+const char *ntfs_home = "Linux NTFS homepage: http://www.linux-ntfs.org\n";
 const char *ntfs_gpl = "This program is free software, released under the GNU "
 	"General Public License\nand you are welcome to redistribute it under "
 	"certain conditions.  It comes with\nABSOLUTELY NO WARRANTY; for "

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.344,1.345

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

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
update


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -p -r1.344 -r1.345
--- ChangeLog	18 Nov 2005 00:24:45 -0000	1.344
+++ ChangeLog	1 Dec 2005 13:16:34 -0000	1.345
@@ -91,6 +91,7 @@ xx/xx/2005 - 1.12.2-WIP
 	- Add support of MS_NOATIME flag to ntfs_mount().  (Yura)
 	- ntfsclone: --metadata also wipes out the timestamps in the $I30 and
 	  in the /$Extend/$Quota:$Q index root attributes.  (Szaka)
+	- ntfsmount: Add FreeBSD support.  (Yura)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.69,1.70

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
ntfsmount: Mount point is optional parameter


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- ntfsmount.c	30 Nov 2005 16:58:03 -0000	1.69
+++ ntfsmount.c	1 Dec 2005 13:15:49 -0000	1.70
@@ -1713,12 +1713,6 @@ static int parse_options(int argc, char 
 			err++;
 		}
 
-		if (!opts.mnt_point) {
-			if (argc > 1)
-				ntfs_log_error("No mount point specified.\n");
-			err++;
-		}
-
 		if (opts.quiet && opts.verbose) {
 			ntfs_log_error("You may not use --quiet and --verbose "
 					"at the same time.\n");

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

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
Fix warnings on FreeBSD


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- ntfsmount.c	30 Nov 2005 16:54:11 -0000	1.68
+++ ntfsmount.c	30 Nov 2005 16:58:03 -0000	1.69
@@ -87,8 +87,8 @@ typedef struct {
 	int state;
 	long free_clusters;
 	long free_mft;
-	uid_t uid;
-	gid_t gid;
+	unsigned int uid;
+	unsigned int gid;
 	mode_t fmask;
 	mode_t dmask;
 	ntfs_fuse_streams_interface streams;