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

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.84,1.85

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv18493

Modified Files:
	ntfsclone.c 
Log Message:
metadata cloning: write out extent records


Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- ntfsclone.c	13 Aug 2006 14:52:19 -0000	1.84
+++ ntfsclone.c	13 Aug 2006 15:00:27 -0000	1.85
@@ -1137,6 +1137,21 @@ static void mft_record_write_with_same_u
 		perr_exit("ntfs_mft_record_write");
 }
 
+static void mft_inode_write_with_same_usn(ntfs_volume *volume, ntfs_inode *ni)
+{
+	s32 i;
+	
+	mft_record_write_with_same_usn(volume, ni);
+	
+	if (ni->nr_extents <= 0)
+		return;
+	
+	for (i = 0; i < ni->nr_extents; ++i) {
+		ntfs_inode *eni = ni->extent_nis[i];
+		mft_record_write_with_same_usn(volume, eni);
+	}
+}
+
 static int walk_clusters(ntfs_volume *volume, struct ntfs_walk_cluster *walk)
 {
 	s64 inode = 0;
@@ -1208,7 +1223,7 @@ static int walk_clusters(ntfs_volume *vo
 out:
 		if (wipe) {
 			wipe_unused_mft_data(ni);
-			mft_record_write_with_same_usn(volume, ni);
+			mft_inode_write_with_same_usn(volume, ni);
 		}
 
 		if (ntfs_inode_close(ni))

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.82,1.83

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv17599

Modified Files:
	ntfsclone.c 
Log Message:
convert all malloc,calloc to ntfs_{malloc,calloc}


Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- ntfsclone.c	13 Aug 2006 14:40:28 -0000	1.82
+++ ntfsclone.c	13 Aug 2006 14:49:35 -0000	1.83
@@ -629,7 +629,8 @@ static void clone_ntfs(u64 nr_clusters)
 	else
 		Printf("Cloning NTFS ...\n");
 
-	if ((buf = calloc(1, csize)) == NULL)
+	buf = ntfs_calloc(csize);
+	if (!buf)
 		perr_exit("clone_ntfs");
 
 	progress_init(&progress, p_counter, nr_clusters, 100);
@@ -765,11 +766,10 @@ static void wipe_index_allocation_timest
 		perr_printf("Failed to open $INDEX_ALLOCATION attribute");
 		goto out_bitmap;
 	}
-	tmp_indexa = indexa = malloc(na->data_size);
-	if (!tmp_indexa) {
-		perr_printf("malloc failed");
+	tmp_indexa = indexa = ntfs_malloc(na->data_size);
+	if (!tmp_indexa)
 		goto out_na;
-	}
+
 	if (ntfs_attr_pread(na, 0, na->data_size, indexa) != na->data_size) {
 		perr_printf("Failed to read $INDEX_ALLOCATION attribute");
 		goto out_indexa;
@@ -1158,7 +1158,7 @@ static int walk_clusters(ntfs_volume *vo
 
 		/* FIXME: Terrible kludge for libntfs not being able to return
 		   a deleted MFT record as inode */
-		ni = (ntfs_inode*)calloc(1, sizeof(ntfs_inode));
+		ni = ntfs_calloc(sizeof(ntfs_inode));
 		if (!ni)
 			perr_exit("walk_clusters");
 
@@ -1239,7 +1239,8 @@ static void setup_lcn_bitmap(void)
 	/* Determine lcn bitmap byte size and allocate it. */
 	lcn_bitmap.size = rounded_up_division(vol->nr_clusters, 8);
 
-	if (!(lcn_bitmap.bm = (unsigned char *)calloc(1, lcn_bitmap.size)))
+	lcn_bitmap.bm = ntfs_calloc(lcn_bitmap.size);
+	if (!lcn_bitmap.bm)
 		perr_exit("Failed to allocate internal buffer");
 
 	bitmap_file_data_fixup(vol->nr_clusters, &lcn_bitmap);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.83,1.84

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv17816

Modified Files:
	ntfsclone.c 
Log Message:
more detailed error messages


Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- ntfsclone.c	13 Aug 2006 14:49:35 -0000	1.83
+++ ntfsclone.c	13 Aug 2006 14:52:19 -0000	1.84
@@ -745,7 +745,8 @@ static void wipe_index_allocation_timest
 
 	indexr = ntfs_index_root_get(ni, attr);
 	if (!indexr) {
-		perr_printf("Failed to read $INDEX_ROOT attribute");
+		perr_printf("Failed to read $INDEX_ROOT attribute of inode "
+			    "%lld", ni->mft_no);
 		return;
 	}
 
@@ -807,7 +808,7 @@ static void wipe_index_allocation_timest
 	}
 	
 	if (ntfs_rl_pwrite(vol, na->rl, 0, na->data_size, indexa) != na->data_size)
-		perr_printf("ntfs_rl_pwrite failed");
+		perr_printf("ntfs_rl_pwrite failed for inode %lld", ni->mft_no);
 out_indexa:
 	free(indexa);
 out_na:

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.80,1.81

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv16263

Modified Files:
	ntfsclone.c 
Log Message:
fix missing error outputs


Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- ntfsclone.c	15 Jun 2006 18:43:25 -0000	1.80
+++ ntfsclone.c	13 Aug 2006 14:34:07 -0000	1.81
@@ -717,6 +717,7 @@ static void wipe_index_entry_timestams(I
 {
 	s64 timestamp = utc2ntfs(0);
 
+	/* FIXME: can fall into infinite loop if corrupted */
 	while (!(e->flags & INDEX_ENTRY_END)) {
 
 		e->key.file_name.creation_time = timestamp;
@@ -743,7 +744,7 @@ static void wipe_index_allocation_timest
 
 	indexr = ntfs_index_root_get(ni, attr);
 	if (!indexr) {
-		ntfs_log_perror("Failed to read $INDEX_ROOT attribute");
+		perr_printf("Failed to read $INDEX_ROOT attribute");
 		return;
 	}
 
@@ -755,22 +756,22 @@ static void wipe_index_allocation_timest
 	
 	byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
 	if (!byte) {
-		ntfs_log_perror("Failed to read $BITMAP attribute");
+		perr_printf("Failed to read $BITMAP attribute");
 		goto out_indexr;
 	}
 
 	na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, name, name_len);
 	if (!na) {
-		ntfs_log_perror("Failed to open $INDEX_ALLOCATION attribute");
+		perr_printf("Failed to open $INDEX_ALLOCATION attribute");
 		goto out_bitmap;
 	}
 	tmp_indexa = indexa = malloc(na->data_size);
 	if (!tmp_indexa) {
-		ntfs_log_perror("malloc failed");
+		perr_printf("malloc failed");
 		goto out_na;
 	}
 	if (ntfs_attr_pread(na, 0, na->data_size, indexa) != na->data_size) {
-		ntfs_log_perror("Failed to read $INDEX_ALLOCATION attribute");
+		perr_printf("Failed to read $INDEX_ALLOCATION attribute");
 		goto out_indexa;
 	}
 
@@ -779,7 +780,7 @@ static void wipe_index_allocation_timest
 		if (*byte & (1 << bit)) {					   
 			if (ntfs_mst_post_read_fixup((NTFS_RECORD *)tmp_indexa,
 						indexr->index_block_size)) {
-				ntfs_log_perror("Damaged INDX record");
+				perr_printf("Damaged INDX record");
 				goto out_indexa;
 			}
 			entry = (INDEX_ENTRY *)((u8 *)tmp_indexa + le32_to_cpu(
@@ -792,7 +793,7 @@ static void wipe_index_allocation_timest
 
 			if (ntfs_mst_pre_write_fixup((NTFS_RECORD *)tmp_indexa,
 						indexr->index_block_size)) {
-				ntfs_log_perror("INDX write fixup failed");
+				perr_printf("INDX write fixup failed");
 				goto out_indexa;
 			}
 		}
@@ -806,7 +807,7 @@ static void wipe_index_allocation_timest
 	}
 	
 	if (ntfs_rl_pwrite(vol, na->rl, 0, na->data_size, indexa) != na->data_size)
-		ntfs_log_perror("ntfs_rl_pwrite failed");
+		perr_printf("ntfs_rl_pwrite failed");
 out_indexa:
 	free(indexa);
 out_na:

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.81,1.82

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv16824

Modified Files:
	ntfsclone.c 
Log Message:
don't create image files with executable bit set


Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- ntfsclone.c	13 Aug 2006 14:34:07 -0000	1.81
+++ ntfsclone.c	13 Aug 2006 14:40:28 -0000	1.82
@@ -1671,7 +1671,7 @@ int main(int argc, char **argv)
 				flags |= O_EXCL;
 		}
 
-		if ((fd_out = open(opt.output, flags, S_IRWXU)) == -1)
+		if ((fd_out = open(opt.output, flags, S_IRUSR | S_IWUSR)) == -1)
 			perr_exit("Opening file '%s' failed", opt.output);
 
 		if (!opt.save_image)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.146,1.147

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv14563

Modified Files:
	mkntfs.c 
Log Message:
upgrade_to_large_index(): fix double freeing ctx in certain error situation


Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- mkntfs.c	13 Aug 2006 13:46:40 -0000	1.146
+++ mkntfs.c	13 Aug 2006 14:17:02 -0000	1.147
@@ -2424,7 +2424,6 @@ static int upgrade_to_large_index(MFT_RE
 		err = -EINVAL;
 		goto err_out;
 	}
-	ntfs_attr_put_search_ctx(ctx);
 	r = (INDEX_ROOT*)((char*)a + le16_to_cpu(a->value_offset));
 	re_end = (char*)r + le32_to_cpu(a->value_length);
 	re_start = (char*)&r->index + le32_to_cpu(r->index.entries_offset);
@@ -2520,6 +2519,7 @@ static int upgrade_to_large_index(MFT_RE
 		goto err_out;
 	}
 	*idx = ia_val;
+	ntfs_attr_put_search_ctx(ctx);
 	return 0;
 err_out:
 	ntfs_attr_put_search_ctx(ctx);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.145,1.146

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv12262

Modified Files:
	mkntfs.c 
Log Message:
convert all malloc,calloc to ntfs_{malloc,calloc}


Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- mkntfs.c	13 Aug 2006 13:38:38 -0000	1.145
+++ mkntfs.c	13 Aug 2006 13:46:40 -0000	1.146
@@ -146,6 +146,7 @@
 #include "attrdef.h"
 #include "version.h"
 #include "logging.h"
+#include "support.h"
 
 #ifdef NO_NTFS_DEVICE_DEFAULT_IO_OPS
 #error "No default device io operations!  Cannot build mkntfs.  \
@@ -2028,7 +2029,7 @@ static int add_attr_file_name(MFT_RECORD
 			le16_to_cpu(ctx->attr->value_offset));
 	i = (strlen(file_name) + 1) * sizeof(ntfschar);
 	fn_size = sizeof(FILE_NAME_ATTR) + i;
-	fn = malloc(fn_size);
+	fn = ntfs_malloc(fn_size);
 	if (!fn) {
 		ntfs_attr_put_search_ctx(ctx);
 		return -errno;
@@ -2237,7 +2238,7 @@ static int add_attr_index_root(MFT_RECOR
 	int err, val_len;
 
 	val_len = sizeof(INDEX_ROOT) + sizeof(INDEX_ENTRY_HEADER);
-	r = malloc(val_len);
+	r = ntfs_malloc(val_len);
 	if (!r)
 		return -errno;
 	r->type = (indexed_attr_type == AT_FILE_NAME) ? AT_FILE_NAME : 0;
@@ -3105,7 +3106,7 @@ static int create_hardlink_res(MFT_RECOR
 	/* Create the file_name attribute. */
 	i = (strlen(file_name) + 1) * sizeof(ntfschar);
 	fn_size = sizeof(FILE_NAME_ATTR) + i;
-	fn = malloc(fn_size);
+	fn = ntfs_malloc(fn_size);
 	if (!fn)
 		return -errno;
 	fn->parent_directory = ref_parent;
@@ -3220,7 +3221,7 @@ static int create_hardlink(INDEX_BLOCK *
 	/* Create the file_name attribute. */
 	i = (strlen(file_name) + 1) * sizeof(ntfschar);
 	fn_size = sizeof(FILE_NAME_ATTR) + i;
-	fn = malloc(fn_size);
+	fn = ntfs_malloc(fn_size);
 	if (!fn)
 		return -errno;
 	fn->parent_directory = ref_parent;
@@ -3784,11 +3785,10 @@ static BOOL mkntfs_initialize_bitmaps(vo
 	if (!g_mft_bitmap)
 		return FALSE;
 	/* Create runlist for mft bitmap. */
-	g_rl_mft_bmp = malloc(2 * sizeof(runlist));
-	if (!g_rl_mft_bmp) {
-		ntfs_log_perror("Failed to allocate internal buffer");
+	g_rl_mft_bmp = ntfs_malloc(2 * sizeof(runlist));
+	if (!g_rl_mft_bmp)
 		return FALSE;
-	}
+	
 	g_rl_mft_bmp[0].vcn = 0LL;
 	/* Mft bitmap is right after $Boot's data. */
 	i = (8192 + g_vol->cluster_size - 1) / g_vol->cluster_size;
@@ -3850,11 +3850,10 @@ static BOOL mkntfs_initialize_rl_mft(voi
 	 */
 	g_mft_zone_end += g_mft_lcn;
 	/* Create runlist for mft. */
-	g_rl_mft = malloc(2 * sizeof(runlist));
-	if (!g_rl_mft) {
-		ntfs_log_perror("Failed to allocate internal buffer");
+	g_rl_mft = ntfs_malloc(2 * sizeof(runlist));
+	if (!g_rl_mft)
 		return FALSE;
-	}
+	
 	g_rl_mft[0].vcn = 0LL;
 	g_rl_mft[0].lcn = g_mft_lcn;
 	/* rounded up division by cluster size */
@@ -3872,11 +3871,10 @@ static BOOL mkntfs_initialize_rl_mft(voi
 	ntfs_log_debug("$MFTMirr logical cluster number = 0x%llx\n",
 			g_mftmirr_lcn);
 	/* Create runlist for mft mirror. */
-	g_rl_mftmirr = malloc(2 * sizeof(runlist));
-	if (!g_rl_mftmirr) {
-		ntfs_log_perror("Failed to allocate internal buffer");
+	g_rl_mftmirr = ntfs_malloc(2 * sizeof(runlist));
+	if (!g_rl_mftmirr)
 		return FALSE;
-	}
+	
 	g_rl_mftmirr[0].vcn = 0LL;
 	g_rl_mftmirr[0].lcn = g_mftmirr_lcn;
 	/*
@@ -3909,11 +3907,10 @@ static BOOL mkntfs_initialize_rl_logfile
 	u64 volume_size;
 
 	/* Create runlist for log file. */
-	g_rl_logfile = malloc(2 * sizeof(runlist));
-	if (!g_rl_logfile) {
-		ntfs_log_perror("Failed to allocate internal buffer");
+	g_rl_logfile = ntfs_malloc(2 * sizeof(runlist));
+	if (!g_rl_logfile)
 		return FALSE;
-	}
+	
 
 	volume_size = g_vol->nr_clusters << g_vol->cluster_size_bits;
 
@@ -3994,11 +3991,10 @@ static BOOL mkntfs_initialize_rl_boot(vo
 {
 	int i, j;
 	/* Create runlist for $Boot. */
-	g_rl_boot = malloc(2 * sizeof(runlist));
-	if (!g_rl_boot) {
-		ntfs_log_perror("Failed to allocate internal buffer");
+	g_rl_boot = ntfs_malloc(2 * sizeof(runlist));
+	if (!g_rl_boot)
 		return FALSE;
-	}
+	
 	g_rl_boot[0].vcn = 0LL;
 	g_rl_boot[0].lcn = 0LL;
 	/*
@@ -4022,11 +4018,10 @@ static BOOL mkntfs_initialize_rl_boot(vo
 static BOOL mkntfs_initialize_rl_bad(void)
 {
 	/* Create runlist for $BadClus, $DATA named stream $Bad. */
-	g_rl_bad = malloc(2 * sizeof(runlist));
-	if (!g_rl_bad) {
-		ntfs_log_perror("Failed to allocate internal buffer");
+	g_rl_bad = ntfs_malloc(2 * sizeof(runlist));
+	if (!g_rl_bad)
 		return FALSE;
-	}
+	
 	g_rl_bad[0].vcn = 0LL;
 	g_rl_bad[0].lcn = -1LL;
 	/*
@@ -4496,11 +4491,10 @@ static BOOL 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);
-	buf_log = malloc(g_logfile_size);
-	if (!buf_log) {
-		ntfs_log_perror("Failed to allocate internal buffer");
+	buf_log = ntfs_malloc(g_logfile_size);
+	if (!buf_log)
 		return FALSE;
-	}
+	
 	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);
@@ -4968,11 +4962,10 @@ static int mkntfs_redirect(struct mkntfs
 		g_vol->cluster_size = opts.cluster_size;
 	/* Length is in unicode characters. */
 	g_vol->upcase_len = 65536;
-	g_vol->upcase = malloc(g_vol->upcase_len * sizeof(ntfschar));
-	if (!g_vol->upcase) {
-		ntfs_log_perror("Could not create upcase structure");
+	g_vol->upcase = ntfs_malloc(g_vol->upcase_len * sizeof(ntfschar));
+	if (!g_vol->upcase)
 		goto done;
-	}
+	
 	init_upcase_table(g_vol->upcase, g_vol->upcase_len * sizeof(ntfschar));
 	if (g_vol->major_ver < 3) {
 		g_vol->attrdef = ntfs_calloc(36000);
@@ -4982,7 +4975,7 @@ static int mkntfs_redirect(struct mkntfs
 			g_vol->attrdef_len = 36000;
 		}
 	} else {
-		g_vol->attrdef = malloc(sizeof(attrdef_ntfs3x_array));
+		g_vol->attrdef = ntfs_malloc(sizeof(attrdef_ntfs3x_array));
 		if (g_vol->attrdef) {
 			memcpy(g_vol->attrdef, attrdef_ntfs3x_array,
 					sizeof(attrdef_ntfs3x_array));

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.144,1.145

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

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv11481/ntfsprogs

Modified Files:
	mkntfs.c 
Log Message:
fix mkntfs_get_page_size() declaration 


Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- mkntfs.c	2 Aug 2006 03:11:12 -0000	1.144
+++ mkntfs.c	13 Aug 2006 13:38:38 -0000	1.145
@@ -3425,7 +3425,7 @@ done:
 /**
  * mkntfs_get_page_size - detect the system's memory page size.
  */
-static long mkntfs_get_page_size()
+static long mkntfs_get_page_size(void)
 {
 	long page_size;
 #ifdef _SC_PAGESIZE

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs index.h,1.14,1.15

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357.server4you.de:/tmp/cvs-serv20754/include/ntfs

Modified Files:
	index.h 
Log Message:
had not noticed lack of externs :(


Index: index.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/index.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- index.h	2 Aug 2006 03:55:41 -0000	1.14
+++ index.h	3 Aug 2006 04:30:41 -0000	1.15
@@ -122,9 +122,9 @@ extern INDEX_ROOT *ntfs_index_root_get(n
 
 extern VCN ntfs_ie_get_vcn(INDEX_ENTRY *ie);
 
-char *ntfs_ie_filename_get(INDEX_ENTRY *ie);
-void ntfs_ie_filename_dump(INDEX_ENTRY *ie);
-void ntfs_ih_filename_dump(INDEX_HEADER *ih);
+extern char *ntfs_ie_filename_get(INDEX_ENTRY *ie);
+extern void ntfs_ie_filename_dump(INDEX_ENTRY *ie);
+extern void ntfs_ih_filename_dump(INDEX_HEADER *ih);
 
 /**
  * ntfs_index_entry_mark_dirty - mark an index entry dirty

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.219,1.220

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv20754/libntfs

Modified Files:
	attrib.c 
Log Message:
had not noticed lack of externs :(


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- attrib.c	2 Aug 2006 03:57:40 -0000	1.219
+++ attrib.c	3 Aug 2006 04:30:41 -0000	1.220
@@ -4991,7 +4991,7 @@ put_err_out:
  *	EOPNOTSUPP	- The desired resize is not implemented yet.
  */
 int ntfs_attr_truncate(ntfs_attr *na, const s64 newsize)
-{
+{ 
 	int ret;
 
 	if (!na || newsize < 0 ||

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

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357.server4you.de:/tmp/cvs-serv1196

Modified Files:
	support.h 
Log Message:
Fix include order. Thanks, Yuval!


Index: support.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/support.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- support.h	2 Aug 2006 03:11:12 -0000	1.10
+++ support.h	3 Aug 2006 02:49:00 -0000	1.11
@@ -24,10 +24,6 @@
 #ifndef _NTFS_SUPPORT_H
 #define _NTFS_SUPPORT_H
 
-#include <stdlib.h>
-
-#include "logging.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -36,6 +32,12 @@
 #include <stddef.h>
 #endif
 
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include "logging.h"
+
 /*
  * Our mailing list. Use this define to prevent typos in email address.
  */

[Linux-NTFS-cvs] CVS: ntfsprogs configure.ac,1.110,1.111

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

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv24666

Modified Files:
	configure.ac 
Log Message:
Change version to 1.13.2-WIP not 3.0.0-WIP and bump libntfs version to reflect
incompatible source and binary interface changes...


Index: configure.ac
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- configure.ac	2 Aug 2006 03:55:41 -0000	1.110
+++ configure.ac	2 Aug 2006 11:19:39 -0000	1.111
@@ -22,7 +22,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([ntfsprogs],[3.0.0-WIP],[lin...@li...])
+AC_INIT([ntfsprogs],[1.13.2-WIP],[lin...@li...])
 
 #
 # Before making a release, the LTVERSION string should be modified.
@@ -50,7 +50,7 @@ AC_INIT([ntfsprogs],[3.0.0-WIP],[linux-n
 #
 #   - If the interface is the same as the previous version, change to C:R+1:A
 #
-LTVERSION_LIBNTFS="9:0:0"
+LTVERSION_LIBNTFS="10:0:0"
 AC_SUBST(LTVERSION_LIBNTFS)
 
 AC_CANONICAL_HOST([])

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.218,1.219

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv20020/libntfs

Modified Files:
	attrib.c 
Log Message:
Prevent index root to be moved out from base mft record


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- attrib.c	2 Aug 2006 03:12:34 -0000	1.218
+++ attrib.c	2 Aug 2006 03:57:40 -0000	1.219
@@ -3731,9 +3731,13 @@ cluster_free_err_out:
  *
  * On success return 0 and on error return -1 with errno set to the error code.
  * The following error codes are defined:
- *	ENOMEM - Not enough memory to complete operation.
- *	ERANGE - @newsize is not valid for the attribute type of @na.
- *	ENOSPC - There is no enough space in base mft to resize $ATTRIBUTE_LIST.
+ *	ENOMEM		- Not enough memory to complete operation.
+ *	ERANGE		- @newsize is not valid for the attribute type of @na.
+ *	ENOSPC		- There is no enough space on the volume to allocate
+ *			  new clusters or in base mft to resize $ATTRIBUTE_LIST.
+ *	EOVERFLOW	- Resident attribute can not become non resident and
+ *			  already filled whole MFT record, but had not reached
+ *			  @newsize bytes length.
  */
 static int ntfs_resident_attr_resize(ntfs_attr *na, const s64 newsize)
 {
@@ -3883,6 +3887,22 @@ static int ntfs_resident_attr_resize(ntf
 		goto put_err_out;
 	}
 
+	/* 
+	 * Force index allocation creation instead of moving out index root
+	 * from the base MFT record.
+	 */
+	if (na->type == AT_INDEX_ROOT && na->data_size > sizeof(INDEX_ROOT) +
+			sizeof(INDEX_ENTRY_HEADER) + sizeof(VCN)) {
+		INDEX_ROOT *ir;
+
+		ir = (INDEX_ROOT*)((u8*)ctx->attr +
+				le16_to_cpu(ctx->attr->value_offset));
+		if (!(ir->index.flags & LARGE_INDEX)) {
+			err = EOVERFLOW;
+			goto put_err_out;
+		}
+	}
+
 	/*
 	 * Check whether attribute is already single in the this MFT record.
 	 * 8 added for the attribute terminator.
@@ -3890,7 +3910,7 @@ static int ntfs_resident_attr_resize(ntf
 	if (le32_to_cpu(ctx->mrec->bytes_in_use) ==
 			le16_to_cpu(ctx->mrec->attrs_offset) +
 			le32_to_cpu(ctx->attr->length) + 8) {
-		err = ENOSPC;
+		err = EOVERFLOW;
 		goto put_err_out;
 	}
 
@@ -4960,8 +4980,15 @@ put_err_out:
  *
  * On success return 0 and on error return -1 with errno set to the error code.
  * The following error codes are defined:
- *	EINVAL	   - Invalid arguments were passed to the function.
- *	EOPNOTSUPP - The desired resize is not implemented yet.
+ *	EINVAL	   	- Invalid arguments were passed to the function.
+ *	EACCES		- Attribute is encrypted.
+ *	ERANGE		- @newsize is not valid for the attribute type of @na.
+ *	ENOSPC		- There is no enough space on the volume to allocate
+ *			  new clusters or in base mft to resize $ATTRIBUTE_LIST.
+ *	EOVERFLOW	- Resident attribute can not become non resident and
+ *			  already filled whole MFT record, but had not reached
+ *			  @newsize bytes length.
+ *	EOPNOTSUPP	- The desired resize is not implemented yet.
  */
 int ntfs_attr_truncate(ntfs_attr *na, const s64 newsize)
 {

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs index.h, 1.13, 1.14 types.h, 1.15, 1.16

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357.server4you.de:/tmp/cvs-serv19627/include/ntfs

Modified Files:
	index.h types.h 
Log Message:
Merge index code from ntfs-3g. Clean it a bit and fix adding index allocation when index root in the base mft record.


Index: index.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/index.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- index.h	17 Jul 2006 11:49:52 -0000	1.13
+++ index.h	2 Aug 2006 03:55:41 -0000	1.14
@@ -1,9 +1,10 @@
 /*
  * index.h - Defines for NTFS index handling.  Part of the Linux-NTFS project.
  *
- * Copyright (c) 2004 Anton Altaparmakov
- * Copyright (c) 2005 Yura Pakhuchiy
+ * Copyright (c)      2004 Anton Altaparmakov
  * Copyright (c) 2004-2005 Richard Russon
+ * Copyright (c) 2005-2006 Yura Pakhuchiy
+ * Copyright (c)      2006 Szabolcs Szakacsits
  *
  * This program/include file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -30,24 +31,32 @@
 #include "inode.h"
 #include "mft.h"
 
+#define  VCN_INDEX_ROOT_PARENT  ((VCN)-2)
+
+#define  MAX_PARENT_VCN		32
+
 /**
  * struct ntfs_index_context -
  * @ni:			inode containing the @entry described by this context
  * @name:		name of the index described by this context
  * @name_len:		length of the index name
- * @entry:		index entry (points into @ir or @ia)
+ * @entry:		index entry (points into @ir or @ib)
  * @data:		index entry data (points into @entry)
  * @data_len:		length in bytes of @data
- * @is_in_root:		TRUE if @entry is in @ir or FALSE if it is in @ia
+ * @cr:
+ * @is_in_root:		TRUE if @entry is in @ir or FALSE if it is in @ib
  * @ir:			index root if @is_in_root or NULL otherwise
  * @actx:		attribute search context if in root or NULL otherwise
- * @ia:			index block if @is_in_root is FALSE or NULL otherwise
  * @ia_na:		opened INDEX_ALLOCATION attribute
- * @ia_vcn:		VCN from which @ia where read from
- * @ia_dirty:		TRUE if index block was changed
+ * @ib:			index block if @is_in_root is FALSE or NULL otherwise
+ * @ib_vcn:		VCN from which @ib where read from
+ * @ib_dirty:		TRUE if index block was changed
+ * @parent_pos:		parent entries' positions in the index block
+ * @parent_vcn:		entry's parent nodes or VCN_INDEX_ROOT_PARENT for root
+ * @max_depth:		number of the parent nodes
+ * @pindex:		maximum it's the number of the parent nodes
  * @block_size:		index block size
- * @vcn_size:		VCN size for this index block
- * @vcn_size_bits:	use instead of @vcn_size to speedup multiplication
+ * @vcn_size_bits:	VCN size bits for this index block
  *
  * @ni is the inode this context belongs to.
  *
@@ -56,13 +65,13 @@
  * simply points into @entry.  This is probably what the user is interested in.
  *
  * If @is_in_root is TRUE, @entry is in the index root attribute @ir described
- * by the attribute search context @actx and inode @ni.  @ia, @ia_vcn and
- * @ia_dirty are undefined in this case.
+ * by the attribute search context @actx and inode @ni.  @ib, @ib_vcn and
+ * @ib_dirty are undefined in this case.
  *
- * If @is_in_root is FALSE, @entry is in the index allocation attribute and @ia
- * and @ia_vcn point to the index allocation block and VCN where it's placed,
+ * If @is_in_root is FALSE, @entry is in the index allocation attribute and @ib
+ * and @ib_vcn point to the index allocation block and VCN where it's placed,
  * respectively. @ir and @actx are NULL in this case. @ia_na is opened
- * INDEX_ALLOCATION attribute. @ia_dirty is TRUE if index block was changed and
+ * INDEX_ALLOCATION attribute. @ib_dirty is TRUE if index block was changed and
  * FALSE otherwise.
  *
  * To obtain a context call ntfs_index_ctx_get().
@@ -81,15 +90,19 @@ typedef struct {
 	INDEX_ENTRY *entry;
 	void *data;
 	u16 data_len;
+	COLLATION_RULES cr;
 	BOOL is_in_root;
 	INDEX_ROOT *ir;
 	ntfs_attr_search_ctx *actx;
-	INDEX_ALLOCATION *ia;
 	ntfs_attr *ia_na;
-	VCN ia_vcn;
-	BOOL ia_dirty;
+	INDEX_BLOCK *ib;
+	VCN ib_vcn;
+	BOOL ib_dirty;
+	int parent_pos[MAX_PARENT_VCN];
+	VCN parent_vcn[MAX_PARENT_VCN];
+	int max_depth;
+	int pindex;
 	u32 block_size;
-	u32 vcn_size;
 	u8 vcn_size_bits;
 } ntfs_index_context;
 
@@ -107,6 +120,12 @@ extern int ntfs_index_rm(ntfs_index_cont
 
 extern INDEX_ROOT *ntfs_index_root_get(ntfs_inode *ni, ATTR_RECORD *attr);
 
+extern VCN ntfs_ie_get_vcn(INDEX_ENTRY *ie);
+
+char *ntfs_ie_filename_get(INDEX_ENTRY *ie);
+void ntfs_ie_filename_dump(INDEX_ENTRY *ie);
+void ntfs_ih_filename_dump(INDEX_HEADER *ih);
+
 /**
  * ntfs_index_entry_mark_dirty - mark an index entry dirty
  * @ictx:	ntfs index context describing the index entry
@@ -118,7 +137,7 @@ extern INDEX_ROOT *ntfs_index_root_get(n
  * hence the index root attribute, will be written out to disk later.
  *
  * If the index entry is in an index block belonging to the index allocation
- * attribute, set ia_dirty to TRUE, thus index block will be updated during
+ * attribute, set ib_dirty to TRUE, thus index block will be updated during
  * ntfs_index_ctx_put.
  */
 static inline void ntfs_index_entry_mark_dirty(ntfs_index_context *ictx)
@@ -126,7 +145,7 @@ static inline void ntfs_index_entry_mark
 	if (ictx->is_in_root)
 		ntfs_inode_mark_dirty(ictx->actx->ntfs_ino);
 	else
-		ictx->ia_dirty = TRUE;
+		ictx->ib_dirty = TRUE;
 }
 
 #endif /* _NTFS_INDEX_H */

Index: types.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/types.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- types.h	22 Feb 2006 14:20:08 -0000	1.15
+++ types.h	2 Aug 2006 03:55:41 -0000	1.16
@@ -3,6 +3,7 @@
  *	     the Linux-NTFS project.
  *
  * Copyright (c) 2000-2004 Anton Altaparmakov
+ * Copyright (c)      2006 Szabolcs Szakacsits
  *
  * This program/include file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -114,5 +115,11 @@ typedef enum {
 	IGNORE_CASE = 1,
 } IGNORE_CASE_BOOL;
 
+#define STATUS_OK				(0)
+#define STATUS_ERROR				(-1)
+#define STATUS_RESIDENT_ATTRIBUTE_FILLED_MFT	(-2)
+#define STATUS_KEEP_SEARCHING			(-3)
+#define STATUS_NOT_FOUND			(-4)
+
 #endif /* defined _NTFS_TYPES_H */
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs index.c,1.28,1.29

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv19627/libntfs

Modified Files:
	index.c 
Log Message:
Merge index code from ntfs-3g. Clean it a bit and fix adding index allocation when index root in the base mft record.


Index: index.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- index.c	17 Jul 2006 11:49:52 -0000	1.28
+++ index.c	2 Aug 2006 03:55:41 -0000	1.29
@@ -2,8 +2,9 @@
  * index.c - NTFS index handling.  Part of the Linux-NTFS project.
  *
  * Copyright (c) 2004-2005 Anton Altaparmakov
- * Copyright (c) 2005 Yura Pakhuchiy
  * Copyright (c) 2004-2005 Richard Russon
+ * Copyright (c) 2005-2006 Yura Pakhuchiy
+ * Copyright (c) 2005-2006 Szabolcs Szakacsits
  *
  * This program/include file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -42,6 +43,44 @@
[...2190 lines suppressed...]
+	if (!ntfs_ir_lookup(ni, name, attr->name_length, &ctx))
 		return NULL;
-	}
 	
-	if (ntfs_attr_lookup(AT_INDEX_ROOT, name, attr->name_length, 0, 0, NULL,
-			     0, ctx)) {
-		ntfs_log_perror("ntfs_attr_lookup failed");
+	root = ntfs_malloc(sizeof(INDEX_ROOT));
+	if (!root)
 		goto out;
-	}
-	
-	root = malloc(sizeof(INDEX_ROOT));
-	if (!root) {
-		ntfs_log_perror("malloc failed");
-		goto out;
-	}
 	
 	*root = *((INDEX_ROOT *)((u8 *)ctx->attr +
 				le16_to_cpu(ctx->attr->value_offset)));

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog, 1.392, 1.393 configure.ac, 1.109, 1.110

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv19627

Modified Files:
	ChangeLog configure.ac 
Log Message:
Merge index code from ntfs-3g. Clean it a bit and fix adding index allocation when index root in the base mft record.


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- ChangeLog	2 Aug 2006 03:12:34 -0000	1.392
+++ ChangeLog	2 Aug 2006 03:55:41 -0000	1.393
@@ -8,6 +8,8 @@ xx/xx/2006 - x.xx.x - .
 	  ntfs kernel driver to the same function.  (Anton)
 	- Add new API ntfs_attr_exist() that checks whether attribute with
 	  selected type and name already present in inode.  (Szaka)
+	- Extend ntfs_index_{add_filename,rm} to support almost all cases of
+	  index operations.  (Szaka, Yura)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

Index: configure.ac
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- configure.ac	17 Jul 2006 11:49:52 -0000	1.109
+++ configure.ac	2 Aug 2006 03:55:41 -0000	1.110
@@ -22,7 +22,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([ntfsprogs],[1.13.1],[lin...@li...])
+AC_INIT([ntfsprogs],[3.0.0-WIP],[lin...@li...])
 
 #
 # Before making a release, the LTVERSION string should be modified.

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs attrib.h,1.29,1.30

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357.server4you.de:/tmp/cvs-serv12027/include/ntfs

Modified Files:
	attrib.h 
Log Message:
Add new API ntfs_attr_exist() that checks whether attribute with selected type and name already present in inode.  (Szaka)


Index: attrib.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/attrib.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- attrib.h	27 Mar 2006 20:01:36 -0000	1.29
+++ attrib.h	2 Aug 2006 03:12:34 -0000	1.30
@@ -317,6 +317,9 @@ extern int ntfs_attr_update_mapping_pair
 
 extern int ntfs_attr_truncate(ntfs_attr *na, const s64 newsize);
 
+extern int ntfs_attr_exist(ntfs_inode *ni, const ATTR_TYPES type,
+		ntfschar *name, u32 name_len);
+
 // FIXME / TODO: Above here the file is cleaned up. (AIA)
 /**
  * get_attribute_value_length - return the length of the value of an attribute

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.217,1.218

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv12027/libntfs

Modified Files:
	attrib.c 
Log Message:
Add new API ntfs_attr_exist() that checks whether attribute with selected type and name already present in inode.  (Szaka)


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- attrib.c	2 Aug 2006 01:33:54 -0000	1.217
+++ attrib.c	2 Aug 2006 03:12:34 -0000	1.218
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2000-2006 Anton Altaparmakov
  * Copyright (c) 2002-2005 Richard Russon
+ * Copyright (c) 2002-2006 Szabolcs Szakacsits
  * Copyright (c) 2004-2006 Yura Pakhuchiy
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -5057,3 +5058,24 @@ out:
 	return ret;
 }
 
+/**
+ * ntfs_attr_exist - FIXME: description
+ */
+int ntfs_attr_exist(ntfs_inode *ni, const ATTR_TYPES type, ntfschar *name,
+		u32 name_len)
+{
+	ntfs_attr_search_ctx *ctx;
+	int ret;
+	
+	ntfs_log_trace("Entering.\n");
+	
+	ctx = ntfs_attr_get_search_ctx(ni, NULL);
+	if (!ctx)
+		return 0;
+	
+	ret = ntfs_attr_lookup(type, name, name_len, CASE_SENSITIVE, 0, NULL, 0,
+			       ctx);
+
+	ntfs_attr_put_search_ctx(ctx);
+	return !ret;
+}

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.391,1.392

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv12027

Modified Files:
	ChangeLog 
Log Message:
Add new API ntfs_attr_exist() that checks whether attribute with selected type and name already present in inode.  (Szaka)


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- ChangeLog	24 Jul 2006 08:59:55 -0000	1.391
+++ ChangeLog	2 Aug 2006 03:12:34 -0000	1.392
@@ -2,9 +2,12 @@ xx/xx/2006 - x.xx.x - .
 
 	- ntfsmount now creates files and directories with security descriptor
 	  that grant full access to everyone.  (Yura)
+	- Fix typo that lead to incorrect sparse file size calculation.  (Yuval)
 	- Fix long standing stupendously stupid bug in libntfs/attrib.c::
 	  ntfs_external_attr_find() and also port a bugfix from the advanced
 	  ntfs kernel driver to the same function.  (Anton)
+	- Add new API ntfs_attr_exist() that checks whether attribute with
+	  selected type and name already present in inode.  (Szaka)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.143,1.144

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv11783/ntfsprogs

Modified Files:
	mkntfs.c 
Log Message:
introduce ntfs_[cm]alloc


Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- mkntfs.c	16 May 2006 12:12:45 -0000	1.143
+++ mkntfs.c	2 Aug 2006 03:11:12 -0000	1.144
@@ -530,20 +530,6 @@ static time_t mkntfs_time(void)
 }
 
 /**
- * mkntfs_calloc
- */
-static void *ntfs_calloc(size_t nmemb, size_t size)
-{
-	void *p;
-	
-	p = calloc(nmemb, size);
-	if (!p)
-		ntfs_log_perror("Failed to calloc() %lld bytes", 
-				(long long)nmemb * size);
-	return p;
-}
-
-/**
  * append_to_bad_blocks
  */
 static BOOL append_to_bad_blocks(unsigned long long block)
@@ -674,7 +660,7 @@ static s64 ntfs_rlwrite(struct ntfs_devi
 	}
 	if (delta) {
 		int eo;
-		char *b = ntfs_calloc(1, delta);
+		char *b = ntfs_calloc(delta);
 		if (!b)
 			return -1;
 		bytes_written = mkntfs_write(dev, b, delta);
@@ -2449,7 +2435,7 @@ static int upgrade_to_large_index(MFT_RE
 	err = add_attr_bitmap(m, name, name_len, ic, bmp, sizeof(bmp));
 	if (err)
 		goto err_out;
-	ia_val = ntfs_calloc(1, index_block_size);
+	ia_val = ntfs_calloc(index_block_size);
 	if (!ia_val) {
 		err = -errno;
 		goto err_out;
@@ -2801,10 +2787,10 @@ static int initialize_secure(char *sds, 
 	sdh_size += sizeof(SDH_INDEX_KEY) + sizeof(SDH_INDEX_DATA);
 	sii_size  = sizeof(INDEX_ENTRY_HEADER);
 	sii_size += sizeof(SII_INDEX_KEY) + sizeof(SII_INDEX_DATA);
-	idx_entry_sdh = ntfs_calloc(1, sizeof(INDEX_ENTRY));
+	idx_entry_sdh = ntfs_calloc(sizeof(INDEX_ENTRY));
 	if (!idx_entry_sdh)
 		return -errno;
-	idx_entry_sii = ntfs_calloc(1, sizeof(INDEX_ENTRY));
+	idx_entry_sii = ntfs_calloc(sizeof(INDEX_ENTRY));
 	if (!idx_entry_sii) {
 		free(idx_entry_sdh);
 		return -errno;
@@ -2876,7 +2862,7 @@ static int initialize_quota(MFT_RECORD *
 	err = 0;
 	/* q index entry num 1 */
 	q1_size = 0x48;
-	idx_entry_q1 = ntfs_calloc(1, q1_size);
+	idx_entry_q1 = ntfs_calloc(q1_size);
 	if (!idx_entry_q1)
 		return errno;
 	idx_entry_q1->data_offset = const_cpu_to_le16(0x14);
@@ -2905,7 +2891,7 @@ static int initialize_quota(MFT_RECORD *
 		return err;
 	/* q index entry num 2 */
 	q2_size = 0x58;
-	idx_entry_q2 = ntfs_calloc(1, q2_size);
+	idx_entry_q2 = ntfs_calloc(q2_size);
 	if (!idx_entry_q2)
 		return errno;
 	idx_entry_q2->data_offset = const_cpu_to_le16(0x14);
@@ -2941,7 +2927,7 @@ static int initialize_quota(MFT_RECORD *
 	if (err)
 		return err;
 	o_size = 0x28;
-	idx_entry_o = ntfs_calloc(1, o_size);
+	idx_entry_o = ntfs_calloc(o_size);
 	if (!idx_entry_o)
 		return errno;
 	idx_entry_o->data_offset = const_cpu_to_le16(0x20);
@@ -3182,7 +3168,7 @@ static int create_hardlink_res(MFT_RECOR
 	}
 	/* Insert the index entry for file_name in @idx. */
 	idx_size = (fn_size + 7)  & ~7;
-	idx_entry_new = ntfs_calloc(1, idx_size + 0x10);
+	idx_entry_new = ntfs_calloc(idx_size + 0x10);
 	if (!idx_entry_new)
 		return -errno;
 	idx_entry_new->indexed_file = ref_file;
@@ -3765,7 +3751,7 @@ static BOOL mkntfs_initialize_bitmaps(vo
 			~(g_vol->cluster_size - 1);
 	ntfs_log_debug("g_lcn_bitmap_byte_size = %i, allocated = %llu\n",
 			g_lcn_bitmap_byte_size, i);
-	g_lcn_bitmap = ntfs_calloc(1, g_lcn_bitmap_byte_size);
+	g_lcn_bitmap = ntfs_calloc(g_lcn_bitmap_byte_size);
 	if (!g_lcn_bitmap)
 		return FALSE;
 	/*
@@ -3794,7 +3780,7 @@ static BOOL mkntfs_initialize_bitmaps(vo
 	g_mft_bitmap_byte_size = (g_mft_bitmap_byte_size + 7) & ~7;
 	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 = ntfs_calloc(1, g_mft_bitmap_byte_size);
+	g_mft_bitmap = ntfs_calloc(g_mft_bitmap_byte_size);
 	if (!g_mft_bitmap)
 		return FALSE;
 	/* Create runlist for mft bitmap. */
@@ -4585,7 +4571,7 @@ static BOOL mkntfs_create_root_structure
 
 	ntfs_log_verbose("Creating $Boot (mft record 7)\n");
 	m = (MFT_RECORD*)(g_buf + 7 * g_vol->mft_record_size);
-	bs = ntfs_calloc(1, 8192);
+	bs = ntfs_calloc(8192);
 	if (!bs)
 		return FALSE;
 	memcpy(bs, boot_array, sizeof(boot_array));
@@ -4744,19 +4730,19 @@ static BOOL mkntfs_create_root_structure
 			if (g_vol->minor_ver == 0) {
 				buf_sds_first_size = 0x1E0;
 				buf_sds_size = 0x40000 + buf_sds_first_size;
-				buf_sds_init = ntfs_calloc(1, buf_sds_first_size);
+				buf_sds_init = ntfs_calloc(buf_sds_first_size);
 				if (!buf_sds_init)
 					return FALSE;
 				init_secure_30(buf_sds_init);
 			} else {
 				buf_sds_first_size = 0xFC;
 				buf_sds_size = 0x40000 + buf_sds_first_size;
-				buf_sds_init = ntfs_calloc(1, buf_sds_first_size);
+				buf_sds_init = ntfs_calloc(buf_sds_first_size);
 				if (!buf_sds_init)
 					return FALSE;
 				init_secure_31(buf_sds_init);
 			}
-			buf_sds = ntfs_calloc(1, buf_sds_size);
+			buf_sds = ntfs_calloc(buf_sds_size);
 			if (!buf_sds) {
 				free(buf_sds_init);
 				return FALSE;
@@ -4989,7 +4975,7 @@ static int mkntfs_redirect(struct mkntfs
 	}
 	init_upcase_table(g_vol->upcase, g_vol->upcase_len * sizeof(ntfschar));
 	if (g_vol->major_ver < 3) {
-		g_vol->attrdef = ntfs_calloc(1, 36000);
+		g_vol->attrdef = ntfs_calloc(36000);
 		if (g_vol->attrdef) {
 			memcpy(g_vol->attrdef, attrdef_ntfs12_array,
 					sizeof(attrdef_ntfs12_array));
@@ -5029,7 +5015,7 @@ static int mkntfs_redirect(struct mkntfs
 	if (!mkntfs_initialize_rl_boot())
 		goto done;
 	/* Allocate a buffer large enough to hold the mft. */
-	g_buf = ntfs_calloc(1, g_mft_size);
+	g_buf = ntfs_calloc(g_mft_size);
 	if (!g_buf)
 		goto done;
 	/* Create runlist for $BadClus, $DATA named stream $Bad. */

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

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357.server4you.de:/tmp/cvs-serv11783/include/ntfs

Modified Files:
	support.h 
Log Message:
introduce ntfs_[cm]alloc


Index: support.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/support.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- support.h	13 Jul 2006 02:49:07 -0000	1.9
+++ support.h	2 Aug 2006 03:11:12 -0000	1.10
@@ -1,7 +1,9 @@
 /*
- * support.h - Useful definitions and macros. Part of the Linux-NTFS project.
+ * support.h - Various useful things. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2004 Anton Altaparmakov
+ * Copyright (c)      2006 Szabolcs Szakacsits
+ * Copyright (c)      2006 Yura Pakhuchiy
  *
  * This program/include file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -22,6 +24,10 @@
 #ifndef _NTFS_SUPPORT_H
 #define _NTFS_SUPPORT_H
 
+#include <stdlib.h>
+
+#include "logging.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -88,5 +94,29 @@
 	old_state;					\
 })
 
-#endif /* defined _NTFS_SUPPORT_H */
+/**
+ * ntfs_calloc, ntfs_malloc
+ * 
+ * Return a pointer to the allocated memory or NULL if the request fails.
+ */
+static inline void *ntfs_calloc(size_t size)
+{
+	void *p;
+	
+	p = calloc(1, size);
+	if (!p)
+		ntfs_log_perror("Failed to calloc %lld bytes", (long long)size);
+	return p;
+}
+
+static inline void *ntfs_malloc(size_t size)
+{
+	void *p;
+	
+	p = malloc(size);
+	if (!p)
+		ntfs_log_perror("Failed to malloc %lld bytes", (long long)size);
+	return p;
+}
 
+#endif /* defined _NTFS_SUPPORT_H */

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.216,1.217

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv25718/libntfs

Modified Files:
	attrib.c 
Log Message:
80 chars per line cleanup


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- attrib.c	27 Jul 2006 08:38:17 -0000	1.216
+++ attrib.c	2 Aug 2006 01:33:54 -0000	1.217
@@ -207,10 +207,11 @@ s64 ntfs_get_attribute_value(const ntfs_
 					errno = eo;
 				} else if (r < rl[i].length <<
 						vol->cluster_size_bits) {
-					ntfs_log_debug(ESTR ": Ran out of input data.\n");
+					ntfs_log_debug(ESTR": Ran out of "
+							"input data.\n");
 					errno = EIO;
 				} else {
-					ntfs_log_debug(ESTR ": unknown error\n");
+					ntfs_log_debug(ESTR": unknown error\n");
 					errno = EIO;
 				}
 #undef ESTR
@@ -244,7 +245,8 @@ s64 ntfs_get_attribute_value(const ntfs_
 				ntfs_log_perror(ESTR);
 				errno = eo;
 			} else if (r < rl[i].length << vol->cluster_size_bits) {
-				ntfs_log_debug(ESTR ": Ran out of input data.\n");
+				ntfs_log_debug(ESTR ": Ran out of "
+						"input data.\n");
 				errno = EIO;
 			} else {
 				ntfs_log_debug(ESTR ": unknown error\n");
@@ -555,8 +557,9 @@ int ntfs_attr_map_whole_runlist(ntfs_att
 		/* Are we in the first extent? */
 		if (!next_vcn) {
 			 if (a->lowest_vcn) {
-				ntfs_log_trace("First extent of attribute has non "
-					"zero lowest_vcn. Inode is corrupt.\n");
+				ntfs_log_trace("First extent of attribute has "
+						"non zero lowest_vcn. "
+						"Inode is corrupt.\n");
 				errno = EIO;
 				goto err_out;
 			}
@@ -586,7 +589,8 @@ int ntfs_attr_map_whole_runlist(ntfs_att
 	if (!a) {
 		err = errno;
 		if (err == ENOENT)
-			ntfs_log_trace("Attribute not found. Inode is corrupt.\n");
+			ntfs_log_trace("Attribute not found. "
+					"Inode is corrupt.\n");
 		else
 			ntfs_log_trace("Inode is corrupt.\n");
 		errno = err;
@@ -596,7 +600,8 @@ int ntfs_attr_map_whole_runlist(ntfs_att
 		ntfs_log_trace("Failed to load the complete run list for the "
 				"attribute. Bug or corrupt inode.\n");
 		ntfs_log_trace("highest_vcn = 0x%llx, last_vcn - 1 = 0x%llx\n",
-				(long long)highest_vcn, (long long)last_vcn - 1);
+				(long long)highest_vcn,
+				(long long)last_vcn - 1);
 		errno = EIO;
 		goto err_out;
 	}
@@ -767,8 +772,8 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
 	ntfs_volume *vol;
 	runlist_element *rl;
 
-	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, pos 0x%llx, count "
-			"0x%llx.\n", (unsigned long long)na->ni->mft_no,
+	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, pos 0x%llx, "
+			"count 0x%llx.\n", (unsigned long long)na->ni->mft_no,
 			na->type, (long long)pos, (long long)count);
 	if (!na || !na->ni || !na->ni->vol || !b || pos < 0 || count < 0) {
 		errno = EINVAL;
@@ -888,8 +893,9 @@ res_err_out:
 		to_read = min(count, (rl->length << vol->cluster_size_bits) -
 				ofs);
 retry:
-		ntfs_log_trace("Reading 0x%llx bytes from vcn 0x%llx, lcn 0x%llx, "
-				"ofs 0x%llx.\n", to_read, rl->vcn, rl->lcn, ofs);
+		ntfs_log_trace("Reading 0x%llx bytes from vcn 0x%llx, "
+				"lcn 0x%llx, ofs 0x%llx.\n", to_read, rl->vcn,
+				rl->lcn, ofs);
 		br = ntfs_pread(vol->dev, (rl->lcn << vol->cluster_size_bits) +
 				ofs, to_read, b);
 		/* If everything ok, update progress counters and continue. */
@@ -1056,8 +1062,9 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 							to_write, buf);
 				if (written <= 0) {
 					err = errno;
-					ntfs_log_trace("Failed to zero space between "
-							"initialized size and @pos.\n");
+					ntfs_log_trace("Failed to zero space "
+							"between initialized "
+							"size and @pos.\n");
 					free(buf);
 					errno = err;
 					goto err_out;
@@ -1175,7 +1182,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 			/* The buffer is non zero, instantiate the hole. */
 			cur_vcn = rl->vcn;
 			from_vcn = rl->vcn + (ofs >> vol->cluster_size_bits);
-			ntfs_log_trace("Instantiate the hole with vcn 0x%llx.\n",
+			ntfs_log_trace("Instantiate hole with vcn 0x%llx.\n",
 					cur_vcn);
 			/*
 			 * Map whole runlist to be able update mapping pairs
@@ -1229,8 +1236,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 						lcn_seek_from, DATA_ZONE);
 			if (!rlc) {
 				eo = errno;
-				ntfs_log_trace("Failed to allocate clusters for hole "
-						"instantiating.\n");
+				ntfs_log_trace("Failed to allocate clusters "
+						"for hole instantiating.\n");
 				errno = eo;
 				goto err_out;
 			}
@@ -1242,7 +1249,8 @@ 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\n");
+						"inconstant metadata. "
+						"Run chkdsk\n");
 				}
 				errno = eo;
 				goto err_out;
@@ -1285,7 +1293,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 				buf = malloc(ofs);
 				if (!buf) {
 					ntfs_log_trace("Not enough memory to "
-							"allocate %lld bytes.\n", ofs);
+							"allocate %lld "
+							"bytes.\n", ofs);
 					errno = ENOMEM;
 					goto err_out;
 				}
@@ -1294,7 +1303,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 							vol->cluster_size_bits,
 							ofs, buf) < 0) {
 					eo = errno;
-					ntfs_log_trace("Failed to zero area.\n");
+					ntfs_log_trace("Failed to zero "
+							"area.\n");
 					free(buf);
 					errno = eo;
 					goto err_out;
@@ -1451,9 +1461,9 @@ s64 ntfs_attr_mst_pread(ntfs_attr *na, c
 	s64 br;
 	u8 *end;
 
-	ntfs_log_trace("Entering for inode 0x%llx, attr type 0x%x, pos 0x%llx.\n",
-			(unsigned long long)na->ni->mft_no, na->type,
-			(long long)pos);
+	ntfs_log_trace("Entering for inode 0x%llx, attr type 0x%x, "
+			"pos 0x%llx.\n", (unsigned long long)na->ni->mft_no,
+			na->type, (long long)pos);
 	if (bk_cnt < 0 || bk_size % NTFS_BLOCK_SIZE) {
 		errno = EINVAL;
 		return -1;
@@ -1504,9 +1514,9 @@ s64 ntfs_attr_mst_pwrite(ntfs_attr *na, 
 {
 	s64 written, i;
 
-	ntfs_log_trace("Entering for inode 0x%llx, attr type 0x%x, pos 0x%llx.\n",
-			(unsigned long long)na->ni->mft_no, na->type,
-			(long long)pos);
+	ntfs_log_trace("Entering for inode 0x%llx, attr type 0x%x, "
+			"pos 0x%llx.\n", (unsigned long long)na->ni->mft_no,
+			na->type, (long long)pos);
 	if (bk_cnt < 0 || bk_size % NTFS_BLOCK_SIZE) {
 		errno = EINVAL;
 		return -1;
@@ -1913,8 +1923,9 @@ find_attr_list_attr:
 				return rc;
 
 			/* Not found?!? Absurd! Must be a bug... )-: */
-			ntfs_log_trace("BUG! Attribute list attribute not found but "
-					"it exists! Returning error (EINVAL).\n");
+			ntfs_log_trace("BUG! Attribute list attribute not "
+					"found but it exists! "
+					"Returning error (EINVAL).\n");
 			errno = EINVAL;
 			return -1;
 		}
@@ -2031,7 +2042,8 @@ is_enumeration:
 				ni = ntfs_extent_inode_open(base_ni,
 						al_entry->mft_reference);
 				if (!ni) {
-					ntfs_log_perror("Failed to map extent inode");
+					ntfs_log_perror("Failed to map extent "
+							"inode");
 					break;
 				}
 				ctx->ntfs_ino = ni;
@@ -2700,7 +2712,8 @@ int ntfs_non_resident_attr_record_add(nt
 	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, lowest_vcn %lld, "
 			"dataruns_size %d, flags 0x%x.\n",
 			(long long) ni->mft_no, (unsigned) type,
-			(long long) lowest_vcn, dataruns_size, (unsigned) flags);
+			(long long) lowest_vcn, dataruns_size,
+			(unsigned) flags);
 
 	if (!ni || dataruns_size <= 0 || (!name && name_len)) {
 		errno = EINVAL;
@@ -2712,7 +2725,8 @@ int ntfs_non_resident_attr_record_add(nt
 		if (errno == EPERM)
 			ntfs_log_trace("Attribute can't be non resident.\n");
 		else
-			ntfs_log_trace("ntfs_attr_can_be_non_resident failed.\n");
+			ntfs_log_trace("ntfs_attr_can_be_non_resident() "
+					"failed.\n");
 		errno = err;
 		return -1;
 	}
@@ -2801,8 +2815,8 @@ int ntfs_non_resident_attr_record_add(nt
 	if (ntfs_attr_lookup(type, name, name_len, CASE_SENSITIVE,
 					lowest_vcn, NULL, 0, ctx)) {
 		err = errno;
-		ntfs_log_trace("Attribute lookup failed. Probably leaving inconstant "
-				"metadata.\n");
+		ntfs_log_trace("Attribute lookup failed. Probably leaving "
+				"inconstant metadata.\n");
 		ntfs_attr_put_search_ctx(ctx);
 		errno = err;
 		return -1;
@@ -2852,12 +2866,12 @@ int ntfs_attr_record_rm(ntfs_attr_search
 
 	/* Remove attribute itself. */
 	if (ntfs_attr_record_resize(ctx->mrec, ctx->attr, 0)) {
-		ntfs_log_trace("Couldn't remove attribute record. Bug or damaged MFT "
-				"record.\n");
+		ntfs_log_trace("Couldn't remove attribute record. "
+				"Bug or damaged MFT record.\n");
 		if (NInoAttrList(base_ni) && type != AT_ATTRIBUTE_LIST)
 			if (ntfs_attrlist_entry_add(ni, ctx->attr))
-				ntfs_log_trace("Rollback failed. Leaving inconstant "
-						"metadata.\n");
+				ntfs_log_trace("Rollback failed. Leaving "
+						"inconstant metadata.\n");
 		err = EIO;
 		return -1;
 	}
@@ -2924,8 +2938,9 @@ int ntfs_attr_record_rm(ntfs_attr_search
 			al_rl = ntfs_mapping_pairs_decompress(base_ni->vol,
 					ctx->attr, NULL);
 			if (!al_rl) {
-				ntfs_log_trace("Couldn't decompress attribute list "
-						"runlist. Succeed anyway.\n");
+				ntfs_log_trace("Couldn't decompress attribute "
+						"list runlist. Return success "
+						"anyway.\n");
 				return 0;
 			}
 			if (ntfs_cluster_free_from_rl(base_ni->vol, al_rl)) {
@@ -2942,8 +2957,8 @@ int ntfs_attr_record_rm(ntfs_attr_search
 			 * complain if it find MFT record with attribute list,
 			 * but without extents.
 			 */
-			ntfs_log_trace("Couldn't remove attribute list. Succeed "
-					"anyway.\n");
+			ntfs_log_trace("Couldn't remove attribute list. "
+					"Return success anyway.\n");
 			return 0;
 		}
 	}
@@ -3001,7 +3016,7 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T
 	if (ntfs_attr_size_bounds_check(ni->vol, type, size)) {
 		err = errno;
 		if (err == ERANGE) {
-			ntfs_log_trace("Size bounds check failed. Aborting...\n");
+			ntfs_log_trace("Size bounds check failed.\n");
 		} else if (err == ENOENT) {
 			ntfs_log_trace("Invalid attribute type. Aborting...\n");
 			err = EIO;
@@ -3014,12 +3029,13 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T
 	if (ntfs_attr_can_be_non_resident(ni->vol, type)) {
 		if (errno != EPERM) {
 			err = errno;
-			ntfs_log_trace("ntfs_attr_can_be_non_resident failed.\n");
+			ntfs_log_trace("ntfs_attr_can_be_non_resident() "
+					"failed.\n");
 			goto err_out;
 		}
 		/* @val is mandatory. */
 		if (!val) {
-			ntfs_log_trace("val is mandatory for always resident "
+			ntfs_log_trace("@val is mandatory for always resident "
 					"attributes.\n");
 			errno = EINVAL;
 			return -1;
@@ -3144,7 +3160,7 @@ add_attr_record:
 		ntfs_log_trace("Failed to initialize just added attribute.\n");
 		if (ntfs_attr_rm(na)) {
 			ntfs_log_trace("Failed to remove just added attribute. "
-					"Probably leaving inconstant metadata.\n");
+					"Probably leaving damaged metadata.\n");
 			ntfs_attr_close(na);
 		}
 		goto err_out;
@@ -3201,8 +3217,8 @@ int ntfs_attr_rm(ntfs_attr *na)
 		if (ntfs_attr_map_whole_runlist(na))
 			return -1;
 		if (ntfs_cluster_free(na->ni->vol, na, 0, -1) < 0) {
-			ntfs_log_trace("Failed to free cluster allocation. Leaving "
-					"inconstant metadata.\n");
+			ntfs_log_trace("Failed to free cluster allocation. "
+					"Leaving inconstant metadata.\n");
 			ret = -1;
 		}
 	}
@@ -3214,15 +3230,15 @@ int ntfs_attr_rm(ntfs_attr *na)
 	while (!ntfs_attr_lookup(na->type, na->name, na->name_len,
 				CASE_SENSITIVE, 0, NULL, 0, ctx)) {
 		if (ntfs_attr_record_rm(ctx)) {
-			ntfs_log_trace("Failed to remove attribute extent. Leaving "
-					"inconstant metadata.\n");
+			ntfs_log_trace("Failed to remove attribute extent. "
+					"Leaving inconstant metadata.\n");
 			ret = -1;
 		}
 		ntfs_attr_reinit_search_ctx(ctx);
 	}
 	if (errno != ENOENT) {
-		ntfs_log_trace("Attribute lookup failed. Probably leaving inconstant "
-				"metadata.\n");
+		ntfs_log_trace("Attribute lookup failed. "
+				"Probably leaving inconstant metadata.\n");
 		ret = -1;
 	}
 
@@ -3301,7 +3317,7 @@ int ntfs_resident_attr_value_resize(MFT_
 	 */
 	if (a->name_length && le16_to_cpu(a->name_offset) >=
 			le16_to_cpu(a->value_offset)) {
-		ntfs_log_trace("Eeek!  Name is placed after the attribute value. "
+		ntfs_log_trace("Name is placed after the attribute value. "
 				"Corrupted inode. Run chkdsk.  Aborting...\n");
 		errno = EIO;
 		return -1;
@@ -3311,7 +3327,7 @@ int ntfs_resident_attr_value_resize(MFT_
 			new_size + 7) & ~7) < 0) {
 		if (errno != ENOSPC) {
 			int eo = errno;
-			ntfs_log_trace("Eeek!  Attribute record resize failed.  "
+			ntfs_log_trace("Attribute record resize failed.  "
 					"Aborting...\n");
 			errno = eo;
 		}
@@ -3352,8 +3368,8 @@ int ntfs_attr_record_move_to(ntfs_attr_s
 		return -1;
 	}
 
-	ntfs_log_trace("Entering for ctx->attr->type 0x%x, ctx->ntfs_ino->mft_no "
-			"0x%llx, ni->mft_no 0x%llx.\n",
+	ntfs_log_trace("Entering for ctx->attr->type 0x%x, "
+			"ctx->ntfs_ino->mft_no 0x%llx, ni->mft_no 0x%llx.\n",
 			(unsigned) le32_to_cpu(ctx->attr->type),
 			(long long) ctx->ntfs_ino->mft_no,
 			(long long) ni->mft_no);
@@ -3362,8 +3378,8 @@ int ntfs_attr_record_move_to(ntfs_attr_s
 		return 0;
 
 	if (!ctx->al_entry) {
-		ntfs_log_trace("Inode should contain attribute list to use this "
-				"function.\n");
+		ntfs_log_trace("Inode should contain attribute list to use "
+				"this function.\n");
 		errno = EINVAL;
 		return -1;
 	}
@@ -3460,8 +3476,8 @@ int ntfs_attr_record_move_away(ntfs_attr
 		base_ni = ctx->ntfs_ino;
 
 	if (!NInoAttrList(base_ni)) {
-		ntfs_log_trace("Inode should contain attribute list to use this "
-				"function.\n");
+		ntfs_log_trace("Inode should contain attribute list to use "
+				"this function.\n");
 		errno = EINVAL;
 		return -1;
 	}
@@ -3564,7 +3580,7 @@ static int ntfs_attr_make_non_resident(n
 	 */
 	if (a->name_length && le16_to_cpu(a->name_offset) >=
 			le16_to_cpu(a->value_offset)) {
-		ntfs_log_trace("Eeek!  Name is placed after the attribute value. "
+		ntfs_log_trace("Name is placed after the attribute value. "
 				"Corrupted inode. Run chkdsk.  Aborting...\n");
 		errno = EIO;
 		return -1;
@@ -3611,7 +3627,7 @@ static int ntfs_attr_make_non_resident(n
 				(u8*)a + le16_to_cpu(a->value_offset));
 		if (bw != le32_to_cpu(a->value_length)) {
 			err = errno;
-			ntfs_log_debug("Eeek!  Failed to write out attribute value "
+			ntfs_log_debug("Failed to write out attribute value "
 					"(bw = %lli, errno = %i).  "
 					"Aborting...\n", (long long)bw, err);
 			if (bw >= 0)
@@ -3623,7 +3639,7 @@ static int ntfs_attr_make_non_resident(n
 	mp_size = ntfs_get_size_for_mapping_pairs(vol, rl, 0);
 	if (mp_size < 0) {
 		err = errno;
-		ntfs_log_debug("Eeek!  Failed to get size for mapping pairs array.  "
+		ntfs_log_debug("Failed to get size for mapping pairs array.  "
 				"Aborting...\n");
 		goto cluster_free_err_out;
 	}
@@ -3641,7 +3657,7 @@ static int ntfs_attr_make_non_resident(n
 	if (ntfs_attr_record_resize(ctx->mrec, a, arec_size) < 0) {
 		err = errno;
 		if (err != ENOSPC) {
-			ntfs_log_trace("Eeek!  Failed to resize attribute record.  "
+			ntfs_log_trace("Failed to resize attribute record.  "
 					"Aborting...\n");
 		}
 		goto cluster_free_err_out;
@@ -3695,7 +3711,7 @@ static int ntfs_attr_make_non_resident(n
 
 cluster_free_err_out:
 	if (rl && ntfs_cluster_free(vol, na, 0, -1) < 0)
-		ntfs_log_trace("Eeek!  Failed to release allocated clusters in error "
+		ntfs_log_trace("Failed to release allocated clusters in error "
 				"code path.  Leaving inconsistent metadata...\n");
 	NAttrClearNonResident(na);
 	na->allocated_size = na->data_size;
@@ -3775,8 +3791,8 @@ static int ntfs_resident_attr_resize(ntf
 		/* Error! If not enough space, just continue. */
 		if (errno != ENOSPC) {
 			err = errno;
-			ntfs_log_trace("Eeek!  Failed to resize resident part of "
-					"attribute.  Aborting...\n");
+			ntfs_log_trace("Eeek!  Failed to resize resident part "
+					"of attribute.  Aborting...\n");
 			goto put_err_out;
 		}
 	}
@@ -3843,8 +3859,9 @@ static int ntfs_resident_attr_resize(ntf
 		if (ntfs_inode_free_space(na->ni, offsetof(ATTR_RECORD,
 				non_resident_end) + 8)) {
 			err = errno;
-			ntfs_log_trace("Couldn't free space in the MFT record to "
-					"make attribute list non resident.\n");
+			ntfs_log_trace("Couldn't free space in the MFT record "
+					"to make attribute list non "
+					"resident.\n");
 			errno = err;
 			return -1;
 		}
@@ -3954,7 +3971,7 @@ static int ntfs_attr_make_resident(ntfs_
 
 	/* Should be called for the first extent of the attribute. */
 	if (sle64_to_cpu(a->lowest_vcn)) {
-		ntfs_log_trace("Eeek!  Should be called for the first extent of the "
+		ntfs_log_trace("Should be called for the first extent of the "
 				"attribute.  Aborting...\n");
 		err = EINVAL;
 		return -1;
@@ -3962,7 +3979,7 @@ static int ntfs_attr_make_resident(ntfs_
 
 	/* Some preliminary sanity checking. */
 	if (!NAttrNonResident(na)) {
-		ntfs_log_trace("Eeek!  Trying to make resident attribute resident.  "
+		ntfs_log_trace("Trying to make resident attribute resident.  "
 				"Aborting...\n");
 		errno = EINVAL;
 		return -1;
@@ -3984,15 +4001,15 @@ static int ntfs_attr_make_resident(ntfs_
 	 */
 	if (a->name_length && le16_to_cpu(a->name_offset) >=
 			le16_to_cpu(a->mapping_pairs_offset)) {
-		ntfs_log_trace("Eeek!  Damaged attribute. Name is placed after the "
-				"mapping pairs array. Run chkdsk.  Aborting...\n");
+		ntfs_log_trace("Damaged attribute. Name is placed after the "
+				"mapping pairs array. Run chkdsk. Aborting.\n");
 		errno = EIO;
 		return -1;
 	}
 
 	if (NAttrCompressed(na) || NAttrEncrypted(na)) {
-		ntfs_log_trace("Making compressed or encrypted files resident is not "
-				"implemented yet.\n");
+		ntfs_log_trace("Making compressed or encrypted files resident "
+				"is not implemented yet.\n");
 		errno = EOPNOTSUPP;
 		return -1;
 	}
@@ -4827,7 +4844,7 @@ static int ntfs_non_resident_attr_expand
 					DATA_ZONE);
 			if (!rl) {
 				err = errno;
-				ntfs_log_trace("Eeek! Cluster allocation failed.\n");
+				ntfs_log_trace("Cluster allocation failed.\n");
 				errno = err;
 				return -1;
 			}

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.62,1.63

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv24878/libntfs

Modified Files:
	dir.c 
Log Message:
bit move verbose in ntfs_delete()


Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- dir.c	17 Jul 2006 11:55:29 -0000	1.62
+++ dir.c	28 Jul 2006 23:15:35 -0000	1.63
@@ -1491,6 +1491,8 @@ search:
 		errno = 0;
 		fn = (FILE_NAME_ATTR*)((u8*)actx->attr +
 				le16_to_cpu(actx->attr->value_offset));
+		ntfs_log_trace("Found filename with instance number %d.\n",
+				le16_to_cpu(actx->attr->instance));
 		if (looking_for_dos_name) {
 			if (fn->file_name_type == FILE_NAME_DOS)
 				break;
@@ -1513,6 +1515,8 @@ search:
 			if (fn->file_name_type == FILE_NAME_WIN32) {
 				looking_for_dos_name = TRUE;
 				ntfs_attr_reinit_search_ctx(actx);
+				ntfs_log_trace("Restart search. "
+						"Looking for DOS name.\n");
 				continue;
 			}
 			if (fn->file_name_type == FILE_NAME_DOS)
@@ -1528,6 +1532,7 @@ search:
 		if (errno == ENOENT && case_sensitive_match) {
 			case_sensitive_match = FALSE;
 			ntfs_attr_reinit_search_ctx(actx);
+			ntfs_log_trace("Restart search. Ignore case.");
 			goto search;
 		}
 		ntfs_log_error("Failed to find requested filename in FILE_NAME "
@@ -1562,6 +1567,7 @@ search:
 		}
 		ntfs_attr_close(na);
 	}
+	ntfs_log_trace("Found!\n");
 	/* Search for such FILE_NAME in index. */
 	ictx = ntfs_index_ctx_get(dir_ni, NTFS_INDEX_I30, 4);
 	if (!ictx)
@@ -1596,8 +1602,11 @@ search:
 		looking_for_dos_name = FALSE;
 		looking_for_win32_name = TRUE;
 		ntfs_attr_reinit_search_ctx(actx);
+		ntfs_log_trace("DOS name deleted. "
+				"Now search for WIN32 name.\n");
 		goto search;
-	}
+	} else
+		ntfs_log_trace("Deleted.\n");
 	/* TODO: Update object id, quota and securiry indexes if required. */
 	/*
 	 * If hard link count is not equal to zero then we are done. In other
@@ -1616,13 +1625,13 @@ search:
 			if (!rl) {
 				err = errno;
 				ntfs_log_error("Failed to decompress runlist.  "
-						"Leaving inconsistent metadata.\n");
+						"Leaving damaged metadata.\n");
 				continue;
 			}
 			if (ntfs_cluster_free_from_rl(ni->vol, rl)) {
 				err = errno;
 				ntfs_log_error("Failed to free clusters.  "
-						"Leaving inconsistent metadata.\n");
+						"Leaving damaged metadata.\n");
 				continue;
 			}
 			free(rl);

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

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv13287/libntfs

Modified Files:
	volume.c 
Log Message:
Set vol->mft_ni->flags.  (Szaka)


Index: volume.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- volume.c	17 Jul 2006 11:49:52 -0000	1.70
+++ volume.c	27 Jul 2006 18:44:08 -0000	1.71
@@ -2,8 +2,9 @@
  * volume.c - NTFS volume handling code. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2006 Anton Altaparmakov
- * Copyright (c) 2002-2005 Szabolcs Szakacsits
+ * Copyright (c) 2002-2006 Szabolcs Szakacsits
  * Copyright (c) 2004-2005 Richard Russon
+ * Copyright (c) 2005-2006 Yura Pakhuchiy
  *
  * This program/include file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -141,6 +142,7 @@ static int ntfs_mft_load(ntfs_volume *vo
 	MFT_RECORD *mb = NULL;
 	ntfs_attr_search_ctx *ctx = NULL;
 	ATTR_RECORD *a;
+	STANDARD_INFORMATION *std_info;
 	int eo;
 
 	/* Manually setup an ntfs_inode. */
@@ -214,6 +216,11 @@ static int ntfs_mft_load(ntfs_volume *vo
 		goto io_error_exit;
 	}
 mft_has_no_attr_list:
+	/* Receive attributes from STANDARD_INFORMATION. */
+	std_info = ntfs_attr_readall(vol->mft_ni, AT_STANDARD_INFORMATION, 
+				     AT_UNNAMED, 0, NULL);
+	vol->mft_ni->flags = std_info->file_attributes;
+
 	/* We now have a fully setup ntfs inode for $MFT in vol->mft_ni. */
 
 	/* Get an ntfs attribute for $MFT/$DATA and set it up, too. */

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.215,1.216

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

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357.server4you.de:/tmp/cvs-serv14905/libntfs

Modified Files:
	attrib.c 
Log Message:
Yura uses ntfs_attr_lookup() in a way it never was anticipated to work so my
fix broke his way of working.  This is a middle ground where both should work.
This still leaves a bug in collation of attribute list entries though which
needs to be investigated and fixed...


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- attrib.c	23 Jul 2006 21:43:08 -0000	1.215
+++ attrib.c	27 Jul 2006 08:38:17 -0000	1.216
@@ -1,7 +1,7 @@
 /**
  * attrib.c - Attribute handling code. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000-2005 Anton Altaparmakov
+ * Copyright (c) 2000-2006 Anton Altaparmakov
  * Copyright (c) 2002-2005 Richard Russon
  * Copyright (c) 2004-2006 Yura Pakhuchiy
  *
@@ -2062,7 +2062,7 @@ do_next_attr_loop:
 				le32_to_cpu(ctx->mrec->bytes_allocated))
 			break;
 		if (a->type == AT_END)
-			break;
+			continue;
 		if (!a->length)
 			break;
 		if (al_entry->instance != a->instance)