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

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.197,1.198

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

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
Do not update time for system files (inode number < FILE_first_user) in ntfs_attr_p{read,write}. Who cares about them, but this solves segfault during umount.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- attrib.c	15 Nov 2005 16:31:40 -0000	1.197
+++ attrib.c	16 Nov 2005 16:27:27 -0000	1.198
@@ -772,7 +772,8 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
 	}
 	vol = na->ni->vol;
 	/* Update access time if accessing unnamed data attribute. */
-	if (!NVolReadOnly(vol) && !NVolNoATime(vol) && na->type == AT_DATA &&
+	if (!NVolReadOnly(vol) && !NVolNoATime(vol) && na->ni->mft_no >=
+			FILE_first_user && na->type == AT_DATA &&
 			na->name == AT_UNNAMED) {
 		na->ni->last_access_time = time(NULL);
 		NInoFileNameSetDirty(na->ni);
@@ -960,7 +961,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 		return -1;
 	}
 	/* Update time if writing to unnamed data attribute. */
-	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
+	if (na->ni->mft_no >= FILE_first_user && na->type == AT_DATA &&
+			na->name == AT_UNNAMED) {
 		na->ni->last_data_change_time = time(NULL);
 		na->ni->last_mft_change_time = time(NULL);
 		NInoFileNameSetDirty(na->ni);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.111,1.112

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

Changes by: flatcap

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

Modified Files:
	mkntfs.c 
Log Message:
it came from space (and ate my brackets)


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- mkntfs.c	16 Nov 2005 02:55:16 -0000	1.111
+++ mkntfs.c	16 Nov 2005 02:58:49 -0000	1.112
@@ -4414,10 +4414,10 @@ static void mkntfs_create_root_structure
 		if (g_vol->major_ver == 1) {
 			init_system_file_sd(FILE_root, &sd, &i);
 			err = add_attr_sd(m, sd, i);
-		} else if (NTFS_V3_0(g_vol->major_ver, g_vol->minor_ver) {
+		} else if (NTFS_V3_0(g_vol->major_ver, g_vol->minor_ver)) {
 			init_system_file_sd(FILE_root, &sd, &i);
 			err = add_attr_sd(m, sd, i);
-		} else if (NTFS_V3_1(g_vol->major_ver, g_vol->minor_ver) {
+		} else if (NTFS_V3_1(g_vol->major_ver, g_vol->minor_ver)) {
 			init_root_sd_31(&sd, &i);
 			err = add_attr_sd(m, sd, i);
 		} else {

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.110,1.111

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

Changes by: flatcap

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

Modified Files:
	mkntfs.c 
Log Message:
a handful more of subjective cleanups

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- mkntfs.c	15 Nov 2005 16:24:23 -0000	1.110
+++ mkntfs.c	16 Nov 2005 02:55:16 -0000	1.111
@@ -1208,15 +1208,18 @@ static runlist * allocate_scattered_clus
 				vcn++;
 			} else {
 				rl[rlpos].vcn = vcn++;
-				rl[rlpos].lcn = prev_lcn = lcn;
-				rl[rlpos].length = prev_run_len = 1LL;
+				rl[rlpos].lcn = lcn;
+				prev_lcn = lcn;
+				rl[rlpos].length = 1LL;
+				prev_run_len = 1LL;
 				rlpos++;
 			}
 			/* Done? */
 			if (!--clusters) {
 				/* Add terminator element and return. */
 				rl[rlpos].vcn = vcn;
-				rl[rlpos].lcn = rl[rlpos].length = 0LL;
+				rl[rlpos].lcn = 0LL;
+				rl[rlpos].length = 0LL;
 				return rl;
 			}
 
@@ -2647,7 +2650,7 @@ static int make_room_for_index_entry_in_
  * ntfs_index_keys_compare
  *
  * not all types of COLLATION_RULES supported yet...
- * added as needed.. (remove this comment when all is added)
+ * added as needed.. (remove this comment when all are added)
  */
 static int ntfs_index_keys_compare(char *key1, char *key2,
 				   int key1_length,int key2_length,
@@ -3478,7 +3481,8 @@ static int mkntfs_open_partition(void)
 		}
 		ntfs_log_warning("mkntfs forced anyway.\n");
 #ifdef HAVE_LINUX_MAJOR_H
-	} else if ((IDE_DISK_MAJOR(MAJOR(sbuf.st_rdev)) && MINOR(sbuf.st_rdev) % 64 == 0) || (SCSI_DISK_MAJOR(MAJOR(sbuf.st_rdev)) && MINOR(sbuf.st_rdev) % 16 == 0)) {
+	} else if ((IDE_DISK_MAJOR(MAJOR(sbuf.st_rdev)) && MINOR(sbuf.st_rdev) % 64 == 0) ||
+		  (SCSI_DISK_MAJOR(MAJOR(sbuf.st_rdev)) && MINOR(sbuf.st_rdev) % 16 == 0)) {
 		ntfs_log_error("%s is entire device, not just one partition.\n", g_vol->dev->d_name);
 		if (!opts.force) {
 			ntfs_log_error("Refusing to make a filesystem here!\n");
@@ -3802,7 +3806,8 @@ static void mkntfs_initialize_bitmaps(vo
 	 * Size is always one cluster, even though valid data size and
 	 * initialized data size are only 8 bytes.
 	 */
-	g_rl_mft_bmp[1].vcn = g_rl_mft_bmp[0].length = 1LL;
+	g_rl_mft_bmp[1].vcn = 1LL;
+	g_rl_mft_bmp[0].length = 1LL;
 	g_rl_mft_bmp[1].lcn = -1LL;
 	g_rl_mft_bmp[1].length = 0LL;
 	/* Allocate cluster for mft bitmap. */
@@ -3874,7 +3879,8 @@ static void mkntfs_initialize_rl_mft(voi
 	g_rl_mft[0].lcn = g_mft_lcn;
 	/* rounded up division by cluster size */
 	j = (g_mft_size + g_vol->cluster_size - 1) / g_vol->cluster_size;
-	g_rl_mft[1].vcn = g_rl_mft[0].length = j;
+	g_rl_mft[1].vcn = j;
+	g_rl_mft[0].length = j;
 	g_rl_mft[1].lcn = -1LL;
 	g_rl_mft[1].length = 0LL;
 	/* Allocate clusters for mft. */
@@ -3900,7 +3906,8 @@ static void mkntfs_initialize_rl_mft(voi
 	 * whichever is bigger).
 	 */
 	j = (4 * g_vol->mft_record_size + g_vol->cluster_size - 1) / g_vol->cluster_size;
-	g_rl_mftmirr[1].vcn = g_rl_mftmirr[0].length = j;
+	g_rl_mftmirr[1].vcn = j;
+	g_rl_mftmirr[0].length = j;
 	g_rl_mftmirr[1].lcn = -1LL;
 	g_rl_mftmirr[1].length = 0LL;
 	/* Allocate clusters for mft mirror. */
@@ -3972,7 +3979,8 @@ static void mkntfs_initialize_rl_logfile
 		err_exit("$LogFile would be created with invalid size. This "
 				"is not allowed as it would cause Windows to "
 				"blue screen and during boot.\n");
-	g_rl_logfile[1].vcn = g_rl_logfile[0].length = j;
+	g_rl_logfile[1].vcn = j;
+	g_rl_logfile[0].length = j;
 	g_rl_logfile[1].lcn = -1LL;
 	g_rl_logfile[1].length = 0LL;
 	/* Allocate clusters for log file. */
@@ -4005,7 +4013,8 @@ static void mkntfs_initialize_rl_boot(vo
 	 * bigger.
 	 */
 	j = (8192 + g_vol->cluster_size - 1) / g_vol->cluster_size;
-	g_rl_boot[1].vcn = g_rl_boot[0].length = j;
+	g_rl_boot[1].vcn = j;
+	g_rl_boot[0].length = j;
 	g_rl_boot[1].lcn = -1LL;
 	g_rl_boot[1].length = 0LL;
 	/* Allocate clusters for $Boot. */
@@ -4034,7 +4043,8 @@ static void mkntfs_initialize_rl_bad(voi
 	 * $BadClus named stream $Bad contains the whole volume as a single
 	 * sparse runlist entry.
 	 */
-	g_rl_bad[1].vcn = g_rl_bad[0].length = g_vol->nr_clusters;
+	g_rl_bad[1].vcn = g_vol->nr_clusters;
+	g_rl_bad[0].length = g_vol->nr_clusters;
 	g_rl_bad[1].lcn = -1LL;
 	g_rl_bad[1].length = 0LL;
 
@@ -4259,6 +4269,7 @@ bb_err:
 	return -1;
 }
 
+
 /**
  * mkntfs_create_root_structures -
  *
@@ -4297,7 +4308,7 @@ static void mkntfs_create_root_structure
 	FILE_ATTR_FLAGS extend_flags;
 	VOLUME_FLAGS volume_flags = 0;
 	int nr_sysfiles;
-	u8 *buf2 = NULL;
+	u8 *buf_log = NULL;
 	int buf_sds_first_size = 0;
 	int buf_sds_size = 0;
 	char *buf_sds_init = NULL;
@@ -4403,10 +4414,10 @@ static void mkntfs_create_root_structure
 		if (g_vol->major_ver == 1) {
 			init_system_file_sd(FILE_root, &sd, &i);
 			err = add_attr_sd(m, sd, i);
-		} else if (g_vol->major_ver == 3 && g_vol->minor_ver == 0) {
+		} else if (NTFS_V3_0(g_vol->major_ver, g_vol->minor_ver) {
 			init_system_file_sd(FILE_root, &sd, &i);
 			err = add_attr_sd(m, sd, i);
-		} else if (g_vol->major_ver == 3 && g_vol->minor_ver == 1) {
+		} else if (NTFS_V3_1(g_vol->major_ver, g_vol->minor_ver) {
 			init_root_sd_31(&sd, &i);
 			err = add_attr_sd(m, sd, i);
 		} else {
@@ -4487,15 +4498,15 @@ static void mkntfs_create_root_structure
 	/* dump_mft_record(m); */
 	ntfs_log_verbose("Creating $LogFile (mft record 2)\n");
 	m = (MFT_RECORD*)(g_buf + 2 * g_vol->mft_record_size);
-	buf2 = malloc(g_logfile_size);
-	if (!buf2)
+	buf_log = malloc(g_logfile_size);
+	if (!buf_log)
 		err_exit("Failed to allocate internal buffer: %s\n",
 				strerror(errno));
-	memset(buf2, -1, g_logfile_size);
-	err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_logfile, buf2,
+	memset(buf_log, -1, g_logfile_size);
+	err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_logfile, buf_log,
 			g_logfile_size);
-	free(buf2);
-	buf2 = NULL;
+	free(buf_log);
+	buf_log = NULL;
 	if (!err)
 		err = create_hardlink(g_index_block, root_ref, m,
 				MK_LE_MREF(FILE_LogFile, FILE_LogFile),
@@ -4552,19 +4563,19 @@ static void mkntfs_create_root_structure
 	if (err < 0)
 		err_exit("Couldn't create $Bitmap: %s\n", strerror(-err));
 	/* dump_mft_record(m); */
+
 	ntfs_log_verbose("Creating $Boot (mft record 7)\n");
 	m = (MFT_RECORD*)(g_buf + 7 * g_vol->mft_record_size);
-	buf2 = calloc(1, 8192);
-	if (!buf2)
+	bs = calloc(1, 8192);
+	if (!bs)
 		err_exit("Failed to allocate internal buffer: %s\n",
 				strerror(errno));
-	memcpy(buf2, boot_array, sizeof(boot_array));
+	memcpy(bs, boot_array, sizeof(boot_array));
 	/*
-	 * Create the boot sector in buf2. Note, that buf2 is already zeroed
+	 * Create the boot sector in bs. Note, that bs is already zeroed
 	 * in the boot sector section and that it has the NTFS OEM id/magic
 	 * already inserted, so no need to worry about these things.
 	 */
-	bs = (NTFS_BOOT_SECTOR*)buf2;
 	bs->bpb.bytes_per_sector = cpu_to_le16(opts.sector_size);
 	bs->bpb.sectors_per_cluster = (u8)(g_vol->cluster_size /
 			opts.sector_size);
@@ -4591,7 +4602,7 @@ static void mkntfs_create_root_structure
 		bs->clusters_per_mft_record = -(ffs(g_vol->mft_record_size) - 1);
 		if ((u32)(1 << -bs->clusters_per_mft_record) !=
 				g_vol->mft_record_size) {
-			free(buf2);
+			free(bs);
 			err_exit("BUG: calculated clusters_per_mft_record "
 					"is wrong (= 0x%x)\n",
 					bs->clusters_per_mft_record);
@@ -4606,7 +4617,7 @@ static void mkntfs_create_root_structure
 	} else {
 		bs->clusters_per_index_record = -g_vol->indx_record_size_bits;
 		if ((1 << -bs->clusters_per_index_record) != (s32)g_vol->indx_record_size) {
-			free(buf2);
+			free(bs);
 			err_exit("BUG: calculated clusters_per_index_record "
 					"is wrong (= 0x%x)\n",
 					bs->clusters_per_index_record);
@@ -4625,10 +4636,10 @@ static void mkntfs_create_root_structure
 	bs->checksum = cpu_to_le32(0);
 	/* Make sure the bootsector is ok. */
 	if (!ntfs_boot_sector_is_ntfs(bs, TRUE)) {
-		free(buf2);
+		free(bs);
 		err_exit("FATAL: Generated boot sector is invalid!\n");
 	}
-	err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_boot, buf2, 8192);
+	err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_boot, (u8*)bs, 8192);
 	if (!err)
 		err = create_hardlink(g_index_block, root_ref, m,
 				MK_LE_MREF(FILE_Boot, FILE_Boot),
@@ -4641,11 +4652,11 @@ static void mkntfs_create_root_structure
 		err = add_attr_sd(m, sd, i);
 	}
 	if (err < 0) {
-		free(buf2);
+		free(bs);
 		err_exit("Couldn't create $Boot: %s\n", strerror(-err));
 	}
 
-	if (create_backup_boot_sector(buf2)) {
+	if (create_backup_boot_sector((u8*)bs)) {
 		/*
 		 * Pre-2.6 kernels couldn't access the last sector
 		 * if it was odd hence we schedule chkdsk to create it.
@@ -4653,8 +4664,7 @@ static void mkntfs_create_root_structure
 		volume_flags |= VOLUME_IS_DIRTY;
 	}
 
-	free(buf2);
-	buf2 = NULL;
+	free(bs);
 
 	create_file_volume(m, root_ref, volume_flags);
 

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

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

Changes by: szaka

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

Modified Files:
	layout.h 
Log Message:
More comments on SDH_INDEX_DATA's reserved_II field


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- layout.h	15 Nov 2005 01:00:22 -0000	1.48
+++ layout.h	16 Nov 2005 00:17:53 -0000	1.49
@@ -1913,7 +1913,8 @@ typedef struct {
 	u32 security_id;   /* The security_id assigned to the descriptor. */
 	u64 offset;	   /* Byte offset of this entry in the $SDS stream. */
 	u32 length;	   /* Size in bytes of this entry in $SDS stream. */
-	u32 reserved_II;   /* Padding - always unicode "II". */
+	u32 reserved_II;   /* Padding - always unicode "II" or zero. This field
+			      isn't counted in INDEX_ENTRY's data_length. */
 } __attribute__((__packed__)) SDH_INDEX_DATA;
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.97,1.98

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

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
Dump $Secure $SDH and $SII, $Quota $O and $R index attribute data;
Fix printf field width specifiers


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- ntfsinfo.c	12 Nov 2005 12:59:20 -0000	1.97
+++ ntfsinfo.c	16 Nov 2005 00:13:10 -0000	1.98
@@ -497,7 +497,7 @@ static void ntfs_dump_flags(ATTR_TYPES t
 		flags &= ~FILE_ATTR_VIEW_INDEX_PRESENT;
 	}
 	if (flags)
-		printf(" UNKNOWN: 0x%04x", (unsigned int)le32_to_cpu(flags));
+		printf(" UNKNOWN: 0x%08x", (unsigned int)le32_to_cpu(flags));
 	printf("\n");
 }
 
@@ -1136,7 +1136,7 @@ static void ntfs_dump_index_key(INDEX_EN
 				 le32_to_cpu(entry->key.sii.security_id));
 		break;
 	case INDEX_ATTR_SECURE_SDH:
-		ntfs_log_verbose("\t\tKey hash:\t\t 0x%04x\n",
+		ntfs_log_verbose("\t\tKey hash:\t\t 0x%08x\n",
 				 le32_to_cpu(entry->key.sdh.hash));
 		ntfs_log_verbose("\t\tKey security id:\t %u\n",
 				 le32_to_cpu(entry->key.sdh.security_id));
@@ -1146,7 +1146,7 @@ static void ntfs_dump_index_key(INDEX_EN
 		ntfs_log_verbose("\t\tKey GUID:\t\t %s\n", printable_GUID);
 		break;
 	case INDEX_ATTR_REPARSE_R:
-		ntfs_log_verbose("\t\tKey reparse tag:\t 0x%04x\n",
+		ntfs_log_verbose("\t\tKey reparse tag:\t 0x%08x\n",
 				 le32_to_cpu(entry->key.reparse.reparse_tag));
 		ntfs_log_verbose("\t\tKey file id:\t\t %llu\n",
 				 le64_to_cpu(entry->key.reparse.file_id));
@@ -1161,7 +1161,85 @@ static void ntfs_dump_index_key(INDEX_EN
 				 le32_to_cpu(entry->key.owner_id));
 		break;
 	default:
-		ntfs_log_verbose("\t\tKey is UNKNOWN: \t 0x%04x\n",
+		ntfs_log_verbose("\t\tIndex attr type is UNKNOWN: \t 0x%08x\n",
+				 le32_to_cpu(type));
+		break;
+	}
+}
+
+typedef	union {		
+		SII_INDEX_DATA sii;		/* $SII index data in $Secure */
+		SDH_INDEX_DATA sdh;		/* $SDH index data in $Secure */
+		QUOTA_O_INDEX_DATA quota_o;	/* $O index data in $Quota    */
+		QUOTA_CONTROL_ENTRY quota_q;	/* $Q index data in $Quota    */
+} __attribute__((__packed__)) INDEX_ENTRY_DATA;
+
+static void ntfs_dump_index_data(INDEX_ENTRY *entry, INDEX_ATTR_TYPE type)
+{
+	INDEX_ENTRY_DATA *data;
+	
+	data = (INDEX_ENTRY_DATA *)((u8 *)entry + entry->data_offset);
+	
+	switch (type) {
+	case INDEX_ATTR_SECURE_SII:
+		ntfs_log_verbose("\t\tHash:\t\t\t 0x%08x\n",
+				 le32_to_cpu(data->sii.hash));
+		ntfs_log_verbose("\t\tSecurity id:\t\t %u\n",
+				 le32_to_cpu(data->sii.security_id));
+		ntfs_log_verbose("\t\tOffset in $SDS:\t\t %llu\n",
+				 le64_to_cpu(data->sii.offset));
+		ntfs_log_verbose("\t\tLength in $SDS:\t\t %u\n",
+				 le32_to_cpu(data->sii.length));
+		break;
+	case INDEX_ATTR_SECURE_SDH:
+		ntfs_log_verbose("\t\tHash:\t\t\t 0x%08x\n",
+				 le32_to_cpu(data->sdh.hash));
+		ntfs_log_verbose("\t\tSecurity id:\t\t %u\n",
+				 le32_to_cpu(data->sdh.security_id));
+		ntfs_log_verbose("\t\tOffset in $SDS:\t\t %llu\n",
+				 le64_to_cpu(data->sdh.offset));
+		ntfs_log_verbose("\t\tLength in $SDS:\t\t %u\n",
+				 le32_to_cpu(data->sdh.length));
+		ntfs_log_verbose("\t\tUnknown (padding):\t 0x%08x\n",
+				 le32_to_cpu(data->sdh.reserved_II));
+		break;
+	case INDEX_ATTR_OBJID_O:
+		/* TODO */
+		break;
+	case INDEX_ATTR_REPARSE_R:
+		/* TODO */
+		break;
+	case INDEX_ATTR_QUOTA_O:
+		ntfs_log_verbose("\t\tOwner id:\t\t %u\n",
+				 le32_to_cpu(data->quota_o.owner_id));
+		ntfs_log_verbose("\t\tUnknown:\t\t %u\n",
+				 le32_to_cpu(data->quota_o.unknown));
+		break;
+	case INDEX_ATTR_QUOTA_Q:
+		ntfs_log_verbose("\t\tVersion:\t\t %u\n",
+				 le32_to_cpu(data->quota_q.version));
+		ntfs_log_verbose("\t\tQuota flags:\t\t 0x%08x\n",
+				 le32_to_cpu(data->quota_q.flags));
+		ntfs_log_verbose("\t\tBytes used:\t\t %llu\n",
+				 le64_to_cpu(data->quota_q.bytes_used));
+		ntfs_log_verbose("\t\tLast changed:\t\t %s",
+				 ntfsinfo_time_to_str(
+					 data->quota_q.change_time));
+		ntfs_log_verbose("\t\tThreshold:\t\t %lld\n",
+				 le64_to_cpu(data->quota_q.threshold));
+		ntfs_log_verbose("\t\tLimit:\t\t\t %lld\n",
+				 le64_to_cpu(data->quota_q.limit));
+		ntfs_log_verbose("\t\tExceeded time:\t\t %lld\n",
+				 le64_to_cpu(data->quota_q.exceeded_time));
+		if (entry->data_length > 48) {
+			char *sid;
+			sid = ntfs_sid_to_mbs(&data->quota_q.sid, NULL, 0);
+			ntfs_log_verbose("\t\tOwner SID:\t\t %s\n", sid);
+			free(sid);
+		}
+		break;
+	default:
+		ntfs_log_verbose("\t\tIndex attr type is UNKNOWN: \t 0x%08x\n",
 				 le32_to_cpu(type));
 		break;
 	}
@@ -1235,7 +1313,7 @@ static int ntfs_dump_index_entries(INDEX
 				ntfs_log_verbose("\t\tData length:\t\t %u\n",
 					le16_to_cpu(entry->data_length));
 				ntfs_dump_index_key(entry, type);
-				// TODO: dump index attribute data too
+				ntfs_dump_index_data(entry, type);
 				break;
 		}
 		entry = (INDEX_ENTRY *)((u8 *)entry +

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.195,1.196

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

On Tue, 15 Nov 2005, Yura Pakhuchiy wrote:
> On Tue, 2005-11-15 at 15:37 +0200, Yura Pakhuchiy wrote:
> > On Tue, 2005-11-15 at 10:41 +0000, Anton Altaparmakov wrote:
> > > This is a bug...  You can't do atime updates on read-only volumes.  You 
> > > need to check if the volume is read-only and only if not perform the 
> > > update.  This breaks the entirety of libntfs/ntfsprogs that use 
> > > read-only mounts for sure.
> > 
> > A lot of utils use read-only mounts if --no-action option passed to
> > them, they call ntfs_attr_pwrite and it is OK, but why updating atime is
> > evil in this case?
> 
> I read ntfs_attr_pread source and found answer myself. I always had
> thought that read-only check performed on some more low-level such as
> ntfs_pwrite, not in ntfs_{attr,rl}_pwrite.

Yes.  The reason it is not in ntfs_pwrite() is that ntfs_pwrite() is a 
device operation not a volume operation.  The NVolReadOnly() check is a 
volume operation also.

Note, ntfs_pwrite() actually does do a read-only check.  But a different 
kind of read-only check.  It checks whether the device is read-only and 
returns an error if so:

	if (NDevReadOnly(dev)) {
		errno = EROFS;
		return -1;
	}

In contrast to this, the volume layer silently returns success when 
NVolReadOnly() is true.  This allows us to do the "--noaction" easily 
whilst still actually doing as much as possible of the operations so that 
--noaction is closer to reality.

And the NDevReadOnly() guarantees that if we have bugs in volume layer 
(very complex and large amount of code so quite possible) and those 
bugs result in some writes slipping through, those writes will never 
corrupt the real on-disk volume as we will catch them and return EROFS 
which will cause the utility to abort and hopefully we will get a 
bugreport about it and be able to fix the leak...

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/

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.195,1.196

[Yura P. <pak...@ip...>]

On Tue, 2005-11-15 at 15:37 +0200, Yura Pakhuchiy wrote:
> On Tue, 2005-11-15 at 10:41 +0000, Anton Altaparmakov wrote:
> > On Mon, 14 Nov 2005, Yura Pakhuchiy wrote:
> > > Changes by: cha0smaster
> > > 
> > > Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
> > > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18573/libntfs
> > > 
> > > Modified Files:
> > > 	attrib.c 
> > > Log Message:
> > > Automatically update access and change time in ntfs_attr_p{read,write}          and ntfs_attr_truncate.
> > > 
> > > 
> > > Index: attrib.c
> > > ===================================================================
> > > RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
> > > retrieving revision 1.195
> > > retrieving revision 1.196
> > > diff -u -p -r1.195 -r1.196
> > > --- attrib.c	14 Nov 2005 00:17:19 -0000	1.195
> > > +++ attrib.c	14 Nov 2005 15:31:23 -0000	1.196
> > > @@ -55,6 +55,7 @@
> > >  #include "compress.h"
> > >  #include "bitmap.h"
> > >  #include "logging.h"
> > > +#include "ntfstime.h"
> > >  
> > >  ntfschar AT_UNNAMED[] = { const_cpu_to_le16('\0') };
> > >  
> > > @@ -769,6 +770,12 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
> > >  		errno = EACCES;
> > >  		return -1;
> > >  	}
> > > +	/* Update access time if accessing unnamed data attribute. */
> > > +	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
> > > +		na->ni->last_access_time = time(NULL);
> > > +		NInoFileNameSetDirty(na->ni);
> > > +		NInoSetDirty(na->ni);
> > > +	}
> > 
> > This is a bug...  You can't do atime updates on read-only volumes.  You 
> > need to check if the volume is read-only and only if not perform the 
> > update.  This breaks the entirety of libntfs/ntfsprogs that use 
> > read-only mounts for sure.
> 
> A lot of utils use read-only mounts if --no-action option passed to
> them, they call ntfs_attr_pwrite and it is OK, but why updating atime is
> evil in this case?

I read ntfs_attr_pread source and found answer myself. I always had
thought that read-only check performed on some more low-level such as
ntfs_pwrite, not in ntfs_{attr,rl}_pwrite.

-- 
Best regards,
        Yura

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

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
ntfsmount: pass MS_NOATIME flag to ntfs_mount, let VFS care about access time.


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- ntfsmount.c	14 Nov 2005 12:19:39 -0000	1.57
+++ ntfsmount.c	15 Nov 2005 16:41:39 -0000	1.58
@@ -1366,7 +1366,8 @@ static int ntfs_fuse_mount(const char *d
 {
 	ntfs_volume *vol;
 
-	vol = utils_mount_volume(device, (ctx->ro) ? MS_RDONLY : 0, ctx->force);
+	vol = utils_mount_volume(device, ((ctx->ro) ? MS_RDONLY : 0) |
+			MS_NOATIME, ctx->force);
 	if (!vol) {
 		ntfs_log_error("Mount failed.\n");
 		return -1;

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.196,1.197 volume.c,1.66,1.67

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

Changes by: cha0smaster

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

Modified Files:
	attrib.c volume.c 
Log Message:
* Fix bug with updating atime on read-only volumes. (Thanks to Szaka and Anton)
* Add MS_NOATIME to ntfs_mount. (By Yuval's request)


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- attrib.c	14 Nov 2005 15:31:23 -0000	1.196
+++ attrib.c	15 Nov 2005 16:31:40 -0000	1.197
@@ -770,8 +770,10 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
 		errno = EACCES;
 		return -1;
 	}
+	vol = na->ni->vol;
 	/* Update access time if accessing unnamed data attribute. */
-	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
+	if (!NVolReadOnly(vol) && !NVolNoATime(vol) && na->type == AT_DATA &&
+			na->name == AT_UNNAMED) {
 		na->ni->last_access_time = time(NULL);
 		NInoFileNameSetDirty(na->ni);
 		NInoSetDirty(na->ni);
@@ -784,7 +786,6 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
 			return 0;
 		count = na->data_size - pos;
 	}
-	vol = na->ni->vol;
 	/* If it is a resident attribute, get the value from the mft record. */
 	if (!NAttrNonResident(na)) {
 		ntfs_attr_search_ctx *ctx;

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- volume.c	13 Nov 2005 19:25:05 -0000	1.66
+++ volume.c	15 Nov 2005 16:31:40 -0000	1.67
@@ -384,7 +384,7 @@ error_exit:
 /**
  * ntfs_volume_startup - allocate and setup an ntfs volume
  * @dev:	device to open
- * @rwflag:	optional mount flags
+ * @flags:	optional mount flags
  *
  * Load, verify, and parse bootsector; load and setup $MFT and $MFTMirr. After
  * calling this function, the volume is setup sufficiently to call all read
@@ -393,7 +393,7 @@ error_exit:
  * Return the allocated volume structure on success and NULL on error with
  * errno set to the error code.
  */
-ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev, unsigned long rwflag)
+ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev, unsigned long flags)
 {
 	LCN mft_zone_size, mft_lcn;
 	s64 br;
@@ -429,8 +429,10 @@ ntfs_volume *ntfs_volume_startup(struct 
 	}
 	ntfs_upcase_table_build(vol->upcase,
 			vol->upcase_len * sizeof(ntfschar));
-	if ((rwflag & MS_RDONLY) == MS_RDONLY)
+	if (flags & MS_RDONLY)
 		NVolSetReadOnly(vol);
+	if (flags & MS_NOATIME)
+		NVolSetNoATime(vol);
 	ntfs_log_debug("Reading bootsector... ");
 	if (dev->d_ops->open(dev, NVolReadOnly(vol) ? O_RDONLY: O_RDWR)) {
 		ntfs_log_debug(FAILED);
@@ -730,15 +732,16 @@ out:
 /**
  * ntfs_device_mount - open ntfs volume
  * @dev:	device to open
- * @rwflag:	optional mount flags
+ * @flags:	optional mount flags
  *
  * This function mounts an ntfs volume. @dev should describe the device which
  * to mount as the ntfs volume.
  *
- * @rwflags is an optional second parameter. The same flags are used as for
- * the mount system call (man 2 mount). Currently only the following flag
- * is implemented:
+ * @flags is an optional second parameter. The same flags are used as for
+ * the mount system call (man 2 mount). Currently only the following flags
+ * are implemented:
  *	MS_RDONLY	- mount volume read-only
+ *	MS_NOATIME	- do not update access time
  *
  * The function opens the device @dev and verifies that it contains a valid
  * bootsector. Then, it allocates an ntfs_volume structure and initializes
@@ -749,7 +752,7 @@ out:
  * Return the allocated volume structure on success and NULL on error with
  * errno set to the error code.
  */
-ntfs_volume *ntfs_device_mount(struct ntfs_device *dev, unsigned long rwflag)
+ntfs_volume *ntfs_device_mount(struct ntfs_device *dev, unsigned long flags)
 {
 	s64 l;
 #ifndef NTFS_DISABLE_DEBUG_LOGGING
@@ -767,7 +770,7 @@ ntfs_volume *ntfs_device_mount(struct nt
 	int i, j, eo;
 	u32 u;
 
-	vol = ntfs_volume_startup(dev, rwflag);
+	vol = ntfs_volume_startup(dev, flags);
 	if (!vol) {
 		ntfs_log_perror("Failed to startup volume");
 		return NULL;
@@ -1101,7 +1104,7 @@ ntfs_volume *ntfs_device_mount(struct nt
 	 * Check for dirty logfile and hibernated Windows.
 	 * We care only about read-write mounts.
 	 */
-	if (!(rwflag & MS_RDONLY)) {
+	if (!(flags & MS_RDONLY)) {
 		if (ntfs_volume_check_logfile(vol) < 0)
 			goto error_exit;
 		if (ntfs_volume_check_hiberfile(vol) < 0)
@@ -1125,15 +1128,16 @@ error_exit:
 /**
  * ntfs_mount - open ntfs volume
  * @name:	name of device/file to open
- * @rwflag:	optional mount flags
+ * @flags:	optional mount flags
  *
  * This function mounts an ntfs volume. @name should contain the name of the
  * device/file to mount as the ntfs volume.
  *
- * @rwflags is an optional second parameter. The same flags are used as for
- * the mount system call (man 2 mount). Currently only the following flag
- * is implemented:
+ * @flags is an optional second parameter. The same flags are used as for
+ * the mount system call (man 2 mount). Currently only the following flags
+ * are implemented:
  *	MS_RDONLY	- mount volume read-only
+ *	MS_NOATIME	- do not update access time
  *
  * The function opens the device or file @name and verifies that it contains a
  * valid bootsector. Then, it allocates an ntfs_volume structure and initializes
@@ -1148,7 +1152,7 @@ error_exit:
  * soon as the function returns.
  */
 ntfs_volume *ntfs_mount(const char *name __attribute__((unused)),
-		unsigned long rwflag __attribute__((unused)))
+		unsigned long flags __attribute__((unused)))
 {
 #ifndef NO_NTFS_DEVICE_DEFAULT_IO_OPS
 	struct ntfs_device *dev;
@@ -1159,7 +1163,7 @@ ntfs_volume *ntfs_mount(const char *name
 	if (!dev)
 		return NULL;
 	/* Call ntfs_device_mount() to do the actual mount. */
-	vol = ntfs_device_mount(dev, rwflag);
+	vol = ntfs_device_mount(dev, flags);
 	if (!vol) {
 		int eo = errno;
 		ntfs_device_free(dev);

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.342,1.343

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

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
* Fix bug with updating atime on read-only volumes. (Thanks to Szaka and Anton)
* Add MS_NOATIME to ntfs_mount. (By Yuval's request)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -p -r1.342 -r1.343
--- ChangeLog	14 Nov 2005 15:31:23 -0000	1.342
+++ ChangeLog	15 Nov 2005 16:31:40 -0000	1.343
@@ -88,6 +88,7 @@ xx/xx/2005 - 1.12.2-WIP
 	  stayed at approximately same level.  (Yura)
 	- Automatically update access and change time in ntfs_attr_p{read,write}
 	  and ntfs_attr_truncate.  (Yura)
+	- Add support of MS_NOATIME flag to ntfs_mount().  (Yura)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs volume.h,1.20,1.21

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

Changes by: cha0smaster

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

Modified Files:
	volume.h 
Log Message:
* Fix bug with updating atime on read-only volumes. (Thanks to Szaka and Anton)
* Add MS_NOATIME to ntfs_mount. (By Yuval's request)


Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- volume.h	3 Nov 2005 19:20:14 -0000	1.20
+++ volume.h	15 Nov 2005 16:31:40 -0000	1.21
@@ -82,6 +82,7 @@ typedef enum {
 	NV_ReadOnly,		/* 1: Volume is read-only. */
 	NV_CaseSensitive,	/* 1: Volume is mounted case-sensitive. */
 	NV_LogFileEmpty,	/* 1: $logFile journal is empty. */
+	NV_NoATime,		/* 1: Do not update access time. */
 } ntfs_volume_state_bits;
 
 #define  test_nvol_flag(nv, flag)	 test_bit(NV_##flag, (nv)->state)
@@ -100,11 +101,15 @@ typedef enum {
 #define NVolSetLogFileEmpty(nv)		  set_nvol_flag(nv, LogFileEmpty)
 #define NVolClearLogFileEmpty(nv)	clear_nvol_flag(nv, LogFileEmpty)
 
+#define NVolNoATime(nv)			 test_nvol_flag(nv, NoATime)
+#define NVolSetNoATime(nv)		  set_nvol_flag(nv, NoATime)
+#define NVolClearNoATime(nv)		clear_nvol_flag(nv, NoATime)
+
 /*
  * NTFS version 1.1 and 1.2 are used by Windows NT4.
  * NTFS version 2.x is used by Windows 2000 Beta
  * NTFS version 3.0 is used by Windows 2000.
- * NTFS version 3.1 is used by Windows XP, Windows Server 2003 and Longhorn.
+ * NTFS version 3.1 is used by Windows XP, 2003 and Vista.
  */
 
 #define NTFS_V1_1(major, minor) ((major) == 1 && (minor) == 1)
@@ -200,13 +205,13 @@ struct _ntfs_volume {
 extern ntfs_volume *ntfs_volume_alloc(void);
 
 extern ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev,
-		unsigned long rwflag);
+		unsigned long flags);
 
 extern ntfs_volume *ntfs_device_mount(struct ntfs_device *dev,
-		unsigned long rwflag);
+		unsigned long flags);
 extern int ntfs_device_umount(ntfs_volume *vol, const BOOL force);
 
-extern ntfs_volume *ntfs_mount(const char *name, unsigned long rwflag);
+extern ntfs_volume *ntfs_mount(const char *name, unsigned long flags);
 extern int ntfs_umount(ntfs_volume *vol, const BOOL force);
 
 extern int ntfs_version_is_supported(ntfs_volume *vol);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.109,1.110

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

Changes by: flatcap

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

Modified Files:
	mkntfs.c 
Log Message:
fix memleak in create_hardlink_res
transfer ownership of attrdef and vol_name to the volume

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- mkntfs.c	15 Nov 2005 14:48:10 -0000	1.109
+++ mkntfs.c	15 Nov 2005 16:24:23 -0000	1.110
@@ -3260,12 +3260,14 @@ static int create_hardlink_res(MFT_RECOR
 		ntfs_log_error("create_hardlink failed inserting index entry: %s\n",
 				strerror(-i));
 		/* FIXME: Remove the file name attribute from @m_file. */
+		free(idx_entry_new);
 		free(fn);
 		/* Undo link count increment. */
 		m_file->link_count = cpu_to_le16(
 				le16_to_cpu(m_file->link_count) - 1);
 		return i;
 	}
+	free(idx_entry_new);
 	free(fn);
 	return 0;
 }
@@ -3383,11 +3385,8 @@ static void mkntfs_exit(void)
 				ntfs_log_perror("Warning: Could not close %s", g_vol->dev->d_name);
 			ntfs_device_free(g_vol->dev);
 		}
-		/* Only free the attribute definitions, if we originally allocated them. */
-		if ((g_vol->attrdef != (const ATTR_DEF*)attrdef_ntfs12_array) &&
-		    (g_vol->attrdef != (const ATTR_DEF*)attrdef_ntfs3x_array)) {
-			free(g_vol->attrdef);
-		}
+		free(g_vol->vol_name);
+		free(g_vol->attrdef);
 		free(g_vol->upcase);
 		free(g_vol);
 		g_vol = NULL;
@@ -3514,7 +3513,7 @@ static void mkntfs_override_phys_params(
 	/* This function uses:
 	 *     g_vol
 	 *     g_volume_size
-	 */ 
+	 */
 	int i;
 
 	/* If user didn't specify the sector size, determine it now. */
@@ -4288,16 +4287,17 @@ static void mkntfs_create_root_structure
 	 *     g_volume_obj_id
 	 */
 	NTFS_BOOT_SECTOR *bs;
-	ATTR_RECORD *a;
 	MFT_RECORD *m;
-	MFT_REF root_ref, extend_ref;
-	int i, j, err;
+	MFT_REF root_ref;
+	MFT_REF extend_ref;
+	int i;
+	int j;
+	int err;
 	u8 *sd;
 	FILE_ATTR_FLAGS extend_flags;
 	VOLUME_FLAGS volume_flags = 0;
 	int nr_sysfiles;
 	u8 *buf2 = NULL;
-	int buf2_size = 0;
 	int buf_sds_first_size = 0;
 	int buf_sds_size = 0;
 	char *buf_sds_init = NULL;
@@ -4328,7 +4328,7 @@ static void mkntfs_create_root_structure
 	 * fill the rest of it with empty, formatted records.
 	 */
 	if (nr_sysfiles * (s32)g_vol->mft_record_size < g_mft_size) {
-		for (i = nr_sysfiles; 
+		for (i = nr_sysfiles;
 		      i * (s32)g_vol->mft_record_size < g_mft_size; i++) {
 			m = (MFT_RECORD *)(g_buf + i * g_vol->mft_record_size);
 			if (ntfs_mft_record_layout(g_vol, 0, m))
@@ -4422,6 +4422,7 @@ static void mkntfs_create_root_structure
 		err = upgrade_to_large_index(m, "$I30", 4, 0, &g_index_block);
 	if (!err) {
 		ntfs_attr_search_ctx *ctx;
+		ATTR_RECORD *a;
 		ctx = ntfs_attr_get_search_ctx(NULL, m);
 		if (!ctx)
 			err_exit("Failed to allocate attribute search "
@@ -4511,26 +4512,15 @@ static void mkntfs_create_root_structure
 
 	ntfs_log_verbose("Creating $AttrDef (mft record 4)\n");
 	m = (MFT_RECORD*)(g_buf + 4 * g_vol->mft_record_size);
-	if (g_vol->major_ver < 3)
-		buf2_size = 36000;
-	else
-		buf2_size = g_vol->attrdef_len;
-	buf2 = calloc(1, buf2_size);
-	if (!buf2)
-		err_exit("Failed to allocate internal buffer: %s\n",
-			strerror(errno));
-	memcpy(buf2, g_vol->attrdef, g_vol->attrdef_len);			// XXX why do we need a special buffer for this?
-	err = add_attr_data(m, NULL, 0, 0, 0, buf2, buf2_size);
-	free(buf2);
-	buf2 = NULL;
+
+	err = add_attr_data(m, NULL, 0, 0, 0, (u8*)g_vol->attrdef, g_vol->attrdef_len);
 	if (!err)
 		err = create_hardlink(g_index_block, root_ref, m,
 				MK_LE_MREF(FILE_AttrDef, FILE_AttrDef),
-				(buf2_size + g_vol->cluster_size - 1) &
-				~(g_vol->cluster_size - 1), buf2_size,
+				(g_vol->attrdef_len + g_vol->cluster_size - 1) &
+				~(g_vol->cluster_size - 1), g_vol->attrdef_len,
 				FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM, 0, 0,
 				"$AttrDef", FILE_NAME_WIN32_AND_DOS);
-	buf2_size = 0;
 	if (!err) {
 		init_system_file_sd(FILE_AttrDef, &sd, &i);
 		err = add_attr_sd(m, sd, i);
@@ -4931,7 +4921,14 @@ static int mkntfs_redirect(struct mkntfs
 	}
 
 	/* transfer some options to the volume */
-	g_vol->vol_name  = opts.label;	// XXX when this is strdup, either free it, or call ntfs_umount
+	if (opts.label) {
+		g_vol->vol_name = strdup(opts.label);
+		if (!g_vol->vol_name) {
+			ntfs_log_perror("Could not copy volume name");
+			goto done;
+		}
+	}
+
 	if (opts.ver_major) {
 		g_vol->major_ver = opts.ver_major;
 		g_vol->minor_ver = opts.ver_minor;
@@ -4958,11 +4955,22 @@ static int mkntfs_redirect(struct mkntfs
 	g_vol->indx_record_size_bits = 12;
 
 	if (g_vol->major_ver < 3) {
-		g_vol->attrdef = (ATTR_DEF*)&attrdef_ntfs12_array;
-		g_vol->attrdef_len = sizeof(attrdef_ntfs12_array);
+		g_vol->attrdef = calloc(1, 36000);
+		if (g_vol->attrdef) {
+			memcpy(g_vol->attrdef, attrdef_ntfs12_array, sizeof(attrdef_ntfs12_array));
+			g_vol->attrdef_len = 36000;
+		}
 	} else {
-		g_vol->attrdef = (ATTR_DEF*)&attrdef_ntfs3x_array;
-		g_vol->attrdef_len = sizeof(attrdef_ntfs3x_array);
+		g_vol->attrdef = malloc(sizeof(attrdef_ntfs3x_array));
+		if (g_vol->attrdef) {
+			memcpy(g_vol->attrdef, attrdef_ntfs3x_array, sizeof(attrdef_ntfs3x_array));
+			g_vol->attrdef_len = sizeof(attrdef_ntfs3x_array);
+		}
+	}
+
+	if (!g_vol->attrdef) {
+		ntfs_log_perror("Could not create attrdef structure");
+		goto done;
 	}
 
 	if (mkntfs_open_partition())		/* Open the partition. */

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.108,1.109

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

Changes by: flatcap

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

Modified Files:
	mkntfs.c 
Log Message:
*ahem* zero isn't true

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- mkntfs.c	15 Nov 2005 04:14:37 -0000	1.108
+++ mkntfs.c	15 Nov 2005 14:48:10 -0000	1.109
@@ -4932,7 +4932,7 @@ static int mkntfs_redirect(struct mkntfs
 
 	/* transfer some options to the volume */
 	g_vol->vol_name  = opts.label;	// XXX when this is strdup, either free it, or call ntfs_umount
-	if (opts.ver_major && opts.ver_minor) {
+	if (opts.ver_major) {
 		g_vol->major_ver = opts.ver_major;
 		g_vol->minor_ver = opts.ver_minor;
 	} else {

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.195,1.196

[Yura P. <y.p...@sa...>]

On Tue, 2005-11-15 at 10:41 +0000, Anton Altaparmakov wrote:
> On Mon, 14 Nov 2005, Yura Pakhuchiy wrote:
> > Changes by: cha0smaster
> > 
> > Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
> > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18573/libntfs
> > 
> > Modified Files:
> > 	attrib.c 
> > Log Message:
> > Automatically update access and change time in ntfs_attr_p{read,write}          and ntfs_attr_truncate.
> > 
> > 
> > Index: attrib.c
> > ===================================================================
> > RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
> > retrieving revision 1.195
> > retrieving revision 1.196
> > diff -u -p -r1.195 -r1.196
> > --- attrib.c	14 Nov 2005 00:17:19 -0000	1.195
> > +++ attrib.c	14 Nov 2005 15:31:23 -0000	1.196
> > @@ -55,6 +55,7 @@
> >  #include "compress.h"
> >  #include "bitmap.h"
> >  #include "logging.h"
> > +#include "ntfstime.h"
> >  
> >  ntfschar AT_UNNAMED[] = { const_cpu_to_le16('\0') };
> >  
> > @@ -769,6 +770,12 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
> >  		errno = EACCES;
> >  		return -1;
> >  	}
> > +	/* Update access time if accessing unnamed data attribute. */
> > +	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
> > +		na->ni->last_access_time = time(NULL);
> > +		NInoFileNameSetDirty(na->ni);
> > +		NInoSetDirty(na->ni);
> > +	}
> 
> This is a bug...  You can't do atime updates on read-only volumes.  You 
> need to check if the volume is read-only and only if not perform the 
> update.  This breaks the entirety of libntfs/ntfsprogs that use 
> read-only mounts for sure.

A lot of utils use read-only mounts if --no-action option passed to
them, they call ntfs_attr_pwrite and it is OK, but why updating atime is
evil in this case?

-- 
Best regards,
        Yura

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.195,1.196

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

On Mon, 14 Nov 2005, Yura Pakhuchiy wrote:
> Changes by: cha0smaster
> 
> Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18573/libntfs
> 
> Modified Files:
> 	attrib.c 
> Log Message:
> Automatically update access and change time in ntfs_attr_p{read,write}          and ntfs_attr_truncate.
> 
> 
> Index: attrib.c
> ===================================================================
> RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
> retrieving revision 1.195
> retrieving revision 1.196
> diff -u -p -r1.195 -r1.196
> --- attrib.c	14 Nov 2005 00:17:19 -0000	1.195
> +++ attrib.c	14 Nov 2005 15:31:23 -0000	1.196
> @@ -55,6 +55,7 @@
>  #include "compress.h"
>  #include "bitmap.h"
>  #include "logging.h"
> +#include "ntfstime.h"
>  
>  ntfschar AT_UNNAMED[] = { const_cpu_to_le16('\0') };
>  
> @@ -769,6 +770,12 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
>  		errno = EACCES;
>  		return -1;
>  	}
> +	/* Update access time if accessing unnamed data attribute. */
> +	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
> +		na->ni->last_access_time = time(NULL);
> +		NInoFileNameSetDirty(na->ni);
> +		NInoSetDirty(na->ni);
> +	}

This is a bug...  You can't do atime updates on read-only volumes.  You 
need to check if the volume is read-only and only if not perform the 
update.  This breaks the entirety of libntfs/ntfsprogs that use 
read-only mounts for sure.

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.107,1.108

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

Changes by: flatcap

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

Modified Files:
	mkntfs.c 
Log Message:
tidy 8 variables whose scope was quite limited

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- mkntfs.c	15 Nov 2005 01:02:12 -0000	1.107
+++ mkntfs.c	15 Nov 2005 04:14:37 -0000	1.108
@@ -167,13 +167,6 @@ const char *EXEC_NAME = "mkntfs";
  * Need these global so mkntfs_exit can access them.
  */
 u8		  *g_buf		  = NULL;
-u8		  *g_buf2		  = NULL;
-int		   g_buf2_size		  = 0;
-char		  *g_buf_sds		  = NULL;
-char		  *g_buf_sds_init	  = NULL;
-int		   g_buf_sds_size	  = 0;
-int		   g_buf_sds_first_size	  = 0;
-int		   g_mft_bitmap_size	  = 0;
 int		   g_mft_bitmap_byte_size = 0;
 u8		  *g_mft_bitmap		  = NULL;
 int		   g_lcn_bitmap_byte_size = 0;
@@ -184,11 +177,8 @@ runlist		  *g_rl_mftmirr		  = NULL;
 runlist		  *g_rl_logfile		  = NULL;
 runlist		  *g_rl_boot		  = NULL;
 runlist		  *g_rl_bad		  = NULL;
-runlist		  *g_rl_index		  = NULL;
 INDEX_ALLOCATION  *g_index_block	  = NULL;
 ntfs_volume	  *g_vol		  = NULL;
-
-/* globals demoted from mkntfs_options */
 long long	   g_volume_size	  = 0;		/* in bytes */
 int		   g_mft_size		  = 0;		/* The bigger of 16kB & one cluster */
 long long	   g_mft_lcn		  = 0;		/* lcn of $MFT, $DATA attribute */
@@ -1183,7 +1173,7 @@ static void deallocate_scattered_cluster
  * TODO: We should be returning the size as well, but for mkntfs this is not
  * necessary.
  */
-static runlist *allocate_scattered_clusters(s64 clusters)
+static runlist * allocate_scattered_clusters(s64 clusters)
 {
 	runlist *rl = NULL, *rlt;
 	VCN vcn = 0LL;
@@ -3406,15 +3396,11 @@ static void mkntfs_exit(void)
 	/* Free any memory we've used */
 	free(g_bad_blocks);	g_bad_blocks	= NULL;
 	free(g_buf);		g_buf		= NULL;
-	free(g_buf2);		g_buf2		= NULL;
-	free(g_buf_sds);	g_buf_sds	= NULL;
-	free(g_buf_sds_init);	g_buf_sds_init	= NULL;
 	free(g_index_block);	g_index_block	= NULL;
 	free(g_lcn_bitmap);	g_lcn_bitmap	= NULL;
 	free(g_mft_bitmap);	g_mft_bitmap	= NULL;
 	free(g_rl_bad);		g_rl_bad	= NULL;
 	free(g_rl_boot);	g_rl_boot	= NULL;
-	free(g_rl_index);	g_rl_index	= NULL;
 	free(g_rl_logfile);	g_rl_logfile	= NULL;
 	free(g_rl_mft);		g_rl_mft	= NULL;
 	free(g_rl_mft_bmp);	g_rl_mft_bmp	= NULL;
@@ -3758,12 +3744,12 @@ static void mkntfs_initialize_bitmaps(vo
 	 *     g_lcn_bitmap_byte_size
 	 *     g_mft_bitmap
 	 *     g_mft_bitmap_byte_size
-	 *     g_mft_bitmap_size
 	 *     g_mft_size
 	 *     g_rl_mft_bmp
 	 *     g_vol
 	 */
 	u64 i;
+	int mft_bitmap_size;
 
 	/* Determine lcn bitmap byte size and allocate it. */
 	g_lcn_bitmap_byte_size = (g_vol->nr_clusters + 7) >> 3;
@@ -3793,13 +3779,13 @@ static void mkntfs_initialize_bitmaps(vo
 		g_mft_size = g_vol->cluster_size;
 	ntfs_log_debug("MFT size = %i (0x%x) bytes\n", g_mft_size, g_mft_size);
 	/* Determine mft bitmap size and allocate it. */
-	g_mft_bitmap_size = g_mft_size / g_vol->mft_record_size;
+	mft_bitmap_size = g_mft_size / g_vol->mft_record_size;
 	/* Convert to bytes, at least one. */
-	g_mft_bitmap_byte_size = (g_mft_bitmap_size + 7) >> 3;
+	g_mft_bitmap_byte_size = (mft_bitmap_size + 7) >> 3;
 	/* Mft bitmap is allocated in multiples of 8 bytes. */
 	g_mft_bitmap_byte_size = (g_mft_bitmap_byte_size + 7) & ~7;
-	ntfs_log_debug("g_mft_bitmap_size = %i, g_mft_bitmap_byte_size = %i\n",
-			g_mft_bitmap_size, g_mft_bitmap_byte_size);
+	ntfs_log_debug("mft_bitmap_size = %i, g_mft_bitmap_byte_size = %i\n",
+			mft_bitmap_size, g_mft_bitmap_byte_size);
 	g_mft_bitmap = calloc(1, g_mft_bitmap_byte_size);
 	if (!g_mft_bitmap)
 		err_exit("Failed to allocate internal buffer: %s\n",
@@ -4139,19 +4125,20 @@ static void mkntfs_fill_device_with_zero
  * mkntfs_sync_index_record
  *
  * (ERSO) made a function out of this, but the reason for doing that
- * disapeared during coding....
+ * disappeared during coding....
  */
 static void mkntfs_sync_index_record(INDEX_ALLOCATION* idx, MFT_RECORD* m,
 		ntfschar* name, u32 name_len)
 {
 	/* This function uses:
-	 *     g_rl_index
 	 *     g_vol
 	 */
 	int i, err;
 	ntfs_attr_search_ctx *ctx;
 	ATTR_RECORD *a;
 	long long lw;
+	runlist	*rl_index = NULL;
+
 	i = 5 * sizeof(ntfschar);
 	ctx = ntfs_attr_get_search_ctx(NULL, m);
 
@@ -4165,24 +4152,28 @@ static void mkntfs_sync_index_record(IND
 		err_exit("BUG: $INDEX_ALLOCATION attribute not found.\n");
 	}
 	a = ctx->attr;
-	g_rl_index = ntfs_mapping_pairs_decompress(g_vol, a, NULL);
-	if (!g_rl_index) {
+	rl_index = ntfs_mapping_pairs_decompress(g_vol, a, NULL);
+	if (!rl_index) {
 		ntfs_attr_put_search_ctx(ctx);
 		err_exit("Failed to decompress runlist of $INDEX_ALLOCATION "
 				"attribute.\n");
 	}
 	if (sle64_to_cpu(a->initialized_size) < i) {
 		ntfs_attr_put_search_ctx(ctx);
+		free(rl_index);
 		err_exit("BUG: $INDEX_ALLOCATION attribute too short.\n");
 	}
 	ntfs_attr_put_search_ctx(ctx);
 	i = sizeof(INDEX_BLOCK) - sizeof(INDEX_HEADER) +
 			le32_to_cpu(idx->index.allocated_size);
 	err = ntfs_mst_pre_write_fixup((NTFS_RECORD*)idx, i);
-	if (err)
+	if (err) {
+		free(rl_index);
 		err_exit("ntfs_mst_pre_write_fixup() failed while "
 			"syncing index block.\n");
-	lw = ntfs_rlwrite(g_vol->dev, g_rl_index, (u8*)idx, i, NULL);
+	}
+	lw = ntfs_rlwrite(g_vol->dev, rl_index, (u8*)idx, i, NULL);
+	free(rl_index);
 	if (lw != i)
 		err_exit("Error writing $INDEX_ALLOCATION.\n");
 	/* No more changes to @idx below here so no need for fixup: */
@@ -4278,10 +4269,6 @@ static void mkntfs_create_root_structure
 {
 	/* This function uses:
 	 *     g_buf
-	 *     g_buf_sds
-	 *     g_buf_sds_first_size
-	 *     g_buf_sds_init
-	 *     g_buf_sds_size
 	 *     g_index_block
 	 *     g_lcn_bitmap
 	 *     g_lcn_bitmap_byte_size
@@ -4309,6 +4296,12 @@ static void mkntfs_create_root_structure
 	FILE_ATTR_FLAGS extend_flags;
 	VOLUME_FLAGS volume_flags = 0;
 	int nr_sysfiles;
+	u8 *buf2 = NULL;
+	int buf2_size = 0;
+	int buf_sds_first_size = 0;
+	int buf_sds_size = 0;
+	char *buf_sds_init = NULL;
+	char *buf_sds = NULL;
 
 	ntfs_log_quiet("Creating NTFS volume structures.\n");
 	nr_sysfiles = g_vol->major_ver < 3 ? 16 : 27;
@@ -4493,15 +4486,15 @@ static void mkntfs_create_root_structure
 	/* dump_mft_record(m); */
 	ntfs_log_verbose("Creating $LogFile (mft record 2)\n");
 	m = (MFT_RECORD*)(g_buf + 2 * g_vol->mft_record_size);
-	g_buf2 = malloc(g_logfile_size);
-	if (!g_buf2)
+	buf2 = malloc(g_logfile_size);
+	if (!buf2)
 		err_exit("Failed to allocate internal buffer: %s\n",
 				strerror(errno));
-	memset(g_buf2, -1, g_logfile_size);
-	err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_logfile, g_buf2,
+	memset(buf2, -1, g_logfile_size);
+	err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_logfile, buf2,
 			g_logfile_size);
-	free(g_buf2);
-	g_buf2 = NULL;
+	free(buf2);
+	buf2 = NULL;
 	if (!err)
 		err = create_hardlink(g_index_block, root_ref, m,
 				MK_LE_MREF(FILE_LogFile, FILE_LogFile),
@@ -4519,25 +4512,25 @@ static void mkntfs_create_root_structure
 	ntfs_log_verbose("Creating $AttrDef (mft record 4)\n");
 	m = (MFT_RECORD*)(g_buf + 4 * g_vol->mft_record_size);
 	if (g_vol->major_ver < 3)
-		g_buf2_size = 36000;
+		buf2_size = 36000;
 	else
-		g_buf2_size = g_vol->attrdef_len;
-	g_buf2 = calloc(1, g_buf2_size);
-	if (!g_buf2)
+		buf2_size = g_vol->attrdef_len;
+	buf2 = calloc(1, buf2_size);
+	if (!buf2)
 		err_exit("Failed to allocate internal buffer: %s\n",
 			strerror(errno));
-	memcpy(g_buf2, g_vol->attrdef, g_vol->attrdef_len);			// XXX why do we need a special buffer for this?
-	err = add_attr_data(m, NULL, 0, 0, 0, g_buf2, g_buf2_size);
-	free(g_buf2);
-	g_buf2 = NULL;
+	memcpy(buf2, g_vol->attrdef, g_vol->attrdef_len);			// XXX why do we need a special buffer for this?
+	err = add_attr_data(m, NULL, 0, 0, 0, buf2, buf2_size);
+	free(buf2);
+	buf2 = NULL;
 	if (!err)
 		err = create_hardlink(g_index_block, root_ref, m,
 				MK_LE_MREF(FILE_AttrDef, FILE_AttrDef),
-				(g_buf2_size + g_vol->cluster_size - 1) &
-				~(g_vol->cluster_size - 1), g_buf2_size,
+				(buf2_size + g_vol->cluster_size - 1) &
+				~(g_vol->cluster_size - 1), buf2_size,
 				FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM, 0, 0,
 				"$AttrDef", FILE_NAME_WIN32_AND_DOS);
-	g_buf2_size = 0;
+	buf2_size = 0;
 	if (!err) {
 		init_system_file_sd(FILE_AttrDef, &sd, &i);
 		err = add_attr_sd(m, sd, i);
@@ -4571,17 +4564,17 @@ static void mkntfs_create_root_structure
 	/* dump_mft_record(m); */
 	ntfs_log_verbose("Creating $Boot (mft record 7)\n");
 	m = (MFT_RECORD*)(g_buf + 7 * g_vol->mft_record_size);
-	g_buf2 = calloc(1, 8192);
-	if (!g_buf2)
+	buf2 = calloc(1, 8192);
+	if (!buf2)
 		err_exit("Failed to allocate internal buffer: %s\n",
 				strerror(errno));
-	memcpy(g_buf2, boot_array, sizeof(boot_array));
+	memcpy(buf2, boot_array, sizeof(boot_array));
 	/*
-	 * Create the boot sector in g_buf2. Note, that g_buf2 is already zeroed
+	 * Create the boot sector in buf2. Note, that buf2 is already zeroed
 	 * in the boot sector section and that it has the NTFS OEM id/magic
 	 * already inserted, so no need to worry about these things.
 	 */
-	bs = (NTFS_BOOT_SECTOR*)g_buf2;
+	bs = (NTFS_BOOT_SECTOR*)buf2;
 	bs->bpb.bytes_per_sector = cpu_to_le16(opts.sector_size);
 	bs->bpb.sectors_per_cluster = (u8)(g_vol->cluster_size /
 			opts.sector_size);
@@ -4607,10 +4600,12 @@ static void mkntfs_create_root_structure
 	} else {
 		bs->clusters_per_mft_record = -(ffs(g_vol->mft_record_size) - 1);
 		if ((u32)(1 << -bs->clusters_per_mft_record) !=
-				g_vol->mft_record_size)
+				g_vol->mft_record_size) {
+			free(buf2);
 			err_exit("BUG: calculated clusters_per_mft_record "
 					"is wrong (= 0x%x)\n",
 					bs->clusters_per_mft_record);
+		}
 	}
 	ntfs_log_debug("clusters per mft record = %i (0x%x)\n",
 			bs->clusters_per_mft_record,
@@ -4620,10 +4615,12 @@ static void mkntfs_create_root_structure
 			g_vol->cluster_size;
 	} else {
 		bs->clusters_per_index_record = -g_vol->indx_record_size_bits;
-		if ((1 << -bs->clusters_per_index_record) != (s32)g_vol->indx_record_size)
+		if ((1 << -bs->clusters_per_index_record) != (s32)g_vol->indx_record_size) {
+			free(buf2);
 			err_exit("BUG: calculated clusters_per_index_record "
 					"is wrong (= 0x%x)\n",
 					bs->clusters_per_index_record);
+		}
 	}
 	ntfs_log_debug("clusters per index block = %i (0x%x)\n",
 			bs->clusters_per_index_record,
@@ -4637,9 +4634,11 @@ static void mkntfs_create_root_structure
 	 */
 	bs->checksum = cpu_to_le32(0);
 	/* Make sure the bootsector is ok. */
-	if (!ntfs_boot_sector_is_ntfs(bs, TRUE))
+	if (!ntfs_boot_sector_is_ntfs(bs, TRUE)) {
+		free(buf2);
 		err_exit("FATAL: Generated boot sector is invalid!\n");
-	err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_boot, g_buf2, 8192);
+	}
+	err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_boot, buf2, 8192);
 	if (!err)
 		err = create_hardlink(g_index_block, root_ref, m,
 				MK_LE_MREF(FILE_Boot, FILE_Boot),
@@ -4651,10 +4650,12 @@ static void mkntfs_create_root_structure
 		init_system_file_sd(FILE_Boot, &sd, &i);
 		err = add_attr_sd(m, sd, i);
 	}
-	if (err < 0)
+	if (err < 0) {
+		free(buf2);
 		err_exit("Couldn't create $Boot: %s\n", strerror(-err));
+	}
 
-	if (create_backup_boot_sector(g_buf2)) {
+	if (create_backup_boot_sector(buf2)) {
 		/*
 		 * Pre-2.6 kernels couldn't access the last sector
 		 * if it was odd hence we schedule chkdsk to create it.
@@ -4662,8 +4663,8 @@ static void mkntfs_create_root_structure
 		volume_flags |= VOLUME_IS_DIRTY;
 	}
 
-	free(g_buf2);
-	g_buf2 = NULL;
+	free(buf2);
+	buf2 = NULL;
 
 	create_file_volume(m, root_ref, volume_flags);
 
@@ -4720,26 +4721,28 @@ static void mkntfs_create_root_structure
 					"$Secure", FILE_NAME_WIN32_AND_DOS);
 		if (!err) {
 			if (g_vol->minor_ver == 0) {
-				g_buf_sds_first_size = 0x1E0;
-				g_buf_sds_size = 0x40000 + g_buf_sds_first_size;
-				g_buf_sds_init = calloc(1, g_buf_sds_first_size);
-				init_secure_30(g_buf_sds_init);
+				buf_sds_first_size = 0x1E0;
+				buf_sds_size = 0x40000 + buf_sds_first_size;
+				buf_sds_init = calloc(1, buf_sds_first_size);
+				init_secure_30(buf_sds_init);
 			} else {
-				g_buf_sds_first_size = 0x240;
-				g_buf_sds_size = 0x40000 + g_buf_sds_first_size;
-				g_buf_sds_init = calloc(1, g_buf_sds_first_size);
-				init_secure_31(g_buf_sds_init);
+				buf_sds_first_size = 0x240;
+				buf_sds_size = 0x40000 + buf_sds_first_size;
+				buf_sds_init = calloc(1, buf_sds_first_size);
+				init_secure_31(buf_sds_init);
 			}
-			g_buf_sds = calloc(1,g_buf_sds_size);
-			if (!g_buf_sds)
+			buf_sds = calloc(1,buf_sds_size);
+			if (!buf_sds) {
+				free(buf_sds_init);
 				err_exit("Failed to allocate internal buffer:"
 					" %s\n", strerror(errno));
-			memcpy((char*)g_buf_sds, (char*)g_buf_sds_init,
-				g_buf_sds_first_size);
-			memcpy((char*)g_buf_sds + 0x40000, (char*)g_buf_sds_init,
-				g_buf_sds_first_size);
-			err = add_attr_data(m, "$SDS", 4, 0, 0, (u8*)g_buf_sds,
-				g_buf_sds_size);
+			}
+			memcpy(buf_sds, buf_sds_init, buf_sds_first_size);
+			memcpy(buf_sds + 0x40000, buf_sds_init,
+				buf_sds_first_size);
+			err = add_attr_data(m, "$SDS", 4, 0, 0, (u8*)buf_sds,
+				buf_sds_size);
+			free(buf_sds);
 		}
 		/* FIXME: This should be IGNORE_CASE */
 		if (!err)
@@ -4751,7 +4754,10 @@ static void mkntfs_create_root_structure
 			err = add_attr_index_root(m, "$SII", 4, 0, AT_UNUSED,
 				COLLATION_NTOFS_ULONG, g_vol->indx_record_size);
 		if (!err)
-			err = initialize_secure(g_buf_sds_init, g_buf_sds_first_size, m);
+			err = initialize_secure(buf_sds_init, buf_sds_first_size, m);
+
+		free (buf_sds_init);
+		buf_sds_init = NULL;
 		if (err < 0)
 			err_exit("Couldn't create $Secure: %s\n",
 				strerror(-err));

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

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Pad QUOTA_O_INDEX_DATA with the magic 32 value.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- mkntfs.c	13 Nov 2005 22:40:19 -0000	1.106
+++ mkntfs.c	15 Nov 2005 01:02:12 -0000	1.107
@@ -2973,7 +2973,8 @@ static int initialize_quota(MFT_RECORD *
 	idx_entry_o_data = (QUOTA_O_INDEX_DATA*)((char*)idx_entry_o
 			+ idx_entry_o->data_offset);
 	idx_entry_o_data->owner_id  = QUOTA_FIRST_USER_ID;
-		/* 20 00 00 00 padding after here on ntfs 3.1 ?? */
+	/* 20 00 00 00 padding after here on ntfs 3.1. 3.0 is unchecked. */
+	idx_entry_o_data->unknown = cpu_to_le32(32);
 
 	err = insert_index_entry_in_res_dir_index(idx_entry_o,
 		o_size, m,

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

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

Changes by: szaka

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

Modified Files:
	layout.h 
Log Message:
Update QUOTA_CONTROL_ENTRY and QUOTA_O_INDEX_DATA description


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- layout.h	12 Nov 2005 15:35:51 -0000	1.47
+++ layout.h	15 Nov 2005 01:00:22 -0000	1.48
@@ -1922,13 +1922,6 @@ typedef struct {
 typedef SECURITY_DESCRIPTOR_HEADER SII_INDEX_DATA;
 
 /**
- * struct QUOTA_O_INDEX_DATA -
- */
-typedef struct {
-	u32 owner_id;
-} __attribute__((__packed__)) QUOTA_O_INDEX_DATA;
-
-/**
  * struct SDS_ENTRY -
  *
  * The $SDS data stream contains the security descriptors, aligned on 16-byte
@@ -2221,12 +2214,28 @@ typedef struct {
 	s64 threshold;		/* Soft quota (-1 if not limited). */
 	s64 limit;		/* Hard quota (-1 if not limited). */
 	s64 exceeded_time;	/* How long the soft quota has been exceeded. */
+/* The below field is NOT present for the quota defaults entry. */
 	SID sid;		/* The SID of the user/object associated with
-				   this quota entry. Equals zero for the quota
-				   defaults entry. */
+				   this quota entry. If this field is missing
+				   then the INDEX_ENTRY is padded with zeros
+				   to multiply of 8 which are not counted in
+				   the data_length field. If the sid is present
+				   then this structure is padded with zeros to
+				   multiply of 8 and the padding is counted in
+				   the INDEX_ENTRY's data_length. */
 } __attribute__((__packed__)) QUOTA_CONTROL_ENTRY;
 
 /**
+ * struct QUOTA_O_INDEX_DATA -
+ */
+typedef struct {
+	u32 owner_id;
+	u32 unknown;		/* Always 32. Seems to be padding and it's not
+				   counted in the INDEX_ENTRY's data_length.
+				   This field shouldn't be really here. */
+} __attribute__((__packed__)) QUOTA_O_INDEX_DATA;
+
+/**
  * enum PREDEFINED_OWNER_IDS - Predefined owner_id values (32-bit).
  */
 typedef enum {

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.99,1.100

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

Hi FlatCap,

On Mon, 14 Nov 2005, Richard Russon wrote:

> > Restore correct V3.1 $AttrDef creation which got last by the recent command 
> > line parsing rewrite. Thanks to ntfscmp for catching this! :)
> 
> Damn!  Sorry about that, Szaka.  I was trying hard not to make any code
> changes.

Only those can make mistake who actually work ;) ntfscmp caught it
immediately, anyway.

There was another change, I don't know if it was intentional or not. The
maximum value of the number of sectors and the start position increased
from max of strtoul() to strtoll(). But this change was actually handy,
otherwise I couldn't have immediately created a 16 TB volume on Friday to
demonstrate on the ntfs-dev list that our tools also work on 2+ TB volumes :)

There is check in mkntfs to enforce the maximum volume size limits for
given cluster sizes and they seem to work.

Cheers,
	Szaka

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.104,1.105

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

On Mon, 14 Nov 2005, Anton Altaparmakov wrote:
> On Sun, 13 Nov 2005, Szakacsits Szabolcs wrote:
> > 
> > In short none of us was right, the truth is between them.
> 
> Interesting!  Well discovered!  (-:  I only ever tried 64k cluster size 
> and did the smaller ones by assumption.  You obviously had done the 
> smaller one and did not see need to do it.  

Just as you say! :-) 

When I noticed that 32 and 64 kB cluster sizes don't work anymore I
started to fix them. More and more changes were needed and when I arrived
to the need of libntfs changes I got a 64 kB image as a sample which to my
great shock had the empty records! Thus I rechecked the 4 kB cluster size
case whether I made a mistake. But no, there is no any empty records
there. Thus I reverted all my fixes, reverted removed empty record
creation and modified them accordingly.

> Thanks for figuring it out properly.  (-:

I hope so :-) It is correct now for 4 and 64 kB cluster size. The others
are still assumptions ;-) But I'm confident: I can't imagine including
more hacks for such simple operation. I plan to check out all valid
cluster sizes when I'm finished with the ntfscmp list.

> > And this is what's left for mkntfs v3.1:
> > 
> > Inode 0 attribute 0x30 content:   DIFFER
> > Inode 0 attribute 0x80 content:   DIFFER
>
    [ ... ]
> 
> Cool.  The list is really shrinking nicely.  Are the 0x30 differences just 
> timestamps 

No, timestamps are wiped by ntfsclone, so they are same.

> or is there more to it?

Most seem to be 'format' bug or feature. Usually incorrect data and
allocation sizes.

Also, $Secure:0x30 sometimes doesn't have any flag set which are set in
0x10. I checked many images and it's quite consistent: they either has
them set correctly or all is missing. Weird.

Cheers,
	Szaka 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.341,1.342

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

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
Automatically update access and change time in ntfs_attr_p{read,write}          and ntfs_attr_truncate.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -p -r1.341 -r1.342
--- ChangeLog	14 Nov 2005 00:17:19 -0000	1.341
+++ ChangeLog	14 Nov 2005 15:31:23 -0000	1.342
@@ -86,6 +86,8 @@ xx/xx/2005 - 1.12.2-WIP
 	  users to submit it, thus write speed to very fragmented files
 	  dramatically increased, while write speed to low fragmented files
 	  stayed at approximately same level.  (Yura)
+	- Automatically update access and change time in ntfs_attr_p{read,write}
+	  and ntfs_attr_truncate.  (Yura)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.195,1.196

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

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
Automatically update access and change time in ntfs_attr_p{read,write}          and ntfs_attr_truncate.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- attrib.c	14 Nov 2005 00:17:19 -0000	1.195
+++ attrib.c	14 Nov 2005 15:31:23 -0000	1.196
@@ -55,6 +55,7 @@
 #include "compress.h"
 #include "bitmap.h"
 #include "logging.h"
+#include "ntfstime.h"
 
 ntfschar AT_UNNAMED[] = { const_cpu_to_le16('\0') };
 
@@ -769,6 +770,12 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
 		errno = EACCES;
 		return -1;
 	}
+	/* Update access time if accessing unnamed data attribute. */
+	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
+		na->ni->last_access_time = time(NULL);
+		NInoFileNameSetDirty(na->ni);
+		NInoSetDirty(na->ni);
+	}
 	if (!count)
 		return 0;
 	/* Truncate reads beyond end of attribute. */
@@ -951,6 +958,13 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 		errno = EOPNOTSUPP;
 		return -1;
 	}
+	/* Update time if writing to unnamed data attribute. */
+	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
+		na->ni->last_data_change_time = time(NULL);
+		na->ni->last_mft_change_time = time(NULL);
+		NInoFileNameSetDirty(na->ni);
+		NInoSetDirty(na->ni);
+	}
 	if (!count)
 		return 0;
 	/* If the write reaches beyond the end, extend the attribute. */
@@ -4915,9 +4929,10 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 			ret = ntfs_non_resident_attr_shrink(na, newsize);
 	} else
 		ret = ntfs_resident_attr_resize(na, newsize);
-	/* Set FILE_NAME dirty flag, to update file length in the index. */
+	/* Set FILE_NAME dirty flag, to update length and time in the index. */
 	if (na->type == AT_DATA && na->name == AT_UNNAMED) {
-		NInoFileNameSetDirty(na->ni);
+		na->ni->last_data_change_time = time(NULL);
+		na->ni->last_mft_change_time = time(NULL);
 		na->ni->data_size = na->data_size;
 		/*
 		 * If attribute sparse or compressed then allocated size in
@@ -4928,6 +4943,7 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 			na->ni->allocated_size = na->compressed_size;
 		else
 			na->ni->allocated_size = na->allocated_size;
+		NInoFileNameSetDirty(na->ni);
 	}
 	return ret;
 }

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.99,1.100

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

Hi Szaka,

> Restore correct V3.1 $AttrDef creation which got last by the recent command 
> line parsing rewrite. Thanks to ntfscmp for catching this! :)

Damn!  Sorry about that, Szaka.  I was trying hard not to make any code
changes.

Cheers,
  FlatCap (Rich)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscp.c,1.32,1.33 ntfsmount.8.in,1.11,1.12 ntfsmount.c,1.56,1.57

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

Changes by: cha0smaster

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

Modified Files:
	ntfscp.c ntfsmount.8.in ntfsmount.c 
Log Message:
* update ntfsmount to new logging, remove all #ifdef #DEBUG, add debug option
* ntfsmount: enable kernel_cache for fuse >= 2.4.0 by default
* ntfscp fix style in code introduced by Rich


Index: ntfscp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ntfscp.c	29 Oct 2005 01:05:11 -0000	1.32
+++ ntfscp.c	14 Nov 2005 12:19:39 -0000	1.33
@@ -79,8 +79,8 @@ volatile sig_atomic_t caught_terminate =
  */
 static void version(void)
 {
-	ntfs_log_info("\n%s v%s (libntfs %s) - Overwrite files on NTFS volume.\n\n",
-		EXEC_NAME, VERSION, ntfs_libntfs_version());
+	ntfs_log_info("\n%s v%s (libntfs %s) - Overwrite files on NTFS "
+		"volume.\n\n", EXEC_NAME, VERSION, ntfs_libntfs_version());
 	ntfs_log_info("Copyright (c) 2004-2005 Yura Pakhuchiy\n");
 	ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
 }
@@ -160,13 +160,15 @@ static int parse_options(int argc, char 
 			} else if (!opts.dest_file) {
 				opts.dest_file = argv[optind - 1];
 			} else {
-				ntfs_log_error("You must specify exactly 2 files.\n");
+				ntfs_log_error("You must specify exactly two "
+						"files.\n");
 				err++;
 			}
 			break;
 		case 'a':
 			if (opts.attribute != AT_DATA) {
-				ntfs_log_error("You can specify only 1 attribute.\n");
+				ntfs_log_error("You can specify only one "
+						"attribute.\n");
 				err++;
 				break;
 			}
@@ -186,8 +188,8 @@ static int parse_options(int argc, char 
 			break;
 		case 'h':
 		case '?':
-			if (strncmp (argv[optind-1], "--log-", 6) == 0) {
-				if (!ntfs_log_parse_option (argv[optind-1]))
+			if (strncmp(argv[optind - 1], "--log-", 6) == 0) {
+				if (!ntfs_log_parse_option(argv[optind - 1]))
 					err++;
 				break;
 			}
@@ -195,8 +197,8 @@ static int parse_options(int argc, char 
 			break;
 		case 'N':
 			if (opts.attr_name) {
-				ntfs_log_error("You can specify only one attribute "
-						"name.\n");
+				ntfs_log_error("You can specify only one "
+						"attribute name.\n");
 				err++;
 			} else
 				opts.attr_name = argv[optind - 1];
@@ -216,7 +218,8 @@ static int parse_options(int argc, char 
 			ntfs_log_set_levels(NTFS_LOG_LEVEL_VERBOSE);
 			break;
 		default:
-			ntfs_log_error("Unknown option '%s'.\n", argv[optind - 1]);
+			ntfs_log_error("Unknown option '%s'.\n",
+					argv[optind - 1]);
 			err++;
 			break;
 		}
@@ -239,13 +242,14 @@ static int parse_options(int argc, char 
 			ntfs_log_error("You must specify a source file.\n");
 			err++;
 		} else if (!opts.dest_file) {
-			ntfs_log_error("You must specify a destination file.\n");
+			ntfs_log_error("You must specify a destination "
+					"file.\n");
 			err++;
 		}
 
 		if (opts.quiet && opts.verbose) {
-			ntfs_log_error("You may not use --quiet and --verbose at the "
-					"same time.\n");
+			ntfs_log_error("You may not use --quiet and --verbose "
+					"at the same time.\n");
 			err++;
 		}
 	}
@@ -383,7 +387,8 @@ int main(int argc, char *argv[])
 		out = ntfs_pathname_to_inode(vol, NULL, new_dest_file);
 		free(new_dest_file);
 		if (!out) {
-			ntfs_log_perror("ERROR: Failed to open destination file");
+			ntfs_log_perror("ERROR: Failed to open destination "
+					"file");
 			goto close_src;
 		}
 	}
@@ -392,7 +397,8 @@ int main(int argc, char *argv[])
 		attr_name = NULL;
 		attr_name_len = ntfs_mbstoucs(opts.attr_name, &attr_name, 0);
 		if (attr_name_len == -1) {
-			ntfs_log_perror("ERROR: Failed to parse attribute name");
+			ntfs_log_perror("ERROR: Failed to parse attribute "
+					"name");
 			goto close_dst;
 		}
 	} else
@@ -412,7 +418,8 @@ int main(int argc, char *argv[])
 		na = ntfs_attr_open(out, opts.attribute, attr_name,
 				attr_name_len);
 		if (!na) {
-			ntfs_log_perror("ERROR: Couldn't open just added attribute");
+			ntfs_log_perror("ERROR: Couldn't open just added "
+					"attribute");
 			goto close_dst;
 		}
 	}
@@ -437,7 +444,8 @@ int main(int argc, char *argv[])
 	offset = 0;
 	while (!feof(in)) {
 		if (caught_terminate) {
-			ntfs_log_error("SIGTERM or SIGINT received. Aborting write.\n");
+			ntfs_log_error("SIGTERM or SIGINT received.  "
+					"Aborting write.\n");
 			break;
 		}
 		br = fread(buf, 1, NTFS_BUF_SIZE, in);
@@ -463,7 +471,7 @@ close_dst:
 			ntfs_log_error("Sync failed. Run chkdsk.\n");
 			break;
 		}
-		ntfs_log_error("Device busy. Will retry sync after 3 seconds.\n");
+		ntfs_log_error("Device busy.  Will retry sync in 3 seconds.\n");
 		sleep(3);
 	}
 close_src:
@@ -473,4 +481,3 @@ umount:
 	ntfs_log_verbose("Done.\n");
 	return result;
 }
-

Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntfsmount.8.in	7 Nov 2005 20:37:08 -0000	1.11
+++ ntfsmount.8.in	14 Nov 2005 12:19:39 -0000	1.12
@@ -92,7 +92,7 @@ configuration option described in the pr
 
 .TP
 .B kernel_cache
-(NOTE: Work only with FUSE-2.3.0)
+(NOTE: Only for FUSE 2.3.0, with FUSE >= 2.4.0 on by default)
 This option disables flushing the cache of the file contents on
 every open().  This should only be enabled on filesystems, where the
 file data is never changed externally (not through the mounted FUSE

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- ntfsmount.c	10 Nov 2005 21:26:41 -0000	1.56
+++ ntfsmount.c	14 Nov 2005 12:19:39 -0000	1.57
@@ -96,6 +96,7 @@ typedef struct {
 	BOOL show_sys_files;
 	BOOL succeed_chmod;
 	BOOL force;
+	BOOL debug;
 } ntfs_fuse_context_t;
 
 typedef enum {
@@ -117,10 +118,6 @@ static const char *EXEC_NAME = "ntfsmoun
 static char def_opts[] = "default_permissions,allow_other,";
 static ntfs_fuse_context_t *ctx;
 
-GEN_PRINTF(Eprintf, stderr, NULL,          FALSE)
-GEN_PRINTF(Vprintf, stderr, &opts.verbose, TRUE)
-GEN_PRINTF(Qprintf, stderr, &opts.quiet,   FALSE)
-
 static long ntfs_fuse_get_nr_free_mft_records(ntfs_volume *vol)
 {
 	u8 *buf;
@@ -490,8 +487,8 @@ static int ntfs_fuse_filler(ntfs_fuse_fi
 	if (name_type == FILE_NAME_DOS)
 		return 0;
 	if (ntfs_ucstombs(name, name_len, &filename, 0) < 0) {
-		Eprintf("Skipping unrepresentable file (inode %lld): %s\n",
-				MREF(mref), strerror(errno));
+		ntfs_log_error("Skipping unrepresentable file (inode %lld): "
+				"%s\n", MREF(mref), strerror(errno));
 		return 0;
 	}
 	if (MREF(mref) == FILE_root || MREF(mref) >= FILE_first_user ||
@@ -586,8 +583,8 @@ static int ntfs_fuse_read(const char *or
 	while (size) {
 		res = ntfs_attr_pread(na, offset, size, buf);
 		if (res < (s64)size)
-			Eprintf("ntfs_attr_pread returned less bytes than "
-					"requested.\n");
+			ntfs_log_error("ntfs_attr_pread returned less bytes "
+					"than requested.\n");
 		if (res <= 0) {
 			res = -errno;
 			goto exit;
@@ -601,7 +598,7 @@ exit:
 	if (na)
 		ntfs_attr_close(na);
 	if (ni && ntfs_inode_close(ni))
-		perror("Failed to close inode");
+		ntfs_log_perror("Failed to close inode");
 	free(path);
 	if (stream_name_len)
 		free(stream_name);
@@ -635,8 +632,8 @@ static int ntfs_fuse_write(const char *o
 	while (size) {
 		res = ntfs_attr_pwrite(na, offset, size, buf);
 		if (res < (s64)size)
-			Eprintf("ntfs_attr_pwrite returned less bytes than "
-					"requested.\n");
+			ntfs_log_error("ntfs_attr_pwrite returned less bytes "
+					"than requested.\n");
 		if (res <= 0) {
 			res = -errno;
 			goto exit;
@@ -651,7 +648,7 @@ exit:
 	if (na)
 		ntfs_attr_close(na);
 	if (ni && ntfs_inode_close(ni))
-		perror("Failed to close inode");
+		ntfs_log_perror("Failed to close inode");
 	free(path);
 	if (stream_name_len)
 		free(stream_name);
@@ -687,7 +684,7 @@ static int ntfs_fuse_truncate(const char
 	ntfs_attr_close(na);
 exit:
 	if (ni && ntfs_inode_close(ni))
-		perror("Failed to close inode");
+		ntfs_log_perror("Failed to close inode");
 	free(path);
 	if (stream_name_len)
 		free(stream_name);
@@ -793,7 +790,7 @@ static int ntfs_fuse_create_stream(const
 	if (ntfs_attr_add(ni, AT_DATA, stream_name, stream_name_len, NULL, 0))
 		res = -errno;
 	if (ntfs_inode_close(ni))
-		perror("Failed to close inode");
+		ntfs_log_perror("Failed to close inode");
 	return res;
 }
 
@@ -953,7 +950,7 @@ static int ntfs_fuse_rm_stream(const cha
 	}
 exit:
 	if (ntfs_inode_close(ni))
-		perror("Failed to close inode");
+		ntfs_log_perror("Failed to close inode");
 	return res;
 }
 
@@ -1029,7 +1026,7 @@ static int ntfs_fuse_utime(const char *p
 	NInoFileNameSetDirty(ni);
 	NInoSetDirty(ni);
 	if (ntfs_inode_close(ni))
-		perror("Failed to close inode");
+		ntfs_log_perror("Failed to close inode");
 	return 0;
 }
 
@@ -1097,7 +1094,7 @@ exit:
 	if (actx)
 		ntfs_attr_put_search_ctx(actx);
 	ntfs_inode_close(ni);
-	fprintf(stderr, "return %d\n", ret);
+	ntfs_log_debug("return %d\n", ret);
 	return ret;
 }
 
@@ -1213,7 +1210,7 @@ exit:
 		ntfs_attr_close(na);
 	free(lename);
 	if (ntfs_inode_close(ni))
-		perror("Failed to close inode");
+		ntfs_log_perror("Failed to close inode");
 	return res;
 }
 
@@ -1272,7 +1269,7 @@ exit:
 		ntfs_attr_close(na);
 	free(lename);
 	if (ntfs_inode_close(ni))
-		perror("Failed to close inode");
+		ntfs_log_perror("Failed to close inode");
 	return res;
 }
 
@@ -1315,7 +1312,7 @@ exit:
 		ntfs_attr_close(na);
 	free(lename);
 	if (ntfs_inode_close(ni))
-		perror("Failed to close inode");
+		ntfs_log_perror("Failed to close inode");
 	return res;
 }
 
@@ -1351,7 +1348,7 @@ static int ntfs_fuse_init(void)
 {
 	ctx = malloc(sizeof(ntfs_fuse_context_t));
 	if (!ctx) {
-		perror("malloc failed");
+		ntfs_log_perror("malloc failed");
 		return -1;
 	}
 	*ctx = (ntfs_fuse_context_t) {
@@ -1371,7 +1368,7 @@ static int ntfs_fuse_mount(const char *d
 
 	vol = utils_mount_volume(device, (ctx->ro) ? MS_RDONLY : 0, ctx->force);
 	if (!vol) {
-		Eprintf("Mount failed.\n");
+		ntfs_log_error("Mount failed.\n");
 		return -1;
 	}
 	ctx->vol = vol;
@@ -1381,9 +1378,9 @@ static int ntfs_fuse_mount(const char *d
 static void ntfs_fuse_destroy(void)
 {
 	if (ctx->vol) {
-		printf("Unmounting: %s\n", ctx->vol->vol_name);
+		ntfs_log_debug("Unmounting: %s\n", ctx->vol->vol_name);
 		if (ntfs_umount(ctx->vol, FALSE))
-			perror("Failed to unmount volume");
+			ntfs_log_perror("Failed to unmount volume");
 	}
 	free(ctx);
 }
@@ -1406,13 +1403,13 @@ static char *parse_mount_options(const c
 	 */
 	ret = malloc(strlen(def_opts) + strlen(org_options) + 9 + PATH_MAX);
 	if (!ret) {
-		perror("malloc failed");
+		ntfs_log_perror("malloc failed");
 		return NULL;
 	}
 	*ret = 0;
 	options = strdup(org_options);
 	if (!options) {
-		perror("strdump failed");
+		ntfs_log_perror("strdump failed");
 		return NULL;
 	}
 	s = options;
@@ -1420,97 +1417,102 @@ static char *parse_mount_options(const c
 		opt = strsep(&val, "=");
 		if (!strcmp(opt, "ro")) { /* Read-only mount. */
 			if (val) {
-				Eprintf("'ro' option should not have value.\n");
+				ntfs_log_error("'ro' option should not have "
+						"value.\n");
 				goto err_exit;
 			}
 			ctx->ro = TRUE;
 			strcat(ret, "ro,");
-#ifdef DEBUG
 		} else if (!strcmp(opt, "fake_rw")) {
 			if (val) {
-				Eprintf("'fake_rw' option should not have "
-						"value.\n");
+				ntfs_log_error("'fake_rw' option should not "
+						"have value.\n");
 				goto err_exit;
 			}
 			ctx->ro = TRUE;
-#endif
 		} else if (!strcmp(opt, "fsname")) { /* Filesystem name. */
 			/*
 			 * We need this to be able to check whether filesystem
 			 * mounted or not.
 			 */
-			Eprintf("'fsname' is unsupported option.\n");
+			ntfs_log_error("'fsname' is unsupported option.\n");
 			goto err_exit;
 		} else if (!strcmp(opt, "no_def_opts")) {
 			if (val) {
-				Eprintf("'no_def_opts' option should not have "
-						"value.\n");
+				ntfs_log_error("'no_def_opts' option should "
+						"not have value.\n");
 				goto err_exit;
 			}
 			no_def_opts = TRUE; /* Don't add default options. */
 		} else if (!strcmp(opt, "umask")) {
 			if (!val) {
-				Eprintf("'umask' option should have value.\n");
+				ntfs_log_error("'umask' option should have "
+						"value.\n");
 				goto err_exit;
 			}
 			sscanf(val, "%i", &ctx->fmask);
 			ctx->dmask = ctx->fmask;
 		} else if (!strcmp(opt, "fmask")) {
 			if (!val) {
-				Eprintf("'fmask' option should have value.\n");
+				ntfs_log_error("'fmask' option should have "
+						"value.\n");
 				goto err_exit;
 			}
 			sscanf(val, "%i", &ctx->fmask);
 		} else if (!strcmp(opt, "dmask")) {
 			if (!val) {
-				Eprintf("'dmask' option should have value.\n");
+				ntfs_log_error("'dmask' option should have "
+						"value.\n");
 				goto err_exit;
 			}
 			sscanf(val, "%i", &ctx->dmask);
 		} else if (!strcmp(opt, "uid")) {
 			if (!val) {
-				Eprintf("'uid' option should have value.\n");
+				ntfs_log_error("'uid' option should have "
+						"value.\n");
 				goto err_exit;
 			}
 			sscanf(val, "%i", &ctx->uid);
 		} else if (!strcmp(opt, "gid")) {
 			if (!val) {
-				Eprintf("'gid' option should have value.\n");
+				ntfs_log_error("'gid' option should have "
+						"value.\n");
 				goto err_exit;
 			}
 			sscanf(val, "%i", &ctx->gid);
 		} else if (!strcmp(opt, "show_sys_files")) {
 			if (val) {
-				Eprintf("'show_sys_files' option should not "
-						"have value.\n");
+				ntfs_log_error("'show_sys_files' option should "
+						"not have value.\n");
 				goto err_exit;
 			}
 			ctx->show_sys_files = TRUE;
 		} else if (!strcmp(opt, "succeed_chmod")) {
 			if (val) {
-				Eprintf("'succeed_chmod' option should not "
-						"have value.\n");
+				ntfs_log_error("'succeed_chmod' option should "
+						"not have value.\n");
 				goto err_exit;
 			}
 			ctx->succeed_chmod = TRUE;
 		} else if (!strcmp(opt, "force")) {
 			if (val) {
-				Eprintf("'force' option should not "
+				ntfs_log_error("'force' option should not "
 						"have value.\n");
 				goto err_exit;
 			}
 			ctx->force = TRUE;
 		} else if (!strcmp(opt, "locale")) {
 			if (!val) {
-				Eprintf("'locale' option should have value.\n");
+				ntfs_log_error("'locale' option should have "
+						"value.\n");
 				goto err_exit;
 			}
 			if (!setlocale(LC_ALL, val))
-				Eprintf("Failed to set locale to %s.  "
+				ntfs_log_error("Failed to set locale to %s.  "
 						"Continue anyway.\n", val);
 		} else if (!strcmp(opt, "streams_interface")) {
 			if (!val) {
-				Eprintf("'streams_interface' option "
+				ntfs_log_error("'streams_interface' option "
 						"should have value.\n");
 				goto err_exit;
 			}
@@ -1521,12 +1523,26 @@ static char *parse_mount_options(const c
 			else if (!strcmp(val, "windows"))
 				ctx->streams = NF_STREAMS_INTERFACE_WINDOWS;
 			else {
-				Eprintf("Invalid named data streams access "
-						"interface.\n");
+				ntfs_log_error("Invalid named data streams "
+						"access interface.\n");
 				goto err_exit;
 			}
 		} else if (!strcmp(opt, "noauto")) {
 			/* Don't pass noauto option to fuse. */
+		} else if (!strcmp(opt, "debug")) {
+			if (val) {
+				ntfs_log_error("'debug' option should not have "
+						"value.\n");
+				goto err_exit;
+			}
+			ctx->debug = TRUE;
+			ntfs_log_set_levels(NTFS_LOG_LEVEL_DEBUG);
+			ntfs_log_set_levels(NTFS_LOG_LEVEL_TRACE);
+		} else if (!strcmp(opt, "remount")) {
+			ntfs_log_error("Remounting is not supported at present."
+					" You have to umount volume and then "
+					"mount it once again.\n");
+			goto err_exit;
 		} else { /* Probably FUSE option. */
 			strcat(ret, opt);
 			if (val) {
@@ -1551,16 +1567,16 @@ err_exit:
 
 static void usage(void)
 {
-	Eprintf("\n%s v%s (libntfs %s) - NTFS module for FUSE.\n\n",
+	ntfs_log_info("\n%s v%s (libntfs %s) - NTFS module for FUSE.\n\n",
 			EXEC_NAME, VERSION, ntfs_libntfs_version());
-	Eprintf("Copyright (c) 2005 Yura Pakhuchiy\n\n");
-	Eprintf("usage:  %s device mount_point [-o options]\n\n",
+	ntfs_log_info("Copyright (c) 2005 Yura Pakhuchiy\n\n");
+	ntfs_log_info("usage:  %s device mount_point [-o options]\n\n",
 			EXEC_NAME);
-	Eprintf("Possible options are:\n\tdefault_permissions\n\tallow_other\n"
-		"\tkernel_cache\n\tlarge_read\n\tdirect_io\n\tmax_read\n\t"
-		"force\n\tro\n\tno_def_opts\n\tumask\n\tfmask\n\tdmask\n\t"
-		"uid\n\tgid\n\tshow_sys_files\n\tsucceed_chmod\n\tlocale\n\n");
-	Eprintf("Default options are: \"%s\".\n", def_opts);
+	ntfs_log_info("ntfsmount options are:\n\tforce\n\tno_def_opts\n\tumask"
+		"\n\tfmask\n\tdmask\n\tuid\n\tgid\n\tshow_sys_files\n\t"
+		"succeed_chmod\n\tlocale\n\tstreams_interface\n"
+		"Also look into FUSE documentation about it options.\n\n");
+	ntfs_log_info("Default options are: \"%s\".\n", def_opts);
 }
 
 #ifndef HAVE_REALPATH
@@ -1608,7 +1624,7 @@ static int parse_options(int argc, char 
 			if (!opts.device) {
 				opts.device = malloc(PATH_MAX + 1);
 				if (!opts.device) {
-					perror("malloc");
+					ntfs_log_perror("malloc");
 					err++;
 					break;
 				}
@@ -1616,7 +1632,7 @@ static int parse_options(int argc, char 
 				if (argv[optind - 1][0] != '/') {
 					if (!realpath(argv[optind - 1],
 							opts.device)) {
-						perror("realpath");
+						ntfs_log_perror("realpath");
 						free(opts.device);
 						opts.device = NULL;
 						err++;
@@ -1627,8 +1643,8 @@ static int parse_options(int argc, char 
 			} else if (!opts.mnt_point)
 				opts.mnt_point = argv[optind - 1];
 			else {
-				Eprintf("You must specify exactly one device "
-						"and exactly one mount "
+				ntfs_log_error("You must specify exactly one "
+						"device and exactly one mount "
 						"point.\n");
 				err++;
 			}
@@ -1637,7 +1653,7 @@ static int parse_options(int argc, char 
 			if (!opts.options)
 				opts.options = argv[optind - 1];
 			else {
-				Eprintf("You must specify exactly one "
+				ntfs_log_error("You must specify exactly one "
 						"set of options.\n");
 				err++;
 			}
@@ -1653,7 +1669,8 @@ static int parse_options(int argc, char 
 			opts.verbose++;
 			break;
 		default:
-			Eprintf("Unknown option '%s'.\n", argv[optind - 1]);
+			ntfs_log_error("Unknown option '%s'.\n",
+					argv[optind - 1]);
 			err++;
 			break;
 		}
@@ -1663,19 +1680,19 @@ static int parse_options(int argc, char 
 		opts.quiet = 0;
 	} else {
 		if (!opts.device) {
-			Eprintf("No mount point specified.\n");
+			ntfs_log_error("No mount point specified.\n");
 			err++;
 		}
 
 		if (!opts.mnt_point) {
 			if (argc > 1)
-				Eprintf("No mount point specified.\n");
+				ntfs_log_error("No mount point specified.\n");
 			err++;
 		}
 
 		if (opts.quiet && opts.verbose) {
-			Eprintf("You may not use --quiet and --verbose at "
-					"the same time.\n");
+			ntfs_log_error("You may not use --quiet and --verbose "
+					"at the same time.\n");
 			err++;
 		}
 	}
@@ -1720,32 +1737,36 @@ int main(int argc, char *argv[])
 	/* Create filesystem. */
 	ffd = fuse_mount(opts.mnt_point, parsed_options);
 	if (ffd == -1) {
-		Eprintf("fuse_mount failed.\n");
+		ntfs_log_error("fuse_mount failed.\n");
 		ntfs_fuse_destroy();
 		return 5;
 	}
 	free(parsed_options);
-#ifndef DEBUG
-	fh = fuse_new(ffd, "use_ino", &ntfs_fuse_oper, sizeof(ntfs_fuse_oper));
+	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, "debug,use_ino" , &ntfs_fuse_oper,
-			sizeof(ntfs_fuse_oper));
+		fh = fuse_new(ffd, "use_ino", &ntfs_fuse_oper,
+				sizeof(ntfs_fuse_oper));
 #endif
+	} else
+		fh = fuse_new(ffd, "debug,use_ino" , &ntfs_fuse_oper,
+				sizeof(ntfs_fuse_oper));
+
 	if (!fh) {
-		Eprintf("fuse_new failed.\n");
+		ntfs_log_error("fuse_new failed.\n");
 		close(ffd);
 		fuse_unmount(opts.mnt_point);
 		ntfs_fuse_destroy();
 		return 6;
 	}
-#ifndef DEBUG
-	if (daemon(0, 0))
-		Eprintf("Failed to daemonize.\n");
-#endif
-	printf("Mounted: %s\n", ctx->vol->vol_name);
+	if (!ctx->debug && daemon(0, 0))
+		ntfs_log_error("Failed to daemonize.\n");
+	ntfs_log_info("Mounted: %s\n", ctx->vol->vol_name);
 	/* Main loop. */
 	if (fuse_loop(fh))
-		Eprintf("fuse_loop failed.\n");
+		ntfs_log_error("fuse_loop failed.\n");
 	/* Destroy. */
 	fuse_destroy(fh);
 	close(ffd);

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.104,1.105

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

On Sun, 13 Nov 2005, Szakacsits Szabolcs wrote:
> On Sun, 13 Nov 2005, Anton Altaparmakov wrote:
> > On Sun, 13 Nov 2005, Szabolcs Szakacsits wrote:
> > That code was there before (well ok, code of equivalent functionality).
> 
> Actually it wasn't exactly equivalent, only almost. That code always 
> rounded up the mft size to cluster boundary, this one only if all system 
> files fits into the first cluster. New, empty records are added also only 
> in this case, not otherwise. 
> 
> In short none of us was right, the truth is between them.

Interesting!  Well discovered!  (-:  I only ever tried 64k cluster size 
and did the smaller ones by assumption.  You obviously had done the 
smaller one and did not see need to do it.  Thanks for figuring it out 
properly.  (-:

> And this is what's left for mkntfs v3.1:
> 
> Inode 0 attribute 0x30 content:   DIFFER
> Inode 0 attribute 0x80 content:   DIFFER
> Inode 1 attribute 0x80 content:   DIFFER
> Inode 2 attribute 0x30 content:   DIFFER
> Inode 2 attribute 0x80 length:   46153728  !=  4194304
> Inode 4 attribute 0x30 content:   DIFFER
> Inode 5 attribute 0x50 length:   4144  !=  4608
> Inode 5 attribute 0xa0:$I30 content:   DIFFER
> Inode 6 attribute 0x80 content:   DIFFER
> Inode 7 attribute 0x80 content:   DIFFER
> Inode 9 attribute 0x30 content:   DIFFER
> Inode 9 attribute 0x80:$SDS length:   262396  !=  262720
> Inode 9 attribute 0x90:$SDH length:   144  !=  288
> Inode 9 attribute 0x90:$SII length:   128  !=  248
> Inode 11 attribute 0x90:$I30 content:   DIFFER
> Inode 24 attribute 0x90:$O content:   DIFFER
> Inode 24 attribute 0x90:$Q content:   DIFFER

Cool.  The list is really shrinking nicely.  Are the 0x30 differences just 
timestamps or is there more to it?

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/