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

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am, 1.59, 1.60 ntfsmount.c, 1.89, 1.90

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv10507/ntfsprogs

Modified Files:
	Makefile.am ntfsmount.c 
Log Message:
upgrade to FUSE 2.6 API


Index: Makefile.am
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- Makefile.am	17 Jul 2006 11:49:52 -0000	1.59
+++ Makefile.am	6 Nov 2006 12:51:44 -0000	1.60
@@ -88,7 +88,7 @@ if ENABLE_FUSE_MODULE
 ntfsmount_SOURCES	= ntfsmount.c utils.c utils.h
 ntfsmount_LDADD		= $(AM_LIBS) $(FUSE_MODULE_LIBS)
 ntfsmount_LDFLAGS	= $(AM_LFLAGS)
-ntfsmount_CFLAGS	= $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=25
+ntfsmount_CFLAGS	= $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=26
 endif
 
 ntfscmp_SOURCES		= ntfscmp.c utils.c utils.h

Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- ntfsmount.c	5 Nov 2006 21:40:57 -0000	1.89
+++ ntfsmount.c	6 Nov 2006 12:51:45 -0000	1.90
@@ -1766,7 +1766,7 @@ int main(int argc, char *argv[])
 	char *parsed_options;
 	struct fuse_args margs = FUSE_ARGS_INIT(0, NULL);
 	struct fuse *fh;
-	int ffd = 0;
+	struct fuse_chan *fch;
 
 	utils_set_locale();
 	ntfs_log_set_handler(ntfs_log_handler_stderr);
@@ -1792,15 +1792,14 @@ int main(int argc, char *argv[])
 		return 4;
 	}
 	/* Create filesystem. */
-	if ((fuse_opt_add_arg(&margs, "") == -1 ||
+	fch = NULL; 
+	if (!(fuse_opt_add_arg(&margs, "") == -1 ||
 			fuse_opt_add_arg(&margs, "-o") == -1 ||
-			fuse_opt_add_arg(&margs, parsed_options) == -1))
-		ffd = -1;
-	if (ffd != -1)
-		ffd = fuse_mount(opts.mnt_point, &margs);
+			fuse_opt_add_arg(&margs, parsed_options)))
+		fch = fuse_mount(opts.mnt_point, &margs);
 	fuse_opt_free_args(&margs);
 	free(parsed_options);
-	if (ffd == -1) {
+	if (!fch) {
 		ntfs_log_error("fuse_mount failed.\n");
 		ntfs_fuse_destroy();
 		return 5;
@@ -1818,13 +1817,12 @@ int main(int argc, char *argv[])
 			fh = NULL;
 	}
 	if (fh)
-		fh = fuse_new(ffd, &margs , &ntfs_fuse_oper,
-				sizeof(ntfs_fuse_oper));
+		fh = fuse_new(fch, &margs , &ntfs_fuse_oper,
+				sizeof(ntfs_fuse_oper), NULL);
 	fuse_opt_free_args(&margs);
 	if (!fh) {
 		ntfs_log_error("fuse_new failed.\n");
-		close(ffd);
-		fuse_unmount(opts.mnt_point);
+		fuse_unmount(opts.mnt_point, fch);
 		ntfs_fuse_destroy();
 		return 6;
 	}
@@ -1846,9 +1844,8 @@ int main(int argc, char *argv[])
 	/* Main loop. */
 	fuse_loop(fh);
 	/* Destroy. */
+	fuse_unmount(opts.mnt_point, fch);
 	fuse_destroy(fh);
-	close(ffd);
-	fuse_unmount(opts.mnt_point);
 	ntfs_fuse_destroy();
 	return 0;
 }

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog, 1.412, 1.413 configure.ac, 1.111, 1.112

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv17830

Modified Files:
	ChangeLog configure.ac 
Log Message:
ntfsmount: require FUSE version >= 2.6.0 for build. Fixes fusermount
lookup problem and allows to drop compatibility code.


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -p -r1.412 -r1.413
--- ChangeLog	1 Nov 2006 20:20:18 -0000	1.412
+++ ChangeLog	5 Nov 2006 21:40:57 -0000	1.413
@@ -52,7 +52,7 @@ xx/xx/2006 - x.xx.x - .
 	- Allow ntfscp to create the destination file if it does not already
 	  exists by calling ntfs_create().  (Hil)
 	- Fix GUID to string conversion.  (Anton)
-	- Multiple big-endiness fixes.  (zhanglinbao, Yuval)
+	- Multiple big-endianness fixes.  (zhanglinbao, Yuval)
 	- Spelling mistake fixes.  (Yuval)
 	- Remove inline keywords from static non-one-liners.  (Szaka, Yuval)
 	- Memory leak fixes.  (Yura, Yuval)
@@ -63,6 +63,8 @@ xx/xx/2006 - x.xx.x - .
 	- Introduce misc.c. Move ntfs_[mc]alloc there.  (Szaka)
 	- Change malloc() calls to ntfs_malloc().  (Szaka)
 	- Factor ntfs_attr_fill_hole() out of ntfs_attr_pwrite().  (Szaka)
+	- ntfsmount: require FUSE version >= 2.6.0 for build. Fixes fusermount
+	  lookup problem and allows to drop compatibility code.  (Yura)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

Index: configure.ac
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- configure.ac	2 Aug 2006 11:19:39 -0000	1.111
+++ configure.ac	5 Nov 2006 21:40:57 -0000	1.112
@@ -195,31 +195,13 @@ AM_CONDITIONAL(ENABLE_GNOME_VFS, $compil
 # Autodetect whether to build FUSE module or not.
 compile_fuse_module=false
 if test "$enable_fuse_module" != "no"; then
-	case "$target_os" in
-	linux*)
-		PKG_CHECK_MODULES(FUSE_MODULE, fuse >= 2.3.0, [ compile_fuse_module=true ],
-			if test "$enable_fuse_module" = "yes"; then
-				AC_MSG_ERROR([ntfsmount requires FUSE version >= 2.3.0.])
-			else
-				AC_MSG_WARN([ntfsmount requires FUSE version >= 2.3.0.])
-			fi
-		);;
-	freebsd*)
-		PKG_CHECK_MODULES(FUSE_MODULE, fuse >= 2.5.0, [ compile_fuse_module=true ],
-			if test "$enable_fuse_module" = "yes"; then
-				AC_MSG_ERROR([ntfsmount requires FUSE version >= 2.5.0 under FreeBSD.])
-			else
-				AC_MSG_WARN([ntfsmount requires FUSE version >= 2.5.0 under FreeBSD.])
-			fi
-		);;
-	*)
+	PKG_CHECK_MODULES(FUSE_MODULE, fuse >= 2.6.0, [ compile_fuse_module=true ],
 		if test "$enable_fuse_module" = "yes"; then
-			AC_MSG_ERROR([ntfsmount can be built only under Linux and FreeBSD.])
+			AC_MSG_ERROR([ntfsmount requires FUSE version >= 2.6.0.])
 		else
-			AC_MSG_WARN([ntfsmount can be built only under Linux and FreeBSD.])
+			AC_MSG_WARN([ntfsmount requires FUSE version >= 2.6.0.])
 		fi
-		;;
-	esac
+	)
 fi
 AM_CONDITIONAL(ENABLE_FUSE_MODULE, $compile_fuse_module)
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.88,1.89

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv17830/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
ntfsmount: require FUSE version >= 2.6.0 for build. Fixes fusermount
lookup problem and allows to drop compatibility code.


Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- ntfsmount.c	5 Nov 2006 14:42:46 -0000	1.88
+++ ntfsmount.c	5 Nov 2006 21:40:57 -0000	1.89
@@ -223,11 +223,7 @@ static long ntfs_fuse_get_nr_free_cluste
  * Returns 0 on success or -errno on error.
  */
 static int ntfs_fuse_statfs(const char *path __attribute__((unused)),
-#if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
 		struct statvfs *sfs)
-#else
-		struct statfs *sfs)
-#endif
 {
 	long size;
 	ntfs_volume *vol;
@@ -237,9 +233,7 @@ static int ntfs_fuse_statfs(const char *
 		return -ENODEV;
 	/* Optimal transfer block size. */
 	sfs->f_bsize = vol->cluster_size;
-#if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
 	sfs->f_frsize = vol->cluster_size;
-#endif
 	/*
 	 * Total data blocks in file system in units of f_bsize and since
 	 * inodes are also stored in data blocs ($MFT is a file) this is just
@@ -260,11 +254,7 @@ static int ntfs_fuse_statfs(const char *
 		size = 0;
 	sfs->f_ffree = size;
 	/* Maximum length of filenames. */
-#if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
 	sfs->f_namemax = NTFS_MAX_NAME_LEN;
-#else
-	sfs->f_namelen = NTFS_MAX_NAME_LEN;
-#endif
 	return 0;
 }
 
@@ -1774,9 +1764,7 @@ static int parse_options(int argc, char 
 int main(int argc, char *argv[])
 {
 	char *parsed_options;
-#if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
 	struct fuse_args margs = FUSE_ARGS_INIT(0, NULL);
-#endif
 	struct fuse *fh;
 	int ffd = 0;
 
@@ -1804,7 +1792,6 @@ int main(int argc, char *argv[])
 		return 4;
 	}
 	/* Create filesystem. */
-#if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
 	if ((fuse_opt_add_arg(&margs, "") == -1 ||
 			fuse_opt_add_arg(&margs, "-o") == -1 ||
 			fuse_opt_add_arg(&margs, parsed_options) == -1))
@@ -1812,16 +1799,12 @@ int main(int argc, char *argv[])
 	if (ffd != -1)
 		ffd = fuse_mount(opts.mnt_point, &margs);
 	fuse_opt_free_args(&margs);
-#else
-	ffd = fuse_mount(opts.mnt_point, parsed_options);
-#endif
 	free(parsed_options);
 	if (ffd == -1) {
 		ntfs_log_error("fuse_mount failed.\n");
 		ntfs_fuse_destroy();
 		return 5;
 	}
-#if defined(FUSE_VERSION) && (FUSE_VERSION >= 25)
 	fh = (struct fuse *)1; /* Cast anything except NULL to handle errors. */
 	margs = (struct fuse_args)FUSE_ARGS_INIT(0, NULL);
 	if (fuse_opt_add_arg(&margs, "") == -1 ||
@@ -1838,19 +1821,6 @@ int main(int argc, char *argv[])
 		fh = fuse_new(ffd, &margs , &ntfs_fuse_oper,
 				sizeof(ntfs_fuse_oper));
 	fuse_opt_free_args(&margs);
-#else
-	if (!ctx->debug && !ctx->no_detach) {
-		if (fuse_is_lib_option("kernel_cache"))
-			fh = fuse_new(ffd, "use_ino,kernel_cache",
-					&ntfs_fuse_oper,
-					sizeof(ntfs_fuse_oper));
-		else
-			fh = fuse_new(ffd, "use_ino", &ntfs_fuse_oper,
-					sizeof(ntfs_fuse_oper));
-	} else
-		fh = fuse_new(ffd, "debug,use_ino" , &ntfs_fuse_oper,
-				sizeof(ntfs_fuse_oper));
-#endif
 	if (!fh) {
 		ntfs_log_error("fuse_new failed.\n");
 		close(ffd);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c, 1.151, 1.152 ntfsmount.c, 1.87, 1.88

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv9987/ntfsprogs

Modified Files:
	ntfsinfo.c ntfsmount.c 
Log Message:

* fix ntfsmount build
* fix ntfsinfo output


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- ntfsinfo.c	30 Oct 2006 23:23:40 -0000	1.151
+++ ntfsinfo.c	5 Nov 2006 14:42:46 -0000	1.152
@@ -1794,7 +1794,8 @@ static void ntfs_dump_attr_index_allocat
 	       		if (entries != -1) {
 				total_entries += entries;
 				total_indx_blocks++;
-				printf("\tIndex entries:\t\t %d\n", entries);
+				ntfs_log_verbose("\tIndex entries:\t\t %d\n",
+						entries);
 			}
 		}
 		tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc +

Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- ntfsmount.c	1 Nov 2006 13:30:41 -0000	1.87
+++ ntfsmount.c	5 Nov 2006 14:42:46 -0000	1.88
@@ -67,7 +67,7 @@
 #include "utils.h"
 #include "version.h"
 #include "ntfstime.h"
-#include "misc.h"
+#include "support.h"
 
 #ifndef PATH_MAX
 #define PATH_MAX 4096

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/libntfs logging.c,1.12,1.13

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

On Wed, 1 Nov 2006, Yuval wrote:

> Fix compilation on environments that one can not assign to "va_list args" 
> (e.g. Debian Alpha). Do so by removing the unused log_reason code. 
> Originally, Szaka asked FlatCap for it but never used it. 

I was suggesting something else. I wasn't aware the removed code was 
supposed to be what I suggested. It had no use for anything.

> I've asked Szaka if he is going to use it but he did not reply. 

I don't remember any such question. The email was perhaps spam filtered 
somehwere.

> I got an implicit answer in the form of ntfs-3g commit. 

The Debian ntfs-3g packager had compilation problem on Alpha, I've checked 
it out and found that the non-compiling code is unused, has no sense, so I 
removed it.

	Szaka

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.73,1.74

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv32715/libntfs

Modified Files:
	dir.c 
Log Message:
Fix a memleak. (Szaka)

Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- dir.c	1 Nov 2006 13:30:40 -0000	1.73
+++ dir.c	1 Nov 2006 22:37:31 -0000	1.74
@@ -1594,7 +1594,7 @@ search:
 	/* Remove FILE_NAME from index. */
 	if (ntfs_index_rm(ictx))
 		goto err_out;
-	ictx = NULL;
+
 	/* Remove FILE_NAME from inode. */
 	if (ntfs_attr_record_rm(actx))
 		goto err_out;

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.231,1.232

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv19311/libntfs

Modified Files:
	attrib.c 
Log Message:
Factor ntfs_attr_fill_hole() out of ntfs_attr_pwrite(). (Szaka)

Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- attrib.c	1 Nov 2006 13:30:40 -0000	1.231
+++ attrib.c	1 Nov 2006 20:20:18 -0000	1.232
@@ -921,6 +921,154 @@ rl_err_out:
 	return -1;
 }
 
+static int ntfs_attr_fill_hole(ntfs_attr *na, s64 count, s64 *ofs,
+			runlist_element **rl, VCN *update_from)
+{
+	s64 to_write;
+	ntfs_volume *vol = na->ni->vol;
+	int eo, ret = -1;
+	runlist *rlc;
+	LCN lcn_seek_from = -1;
+	VCN cur_vcn, from_vcn;
+
+	to_write = min(count, ((*rl)->length << vol->cluster_size_bits) - *ofs);
+
+	/* 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", cur_vcn);
+	/*
+	 * Map whole runlist to be able update mapping pairs
+	 * later.
+	 */
+	if (ntfs_attr_map_whole_runlist(na))
+		goto err_out;
+	/*
+	 * Restore @*rl, it probably get lost during runlist
+	 * mapping.
+	 */
+	*rl = ntfs_attr_find_vcn(na, cur_vcn);
+	if (!*rl) {
+		ntfs_log_error("Failed to find run after mapping runlist. "
+				"Please report to %s.\n", NTFS_DEV_LIST);
+		errno = EIO;
+		goto err_out;
+	}
+	/*
+	 * Search backwards to find the best lcn to start
+	 * seek from.
+	 */
+	rlc = *rl;
+	while (rlc->vcn) {
+		rlc--;
+		if (rlc->lcn >= 0) {
+			lcn_seek_from = rlc->lcn + (from_vcn - rlc->vcn);
+			break;
+		}
+	}
+	if (lcn_seek_from == -1) {
+		/* Backwards search failed, search forwards. */
+		rlc = *rl;
+		while (rlc->length) {
+			rlc++;
+			if (rlc->lcn >= 0) {
+				lcn_seek_from = rlc->lcn -
+					(rlc->vcn - from_vcn);
+				break;
+			}
+		}
+	}
+	/* Allocate clusters to instantiate the hole. */
+	rlc = ntfs_cluster_alloc(vol, from_vcn,
+				((*ofs + to_write - 1) >>
+				vol->cluster_size_bits) + 1 +
+				(*rl)->vcn - from_vcn,
+				lcn_seek_from, DATA_ZONE);
+	if (!rlc) {
+		ntfs_log_perror("Hole filling cluster allocation failed");
+		goto err_out;
+	}
+	/* Merge runlists. */
+	*rl = ntfs_runlists_merge(na->rl, rlc);
+	if (!*rl) {
+		eo = errno;
+		ntfs_log_trace("Failed to merge runlists.\n");
+		if (ntfs_cluster_free_from_rl(vol, rlc)) {
+			ntfs_log_trace("Failed to free just "
+				"allocated clusters. Leaving "
+				"inconsistent metadata. "
+				"Run chkdsk\n");
+		}
+		errno = eo;
+		goto err_out;
+	}
+	na->rl = *rl;
+	if (*update_from == -1)
+		*update_from = from_vcn;
+	*rl = ntfs_attr_find_vcn(na, cur_vcn);
+	if (!*rl) {
+		/*
+		 * It's definitely a BUG, if we failed to find @cur_vcn, because
+		 * we missed it during instantiating of the hole.
+		 */
+		ntfs_log_error("BUG! Failed to find run after hole "
+				"instantiating. Please report to the %s.\n",
+				NTFS_DEV_LIST);
+		errno = EIO;
+		goto err_out;
+	}
+	/* If leaved part of the hole go to the next run. */
+	if ((*rl)->lcn < 0)
+		(*rl)++;
+	/* Now LCN shoudn't be less than 0. */
+	if ((*rl)->lcn < 0) {
+		ntfs_log_error("BUG! LCN is lesser than 0. "
+				"Please report to the %s.\n", NTFS_DEV_LIST);
+		errno = EIO;
+		goto err_out;
+	}
+	if (*ofs) {
+		/*
+		 * Need to clear region between start of
+		 * @cur_vcn cluster and @*ofs.
+		 */
+		char *buf;
+
+		buf = ntfs_malloc(*ofs);
+		if (!buf) {
+			errno = ENOMEM;
+			goto err_out;
+		}
+		memset(buf, 0, *ofs);
+		if (ntfs_rl_pwrite(vol, na->rl, cur_vcn <<
+					vol->cluster_size_bits, *ofs, buf) < 0) {
+			eo = errno;
+			ntfs_log_perror("Failed to zero area");
+			free(buf);
+			errno = eo;
+			goto err_out;
+		}
+		free(buf);
+	}
+	if ((*rl)->vcn < cur_vcn) {
+		/*
+		 * Clusters that replaced hole are merged with
+		 * previous run, so we need to update offset.
+		 */
+		*ofs += (cur_vcn - (*rl)->vcn) << vol->cluster_size_bits;
+	}
+	if ((*rl)->vcn > cur_vcn) {
+		/*
+		 * We left part of the hole, so we need to update the offset.
+		 */
+		*ofs -= ((*rl)->vcn - cur_vcn) << vol->cluster_size_bits;
+	}
+
+	ret = 0;
+err_out:
+	return ret;
+}
+
 /**
  * ntfs_attr_pwrite - positioned write to an ntfs attribute
  * @na:		ntfs attribute to write to
@@ -942,7 +1090,8 @@ rl_err_out:
  */
 s64 ntfs_attr_pwrite(ntfs_attr *na, const s64 pos, s64 count, const void *b)
 {
-	s64 written, to_write, ofs, total, old_initialized_size, old_data_size;
+	s64 written, to_write, ofs, old_initialized_size, old_data_size;
+	s64 total = 0;
 	VCN update_from = -1;
 	ntfs_volume *vol;
 	ntfs_attr_search_ctx *ctx = NULL;
@@ -951,8 +1100,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 	struct {
 		unsigned int undo_initialized_size	: 1;
 		unsigned int undo_data_size		: 1;
-		unsigned int update_mapping_pairs	: 1;
-	} need_to = { 0, 0, 0 };
+	} need_to = { 0, 0 };
 
 	ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, pos 0x%llx, count "
 			"0x%llx.\n", na->ni->mft_no, na->type, (long long)pos,
@@ -1028,7 +1176,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 		ntfs_attr_put_search_ctx(ctx);
 		return count;
 	}
-	total = 0;
+
 	/* Handle writes beyond initialized_size. */
 	if (pos + count > na->initialized_size) {
 		if (ntfs_attr_map_whole_runlist(na))
@@ -1125,174 +1273,22 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 			goto rl_err_out;
 		}
 		if (rl->lcn < (LCN)0) {
-			LCN lcn_seek_from = -1;
-			runlist *rlc;
-			VCN cur_vcn, from_vcn;
-
 			if (rl->lcn != (LCN)LCN_HOLE) {
 				errno = EIO;
 				goto rl_err_out;
 			}
-			
-			to_write = min(count, (rl->length <<
-					vol->cluster_size_bits) - ofs);
-			
-			/* Instantiate the hole. */
-			cur_vcn = rl->vcn;
-			from_vcn = rl->vcn + (ofs >> vol->cluster_size_bits);
-			ntfs_log_trace("Instantiate hole with vcn 0x%llx.\n",
-					cur_vcn);
-			/*
-			 * Map whole runlist to be able update mapping pairs
-			 * later.
-			 */
-			if (ntfs_attr_map_whole_runlist(na))
-				goto err_out;
-			/*
-			 * Restore @rl, it probably get lost during runlist
-			 * mapping.
-			 */
-			rl = ntfs_attr_find_vcn(na, cur_vcn);
-			if (!rl) {
-				ntfs_log_error("BUG! Failed to find run after "
-						"mapping whole runlist. Please "
-						"report to the %s.\n",
-						NTFS_DEV_LIST);
-				errno = EIO;
-				goto err_out;
-			}
-			/*
-			 * Search backwards to find the best lcn to start
-			 * seek from.
-			 */
-			rlc = rl;
-			while (rlc->vcn) {
-				rlc--;
-				if (rlc->lcn >= 0) {
-					lcn_seek_from = rlc->lcn +
-							(from_vcn - rlc->vcn);
-					break;
-				}
-			}
-			if (lcn_seek_from == -1) {
-				/* Backwards search failed, search forwards. */
-				rlc = rl;
-				while (rlc->length) {
-					rlc++;
-					if (rlc->lcn >= 0) {
-						lcn_seek_from = rlc->lcn -
-							(rlc->vcn - from_vcn);
-						break;
-					}
-				}
-			}
-			/* Allocate clusters to instantiate the hole. */
-			rlc = ntfs_cluster_alloc(vol, from_vcn,
-						((ofs + to_write - 1) >>
-						vol->cluster_size_bits) + 1 +
-						rl->vcn - from_vcn,
-						lcn_seek_from, DATA_ZONE);
-			if (!rlc) {
-				eo = errno;
-				ntfs_log_trace("Failed to allocate clusters "
-						"for hole instantiating.\n");
-				errno = eo;
-				goto err_out;
-			}
-			/* Merge runlists. */
-			rl = ntfs_runlists_merge(na->rl, rlc);
-			if (!rl) {
-				eo = errno;
-				ntfs_log_trace("Failed to merge runlists.\n");
-				if (ntfs_cluster_free_from_rl(vol, rlc)) {
-					ntfs_log_trace("Failed to free just "
-						"allocated clusters. Leaving "
-						"inconsistent metadata. "
-						"Run chkdsk\n");
-				}
-				errno = eo;
-				goto err_out;
-			}
-			na->rl = rl;
-			need_to.update_mapping_pairs = 1;
-			if (update_from == -1)
-				update_from = from_vcn;
-			rl = ntfs_attr_find_vcn(na, cur_vcn);
-			if (!rl) {
-				/*
-				 * It's definitely a BUG, if we failed to find
-				 * @cur_vcn, because we missed it during
-				 * instantiating of the hole.
-				 */
-				ntfs_log_error("BUG! Failed to find run after "
-						"instantiating. Please report "
-						"to the %s.\n", NTFS_DEV_LIST);
-				errno = EIO;
-				goto err_out;
-			}
-			/* If leaved part of the hole go to the next run. */
-			if (rl->lcn < 0)
-				rl++;
-			/* Now LCN shoudn't be less than 0. */
-			if (rl->lcn < 0) {
-				ntfs_log_error("BUG! LCN is lesser than 0. "
-						"Please report to the %s.\n",
-						NTFS_DEV_LIST);
-				errno = EIO;
-				goto err_out;
-			}
-			if (ofs) {
-				/*
-				 * Need to clear region between start of
-				 * @cur_vcn cluster and @ofs.
-				 */
-				char *buf;
 
-				buf = malloc(ofs);
-				if (!buf) {
-					ntfs_log_trace("Not enough memory to "
-							"allocate %lld "
-							"bytes.\n", ofs);
-					errno = ENOMEM;
-					goto err_out;
-				}
-				memset(buf, 0, ofs);
-				if (ntfs_rl_pwrite(vol, na->rl, cur_vcn <<
-							vol->cluster_size_bits,
-							ofs, buf) < 0) {
-					eo = errno;
-					ntfs_log_trace("Failed to zero "
-							"area.\n");
-					free(buf);
-					errno = eo;
-					goto err_out;
-				}
-				free(buf);
-			}
-			if (rl->vcn < cur_vcn) {
-				/*
-				 * Clusters that replaced hole are merged with
-				 * previous run, so we need to update offset.
-				 */
-				ofs += (cur_vcn - rl->vcn) <<
-					vol->cluster_size_bits;
-			}
-			if (rl->vcn > cur_vcn) {
-				/*
-				 * We left part of the hole, so update we need
-				 * to update offset
-				 */
-				ofs -= (rl->vcn - cur_vcn) <<
-					vol->cluster_size_bits;
-			}
+			if (ntfs_attr_fill_hole(na, count, &ofs, &rl,
+					&update_from))
+				goto err_out;
 		}
+
 		/* It is a real lcn, write it to the volume. */
 		to_write = min(count, (rl->length << vol->cluster_size_bits) -
 				ofs);
 retry:
-		ntfs_log_trace("Writing 0x%llx bytes to vcn 0x%llx, lcn 0x%llx,"
-				" ofs 0x%llx.\n", to_write, rl->vcn, rl->lcn,
-				ofs);
+		ntfs_log_trace("Writing %lld bytes to vcn %lld, lcn %lld, ofs "
+				"%lld.\n", to_write, rl->vcn, rl->lcn, ofs);
 		if (!NVolReadOnly(vol))
 			written = ntfs_pwrite(vol->dev, (rl->lcn <<
 					vol->cluster_size_bits) + ofs,
@@ -1317,7 +1313,7 @@ done:
 	if (ctx)
 		ntfs_attr_put_search_ctx(ctx);
 	/* Update mapping pairs if needed. */
-	if (need_to.update_mapping_pairs)
+	if (update_from != -1)
 		ntfs_attr_update_mapping_pairs(na, 0 /*update_from*/);
 	/* Finally, return the number of bytes written. */
 	return total;
@@ -1375,7 +1371,7 @@ err_out:
 	if (ctx)
 		ntfs_attr_put_search_ctx(ctx);
 	/* Update mapping pairs if needed. */
-	if (need_to.update_mapping_pairs)
+	if (update_from != -1)
 		ntfs_attr_update_mapping_pairs(na, 0 /*update_from*/);
 	/* Restore original data_size if needed. */
 	if (need_to.undo_data_size && ntfs_attr_truncate(na, old_data_size))

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.411,1.412

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv19311

Modified Files:
	ChangeLog 
Log Message:
Factor ntfs_attr_fill_hole() out of ntfs_attr_pwrite(). (Szaka)

Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- ChangeLog	1 Nov 2006 13:30:40 -0000	1.411
+++ ChangeLog	1 Nov 2006 20:20:18 -0000	1.412
@@ -62,6 +62,7 @@ xx/xx/2006 - x.xx.x - .
 	- Move ntfs_index_entry_mark_dirty() to index.c.  (Szaka)
 	- Introduce misc.c. Move ntfs_[mc]alloc there.  (Szaka)
 	- Change malloc() calls to ntfs_malloc().  (Szaka)
+	- Factor ntfs_attr_fill_hole() out of ntfs_attr_pwrite().  (Szaka)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

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

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv9592/include/ntfs

Modified Files:
	logging.h 
Log Message:
Fix compilation on environments that one can not assign to "va_list args" (e.g. Debian Alpha). Do so by removing the unused log_reason code. Originally, Szaka asked FlatCap for it but never used it. I've asked Szaka if he is going to use it but he did not reply. I got an implicit answer in the form of ntfs-3g commit. Therefore, commit an updated version of the patch I've sent the Debian package maintainer.

Index: logging.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/logging.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- logging.h	28 Oct 2006 23:45:22 -0000	1.6
+++ logging.h	1 Nov 2006 14:05:09 -0000	1.7
@@ -75,7 +75,6 @@ int ntfs_log_redirect(const char *functi
 #define NTFS_LOG_LEVEL_ERROR	((u32)1 <<  7) /* Operation failed, no damage done */
 #define NTFS_LOG_LEVEL_PERROR	((u32)1 <<  8) /* Message : standard error description */
 #define NTFS_LOG_LEVEL_CRITICAL	((u32)1 <<  9) /* Operation failed,damage may have occurred */
-#define NTFS_LOG_LEVEL_REASON	((u32)1 << 10) /* Human readable reason for failure */
 
 /* Logging style flags - Manage the style of the output */
 #define NTFS_LOG_FLAG_PREFIX	((u32)1 << 0) /* Prefix messages with "ERROR: ", etc */
@@ -96,7 +95,6 @@ int ntfs_log_redirect(const char *functi
 #define ntfs_log_quiet(FORMAT, ARGS...) ntfs_log_redirect(__FUNCTION__,__FILE__,__LINE__,NTFS_LOG_LEVEL_QUIET,NULL,FORMAT,##ARGS)
 #define ntfs_log_verbose(FORMAT, ARGS...) ntfs_log_redirect(__FUNCTION__,__FILE__,__LINE__,NTFS_LOG_LEVEL_VERBOSE,NULL,FORMAT,##ARGS)
 #define ntfs_log_warning(FORMAT, ARGS...) ntfs_log_redirect(__FUNCTION__,__FILE__,__LINE__,NTFS_LOG_LEVEL_WARNING,NULL,FORMAT,##ARGS)
-#define ntfs_log_reason(FORMAT, ARGS...) ntfs_log_redirect(__FUNCTION__,__FILE__,__LINE__,NTFS_LOG_LEVEL_REASON,NULL,FORMAT,##ARGS)
 
 /* By default debug and trace messages are compiled into the program,
  * but not displayed.

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs logging.c,1.12,1.13

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv9592/libntfs

Modified Files:
	logging.c 
Log Message:
Fix compilation on environments that one can not assign to "va_list args" (e.g. Debian Alpha). Do so by removing the unused log_reason code. Originally, Szaka asked FlatCap for it but never used it. I've asked Szaka if he is going to use it but he did not reply. I got an implicit answer in the form of ntfs-3g commit. Therefore, commit an updated version of the patch I've sent the Debian package maintainer.

Index: logging.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/logging.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- logging.c	25 Sep 2006 16:58:38 -0000	1.12
+++ logging.c	1 Nov 2006 14:05:09 -0000	1.13
@@ -77,7 +77,7 @@ static struct ntfs_logging ntfs_log = {
 #endif
 	NTFS_LOG_LEVEL_INFO | NTFS_LOG_LEVEL_QUIET | NTFS_LOG_LEVEL_WARNING |
 	NTFS_LOG_LEVEL_ERROR | NTFS_LOG_LEVEL_PERROR | NTFS_LOG_LEVEL_CRITICAL |
-	NTFS_LOG_LEVEL_REASON | NTFS_LOG_LEVEL_PROGRESS,
+	NTFS_LOG_LEVEL_PROGRESS,
 	NTFS_LOG_FLAG_ONLYNAME,
 #ifdef DEBUG
 	ntfs_log_handler_outerr
@@ -346,26 +346,9 @@ int ntfs_log_handler_syslog(const char *
 	const char *file, __attribute__((unused)) int line, u32 level,
 	void *data __attribute__((unused)), const char *format, va_list args)
 {
-	const int reason_size = 128;
-	static char *reason = NULL;
 	int ret = 0;
 	int olderr = errno;
 
-	if (level == NTFS_LOG_LEVEL_REASON) {
-		if (!reason)
-			reason = malloc(reason_size);
-		if (reason) {
-			memset(reason, 0, reason_size);
-			return vsnprintf(reason, reason_size, format, args);
-		} else {
-			/* Rather than call ourselves, just drop through */
-			level = NTFS_LOG_LEVEL_PERROR;
-			format = "Couldn't create reason";
-			args = NULL;
-			olderr = errno;
-		}
-	}
-
 	if ((ntfs_log.flags & NTFS_LOG_FLAG_ONLYNAME) &&
 	    (strchr(file, PATH_SEP)))		/* Abbreviate the filename */
 		file = strrchr(file, PATH_SEP) + 1;
@@ -385,12 +368,8 @@ int ntfs_log_handler_syslog(const char *
 
 	ret += vfprintf(stream, format, args);
 
-	if (level & NTFS_LOG_LEVEL_PERROR) {
-		if (reason)
-			ret += fprintf(stream, " : %s\n", reason);
-		else
-			ret += fprintf(stream, " : %s\n", strerror(olderr));
-	}
+	if (level & NTFS_LOG_LEVEL_PERROR)
+		ret += fprintf(stream, ": %s\n", strerror(olderr));
 #endif
 	vsyslog(LOG_NOTICE, format, args);
 	ret = 1; /* FIXME: caclulate how many bytes had been written. */
@@ -424,8 +403,6 @@ int ntfs_log_handler_syslog(const char *
 int ntfs_log_handler_fprintf(const char *function, const char *file,
 	int line, u32 level, void *data, const char *format, va_list args)
 {
-	const int reason_size = 128;
-	static char *reason = NULL;
 	int ret = 0;
 	int olderr = errno;
 	FILE *stream;
@@ -436,21 +413,6 @@ int ntfs_log_handler_fprintf(const char 
 		return 0;	/* If it's NULL, we can't do anything. */
 	stream = (FILE*)data;
 
-	if (level == NTFS_LOG_LEVEL_REASON) {
-		if (!reason)
-			reason = malloc(reason_size);
-		if (reason) {
-			memset(reason, 0, reason_size);
-			return vsnprintf(reason, reason_size, format, args);
-		} else {
-			/* Rather than call ourselves, just drop through */
-			level = NTFS_LOG_LEVEL_PERROR;
-			format = "Couldn't create reason";
-			args = NULL;
-			olderr = errno;
-		}
-	}
-
 	if (ntfs_log.flags & NTFS_LOG_FLAG_COLOUR) {
 		/* Pick a colour determined by the log level */
 		switch (level) {
@@ -500,12 +462,8 @@ int ntfs_log_handler_fprintf(const char 
 
 	ret += vfprintf(stream, format, args);
 
-	if (level & NTFS_LOG_LEVEL_PERROR) {
-		if (reason)
-			ret += fprintf(stream, " : %s\n", reason);
-		else
-			ret += fprintf(stream, " : %s\n", strerror(olderr));
-	}
+	if (level & NTFS_LOG_LEVEL_PERROR)
+		ret += fprintf(stream, ": %s\n", strerror(olderr));
 
 	if (col_suffix)
 		ret += fprintf(stream, col_suffix);

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c, 1.230, 1.231 bitmap.c, 1.25, 1.26 compress.c, 1.19, 1.20 device.c, 1.30, 1.31 dir.c, 1.72, 1.73 inode.c, 1.87, 1.88 lcnalloc.c, 1.35, 1.36 logfile.c, 1.17, 1.18 mft.c, 1.47, 1.48 runlist.c, 1.73, 1.74 security.c, 1.18, 1.19 unistr.c, 1.36, 1.37 unix_io.c, 1.13, 1.14 volume.c, 1.73, 1.74

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv5422/libntfs

Modified Files:
	attrib.c bitmap.c compress.c device.c dir.c inode.c lcnalloc.c 
	logfile.c mft.c runlist.c security.c unistr.c unix_io.c 
	volume.c 
Log Message:
Change callers of malloc() to ntfs_malloc() (Szaka). Fix compilition (Yuval).

Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- attrib.c	28 Oct 2006 23:08:24 -0000	1.230
+++ attrib.c	1 Nov 2006 13:30:40 -0000	1.231
@@ -56,6 +56,7 @@
 #include "compress.h"
 #include "bitmap.h"
 #include "logging.h"
+#include "support.h"
 
 ntfschar AT_UNNAMED[] = { const_cpu_to_le16('\0') };
 
@@ -175,11 +176,10 @@ s64 ntfs_get_attribute_value(const ntfs_
 			 * going to overflow in the same fashion.
 			 * Temporary fix:  same as above.
 			 */
-			intbuf = malloc(rl[i].length << vol->cluster_size_bits);
+			intbuf = ntfs_malloc(rl[i].length <<
+					vol->cluster_size_bits);
 			if (!intbuf) {
 				int eo = errno;
-				ntfs_log_perror("Couldn't allocate memory for "
-						"internal buffer.");
 				free(rl);
 				errno = eo;
 				return 0;
@@ -1043,13 +1043,11 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 		/* If write starts beyond initialized_size, zero the gap. */
 		if (pos > na->initialized_size) {
 			char *buf;
-			int err;
 
-			buf = malloc(NTFS_BUF_SIZE);
-			if (!buf) {
-				ntfs_log_trace("Not enough memory.\n");
+			buf = ntfs_malloc(NTFS_BUF_SIZE);
+			if (!buf)
 				goto err_out;
-			}
+
 			memset(buf, 0, NTFS_BUF_SIZE);
 			ofs = na->initialized_size;
 			while (ofs < pos) {
@@ -1057,7 +1055,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 				written = ntfs_rl_pwrite(vol, na->rl, ofs,
 							to_write, buf);
 				if (written <= 0) {
-					err = errno;
+					int err = errno;
 					ntfs_log_trace("Failed to zero space "
 							"between initialized "
 							"size and @pos.\n");
@@ -2294,7 +2292,7 @@ ntfs_attr_search_ctx *ntfs_attr_get_sear
 		errno = EINVAL;
 		return NULL;
 	}
-	ctx = malloc(sizeof(ntfs_attr_search_ctx));
+	ctx = ntfs_malloc(sizeof(ntfs_attr_search_ctx));
 	if (ctx)
 		ntfs_attr_init_search_ctx(ctx, ni, mrec);
 	return ctx;
@@ -4738,12 +4736,10 @@ static int ntfs_non_resident_attr_expand
 		 * sparse runs instead of real allocation of clusters.
 		 */
 		if (na->type == AT_DATA && vol->major_ver >= 3) {
-			rl = malloc(0x1000);
-			if (!rl) {
-				ntfs_log_trace("Not enough memory.\n");
-				err = ENOMEM;
+			rl = ntfs_malloc(0x1000);
+			if (!rl)
 				return -1;
-			}
+
 			rl[0].vcn = (na->allocated_size >>
 					vol->cluster_size_bits);
 			rl[0].lcn = LCN_HOLE;
@@ -4983,11 +4979,10 @@ void *ntfs_attr_readall(ntfs_inode *ni, 
 		ntfs_log_perror("ntfs_attr_open failed");
 		return NULL;
 	}
-	data = malloc(na->data_size);
-	if (!data) {
-		ntfs_log_perror("malloc failed");
+	data = ntfs_malloc(na->data_size);
+	if (!data)
 		goto out;
-	}
+
 	size = ntfs_attr_pread(na, 0, na->data_size, data);
 	if (size != na->data_size) {
 		ntfs_log_perror("ntfs_attr_pread failed");

Index: bitmap.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/bitmap.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- bitmap.c	26 Oct 2006 19:10:05 -0000	1.25
+++ bitmap.c	1 Nov 2006 13:30:40 -0000	1.26
@@ -78,10 +78,10 @@ static int ntfs_bitmap_set_bits_in_run(n
 	if (bufsize > 8192)
 		bufsize = 8192;
 
-	/* Allocate memory. */
-	buf = (u8*)malloc(bufsize);
+	buf = (u8*)ntfs_malloc(bufsize);
 	if (!buf)
 		return -1;
+
 	/* Depending on @value, zero or set all bits in the allocated buffer. */
 	memset(buf, value ? 0xff : 0, bufsize);
 

Index: compress.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/compress.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- compress.c	29 Oct 2006 08:59:21 -0000	1.19
+++ compress.c	1 Nov 2006 13:30:40 -0000	1.20
@@ -375,12 +375,14 @@ s64 ntfs_compressed_attr_pread(ntfs_attr
 	cb_size = na->compression_block_size;
 	cb_size_mask = cb_size - 1UL;
 	cb_clusters = na->compression_block_clusters;
+
 	/* Need a temporary buffer for each loaded compression block. */
-	cb = malloc(cb_size);
+	cb = ntfs_malloc(cb_size);
 	if (!cb)
 		return -1;
+
 	/* Need a temporary buffer for each uncompressed block. */
-	dest = malloc(cb_size);
+	dest = ntfs_malloc(cb_size);
 	if (!dest) {
 		err = errno;
 		free(cb);

Index: device.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/device.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- device.c	26 Oct 2006 19:10:05 -0000	1.30
+++ device.c	1 Nov 2006 13:30:40 -0000	1.31
@@ -111,7 +111,7 @@ struct ntfs_device *ntfs_device_alloc(co
 		return NULL;
 	}
 
-	dev = (struct ntfs_device *)malloc(sizeof(struct ntfs_device));
+	dev = (struct ntfs_device *)ntfs_malloc(sizeof(struct ntfs_device));
 	if (dev) {
 		if (!(dev->d_name = strdup(name))) {
 			int eo = errno;

Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- dir.c	30 Oct 2006 13:43:09 -0000	1.72
+++ dir.c	1 Nov 2006 13:30:40 -0000	1.73
@@ -1270,12 +1270,9 @@ static ntfs_inode *__ntfs_create(ntfs_in
 			case S_IFBLK:
 			case S_IFCHR:
 				data_len = offsetof(INTX_FILE, device_end);
-				data = malloc(data_len);
+				data = ntfs_malloc(data_len);
 				if (!data) {
 					err = errno;
-					ntfs_log_error("Not enough memory for "
-							"content of DATA "
-							"attribute.\n");
 					goto err_out;
 				}
 				data->major = cpu_to_le64(major(dev));
@@ -1288,12 +1285,9 @@ static ntfs_inode *__ntfs_create(ntfs_in
 			case S_IFLNK:
 				data_len = sizeof(INTX_FILE_TYPES) +
 						target_len * sizeof(ntfschar);
-				data = malloc(data_len);
+				data = ntfs_malloc(data_len);
 				if (!data) {
 					err = errno;
-					ntfs_log_error("Not enough memory for "
-							"content of DATA "
-							"attribute.\n");
 					goto err_out;
 				}
 				data->magic = INTX_SYMBOLIC_LINK;
@@ -1322,10 +1316,9 @@ static ntfs_inode *__ntfs_create(ntfs_in
 	}
 	/* Create FILE_NAME attribute. */
 	fn_len = sizeof(FILE_NAME_ATTR) + name_len * sizeof(ntfschar);
-	fn = calloc(1, fn_len);
+	fn = ntfs_calloc(fn_len);
 	if (!fn) {
 		err = errno;
-		ntfs_log_error("Not enough memory.\n");
 		goto err_out;
 	}
 	fn->parent_directory = MK_LE_MREF(dir_ni->mft_no,
@@ -1711,16 +1704,15 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
 
 	if (!ni || !dir_ni || !name || !name_len ||
 			ni->mft_no == dir_ni->mft_no) {
-		err = errno;
-		ntfs_log_error("Invalid arguments.\n");
+		err = EINVAL;
+		ntfs_log_perror("ntfs_link wrong arguments");
 		goto err_out;
 	}
 	/* Create FILE_NAME attribute. */
 	fn_len = sizeof(FILE_NAME_ATTR) + name_len * sizeof(ntfschar);
-	fn = calloc(1, fn_len);
+	fn = ntfs_calloc(fn_len);
 	if (!fn) {
 		err = errno;
-		ntfs_log_error("Not enough memory.\n");
 		goto err_out;
 	}
 	fn->parent_directory = MK_LE_MREF(dir_ni->mft_no,

Index: inode.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- inode.c	27 Oct 2006 12:24:30 -0000	1.87
+++ inode.c	1 Nov 2006 13:30:40 -0000	1.88
@@ -180,7 +180,7 @@ ntfs_inode *ntfs_inode_open(ntfs_volume 
 		goto put_err_out;
 	}
 	ni->attr_list_size = l;
-	ni->attr_list = malloc(ni->attr_list_size);
+	ni->attr_list = ntfs_malloc(ni->attr_list_size);
 	if (!ni->attr_list)
 		goto put_err_out;
 	l = ntfs_get_attribute_value(vol, ctx->attr, ni->attr_list);
@@ -393,7 +393,7 @@ ntfs_inode *ntfs_extent_inode_open(ntfs_
 	if (!(base_ni->nr_extents & 3)) {
 		i = (base_ni->nr_extents + 4) * sizeof(ntfs_inode *);
 
-		extent_nis = (ntfs_inode**)malloc(i);
+		extent_nis = (ntfs_inode**)ntfs_malloc(i);
 		if (!extent_nis)
 			goto err_out;
 		if (base_ni->nr_extents) {

Index: lcnalloc.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/lcnalloc.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- lcnalloc.c	10 Feb 2006 11:00:47 -0000	1.35
+++ lcnalloc.c	1 Nov 2006 13:30:40 -0000	1.36
@@ -122,7 +122,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume 
 
 	/* Return empty runlist if @count == 0 */
 	if (!count) {
-		rl = malloc(0x1000);
+		rl = ntfs_malloc(0x1000);
 		if (!rl)
 			return NULL;
 		rl[0].vcn = start_vcn;
@@ -132,7 +132,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume 
 	}
 
 	/* Allocate memory. */
-	buf = (u8*)malloc(8192);
+	buf = (u8*)ntfs_malloc(8192);
 	if (!buf)
 		return NULL;
 	/*

Index: logfile.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/logfile.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- logfile.c	21 Jul 2006 23:16:09 -0000	1.17
+++ logfile.c	1 Nov 2006 13:30:40 -0000	1.18
@@ -371,12 +371,9 @@ static int ntfs_check_and_load_restart_p
 	 * Allocate a buffer to store the whole restart page so we can multi
 	 * sector transfer deprotect it.
 	 */
-	trp = malloc(le32_to_cpu(rp->system_page_size));
-	if (!trp) {
-		ntfs_log_error("Failed to allocate memory for $LogFile "
-				"restart page buffer.\n");
+	trp = ntfs_malloc(le32_to_cpu(rp->system_page_size));
+	if (!trp)
 		return ENOMEM;
-	}
 	/*
 	 * Read the whole of the restart page into the buffer.  If it fits
 	 * completely inside @rp, just copy it from there.  Otherwise read it
@@ -500,11 +497,9 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n
 		return FALSE;
 	}
 	/* Allocate memory for restart page. */
-	kaddr = malloc(NTFS_BLOCK_SIZE);
-	if (!kaddr) {
-		ntfs_log_error("Not enough memory.\n");
+	kaddr = ntfs_malloc(NTFS_BLOCK_SIZE);
+	if (!kaddr)
 		return FALSE;
-	}
 	/*
 	 * Read through the file looking for a restart page.  Since the restart
 	 * page header is at the beginning of a page we only need to search at

Index: mft.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/mft.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- mft.c	21 Jul 2006 23:03:59 -0000	1.47
+++ mft.c	1 Nov 2006 13:30:40 -0000	1.48
@@ -158,7 +158,7 @@ int ntfs_mft_records_write(const ntfs_vo
 		cnt = vol->mftmirr_size - m;
 		if (cnt > count)
 			cnt = count;
-		bmirr = malloc(cnt * vol->mft_record_size);
+		bmirr = ntfs_malloc(cnt * vol->mft_record_size);
 		if (!bmirr)
 			return -1;
 		memcpy(bmirr, b, cnt * vol->mft_record_size);
@@ -240,7 +240,7 @@ int ntfs_file_record_read(const ntfs_vol
 	}
 	m = *mrec;
 	if (!m) {
-		m = (MFT_RECORD*)malloc(vol->mft_record_size);
+		m = (MFT_RECORD*)ntfs_malloc(vol->mft_record_size);
 		if (!m)
 			return -1;
 	}
@@ -367,7 +367,7 @@ int ntfs_mft_record_format(const ntfs_vo
 		errno = EINVAL;
 		return -1;
 	}
-	m = malloc(vol->mft_record_size);
+	m = ntfs_calloc(vol->mft_record_size);
 	if (!m)
 		return -1;
 	if (ntfs_mft_record_layout(vol, mref, m)) {
@@ -459,9 +459,10 @@ static int ntfs_mft_bitmap_find_free_rec
 		}
 	}
 	pass_start = data_pos;
-	buf = (u8*)malloc(PAGE_SIZE);
+	buf = (u8*)ntfs_malloc(PAGE_SIZE);
 	if (!buf)
 		return -1;
+
 	ntfs_log_debug("Starting bitmap search: pass %u, pass_start 0x%llx, "
 			"pass_end 0x%llx, data_pos 0x%llx.\n", pass,
 			(long long)pass_start, (long long)pass_end,
@@ -1368,12 +1369,10 @@ mft_rec_already_initialized:
 	 * is not zero as well as the update sequence number if it is not zero
 	 * or -1 (0xffff).
 	 */
-	m = (MFT_RECORD*)malloc(vol->mft_record_size);
-	if (!m) {
-		ntfs_log_error("Failed to allocate buffer for mft "
-				"record.\n");
+	m = (MFT_RECORD*)ntfs_malloc(vol->mft_record_size);
+	if (!m)
 		goto undo_mftbmp_alloc;
-	}
+
 	if (ntfs_mft_record_read(vol, bit, m)) {
 		err = errno;
 		ntfs_log_error("Failed to read mft record.\n");
@@ -1437,12 +1436,9 @@ mft_rec_already_initialized:
 			int i;
 
 			i = (base_ni->nr_extents + 4) * sizeof(ntfs_inode *);
-			extent_nis = (ntfs_inode**)malloc(i);
+			extent_nis = (ntfs_inode**)ntfs_malloc(i);
 			if (!extent_nis) {
 				err = errno;
-				ntfs_log_error("Failed to allocate "
-						"buffer for extent inodes "
-						"array.\n");
 				free(m);
 				free(ni);
 				errno = err;

Index: runlist.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- runlist.c	27 Oct 2006 12:24:30 -0000	1.73
+++ runlist.c	1 Nov 2006 13:30:40 -0000	1.74
@@ -766,7 +766,8 @@ runlist_element *ntfs_mapping_pairs_deco
 	/* Current position in runlist array. */
 	rlpos = 0;
 	/* Allocate first 4kiB block and set current runlist size to 4kiB. */
-	rl = malloc(rlsize = 0x1000);
+	rlsize = 0x1000;
+	rl = ntfs_malloc(rlsize);
 	if (!rl)
 		return NULL;
 	/* Insert unmapped starting element if necessary. */
@@ -1824,7 +1825,10 @@ static runlist_element * test_rl_pure_sr
 	else
 		fudge = 999;
 
-	result = malloc(4096);
+	result = ntfs_malloc(4096);
+	if (!result)
+		return NULL;
+
 	if (multi) {
 		MKRL(result+0, vcn + (0*len/4), fudge + vcn + 1000 + (0*len/4), len / 4)
 		MKRL(result+1, vcn + (1*len/4), fudge + vcn + 1000 + (1*len/4), len / 4)
@@ -2042,9 +2046,9 @@ static void test_rl_frag_combine(ntfs_vo
 static void test_rl_frag(char *test)
 {
 	ntfs_volume vol;
-	ATTR_RECORD *attr1 = malloc(1024);
-	ATTR_RECORD *attr2 = malloc(1024);
-	ATTR_RECORD *attr3 = malloc(1024);
+	ATTR_RECORD *attr1 = ntfs_malloc(1024);
+	ATTR_RECORD *attr2 = ntfs_malloc(1024);
+	ATTR_RECORD *attr3 = ntfs_malloc(1024);
 
 	if (!attr1 || !attr2 || !attr3)
 		goto out;

Index: security.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/security.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- security.c	20 Oct 2006 19:53:50 -0000	1.18
+++ security.c	1 Nov 2006 13:30:40 -0000	1.19
@@ -85,7 +85,7 @@ char *ntfs_guid_to_mbs(const GUID *guid,
 	}
 	_guid_str = guid_str;
 	if (!_guid_str) {
-		_guid_str = malloc(37);
+		_guid_str = ntfs_malloc(37);
 		if (!_guid_str)
 			return _guid_str;
 	}
@@ -201,7 +201,7 @@ char *ntfs_sid_to_mbs(const SID *sid, ch
 		cnt = ntfs_sid_to_mbs_size(sid);
 		if (cnt < 0)
 			return NULL;
-		s = malloc(cnt);
+		s = ntfs_malloc(cnt);
 		if (!s)
 			return s;
 		sid_str = s;

Index: unistr.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- unistr.c	27 Oct 2006 12:24:30 -0000	1.36
+++ unistr.c	1 Nov 2006 13:30:40 -0000	1.37
@@ -299,7 +299,7 @@ ntfschar *ntfs_ucsndup(const ntfschar *s
 	u32 len;
 
 	len = ntfs_ucsnlen(s, maxlen);
-	dst = malloc((len + 1) * sizeof(ntfschar));
+	dst = ntfs_malloc((len + 1) * sizeof(ntfschar));
 	if (dst) {
 		memcpy(dst, s, len * sizeof(ntfschar));
 		dst[len] = cpu_to_le16(L'\0');
@@ -419,7 +419,7 @@ int ntfs_ucstombs(const ntfschar *ins, c
 	}
 	if (!mbs) {
 		mbs_len = (ins_len + 1) * MB_CUR_MAX;
-		mbs = (char*)malloc(mbs_len);
+		mbs = (char*)ntfs_malloc(mbs_len);
 		if (!mbs)
 			return -1;
 	}
@@ -436,7 +436,7 @@ int ntfs_ucstombs(const ntfschar *ins, c
 				errno = ENAMETOOLONG;
 				return -1;
 			}
-			tc = (char*)malloc((mbs_len + 64) & ~63);
+			tc = (char*)ntfs_malloc((mbs_len + 64) & ~63);
 			if (!tc)
 				goto err_out;
 			memcpy(tc, mbs, mbs_len);
@@ -562,7 +562,7 @@ int ntfs_mbstoucs(const char *ins, ntfsc
 	ins_len++;
 	if (!ucs) {
 		ucs_len = ins_len;
-		ucs = (ntfschar*)malloc(ucs_len * sizeof(ntfschar));
+		ucs = (ntfschar*)ntfs_malloc(ucs_len * sizeof(ntfschar));
 		if (!ucs)
 			return -1;
 	}

Index: unix_io.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/unix_io.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- unix_io.c	27 Oct 2006 12:24:30 -0000	1.13
+++ unix_io.c	1 Nov 2006 13:30:40 -0000	1.14
@@ -86,7 +86,7 @@ static int ntfs_device_unix_io_open(stru
 		errno = EBUSY;
 		return -1;
 	}
-	if (!(dev->d_private = malloc(sizeof(int))))
+	if (!(dev->d_private = ntfs_malloc(sizeof(int))))
 		return -1;
 	/*
 	 * Open the device/file obtaining the file descriptor for exclusive

Index: volume.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- volume.c	27 Oct 2006 14:15:32 -0000	1.73
+++ volume.c	1 Nov 2006 13:30:40 -0000	1.74
@@ -147,7 +147,7 @@ static int ntfs_mft_load(ntfs_volume *vo
 
 	/* Manually setup an ntfs_inode. */
 	vol->mft_ni = ntfs_inode_allocate(vol);
-	mb = (MFT_RECORD*)malloc(vol->mft_record_size);
+	mb = (MFT_RECORD*)ntfs_malloc(vol->mft_record_size);
 	if (!vol->mft_ni || !mb) {
 		ntfs_log_perror("Error allocating memory for $MFT");
 		goto error_exit;
@@ -198,12 +198,10 @@ static int ntfs_mft_load(ntfs_volume *vo
 		goto io_error_exit;
 	}
 	vol->mft_ni->attr_list_size = l;
-	vol->mft_ni->attr_list = malloc(l);
-	if (!vol->mft_ni->attr_list) {
-		ntfs_log_debug("Error: failed to allocate buffer for attribute "
-				"list.\n");
+	vol->mft_ni->attr_list = ntfs_malloc(l);
+	if (!vol->mft_ni->attr_list)
 		goto error_exit;
-	}
+
 	l = ntfs_get_attribute_value(vol, ctx->attr, vol->mft_ni->attr_list);
 	if (!l) {
 		ntfs_log_debug("Error: failed to get value of "
@@ -421,20 +419,20 @@ ntfs_volume *ntfs_volume_startup(struct 
 		return NULL;
 	}
 
-	/* Allocate the boot sector structure. */
-	if (!(bs = (NTFS_BOOT_SECTOR *)malloc(sizeof(NTFS_BOOT_SECTOR))))
+	if (!(bs = (NTFS_BOOT_SECTOR *)ntfs_malloc(sizeof(NTFS_BOOT_SECTOR))))
 		return NULL;
+
 	/* Allocate the volume structure. */
 	vol = ntfs_volume_alloc();
 	if (!vol)
 		goto error_exit;
 	/* Create the default upcase table. */
 	vol->upcase_len = 65536;
-	vol->upcase = (ntfschar*)malloc(vol->upcase_len * sizeof(ntfschar));
-	if (!vol->upcase) {
-		ntfs_log_perror("Error allocating memory for upcase table.");
+	vol->upcase = (ntfschar*)ntfs_malloc(vol->upcase_len *
+			sizeof(ntfschar));
+	if (!vol->upcase)
 		goto error_exit;
-	}
+
 	ntfs_upcase_table_build(vol->upcase,
 			vol->upcase_len * sizeof(ntfschar));
 	if (flags & MS_RDONLY)
@@ -697,11 +695,9 @@ static int ntfs_volume_check_hiberfile(n
 		return -1;
 	}
 
-	buf = malloc(NTFS_HIBERFILE_HEADER_SIZE);
-	if (!buf) {
-		ntfs_log_perror("Error allocating memory for hiberfile.sys header");
+	buf = ntfs_malloc(NTFS_HIBERFILE_HEADER_SIZE);
+	if (!buf)
 		goto out;
-	}
 
 	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
 	if (!na) {
@@ -790,12 +786,10 @@ ntfs_volume *ntfs_device_mount(struct nt
 	}
 
 	/* Load data from $MFT and $MFTMirr and compare the contents. */
-	m = (u8*)malloc(vol->mftmirr_size << vol->mft_record_size_bits);
-	m2 = (u8*)malloc(vol->mftmirr_size << vol->mft_record_size_bits);
-	if (!m || !m2) {
-		ntfs_log_perror("Failed to allocate memory");
+	m  = (u8*)ntfs_malloc(vol->mftmirr_size << vol->mft_record_size_bits);
+	m2 = (u8*)ntfs_malloc(vol->mftmirr_size << vol->mft_record_size_bits);
+	if (!m || !m2)
 		goto error_exit;
-	}
 
 	l = ntfs_attr_mst_pread(vol->mft_na, 0, vol->mftmirr_size,
 			vol->mft_record_size, m);
@@ -932,10 +926,9 @@ ntfs_volume *ntfs_device_mount(struct nt
 		vol->upcase_len = na->data_size >> 1;
 		/* Throw away default table. */
 		free(vol->upcase);
-		vol->upcase = (ntfschar*)malloc(na->data_size);
+		vol->upcase = (ntfschar*)ntfs_malloc(na->data_size);
 		if (!vol->upcase) {
 			ntfs_log_debug(FAILED);
-			ntfs_log_debug("Not enough memory to load $UpCase.\n");
 			goto error_exit;
 		}
 	}
@@ -1026,11 +1019,9 @@ ntfs_volume *ntfs_device_mount(struct nt
 		 * Treat this the same way as if the attribute was present but
 		 * had zero length.
 		 */
-		vol->vol_name = malloc(1);
+		vol->vol_name = ntfs_malloc(1);
 		if (!vol->vol_name) {
 			ntfs_log_debug(FAILED);
-			ntfs_log_debug("Error: Unable to allocate memory for volume "
-					"name!\n");
 			goto error_exit;
 		}
 		vol->vol_name[0] = '\0';
@@ -1057,11 +1048,9 @@ ntfs_volume *ntfs_device_mount(struct nt
 					"to current locale");
 			ntfs_log_debug("Forcing name into ASCII by replacing "
 				"non-ASCII characters with underscores.\n");
-			vol->vol_name = malloc(u + 1);
+			vol->vol_name = ntfs_malloc(u + 1);
 			if (!vol->vol_name) {
 				ntfs_log_debug(FAILED);
-				ntfs_log_debug("Error: Unable to allocate memory for "
-						"volume name!\n");
 				goto error_exit;
 			}
 			for (j = 0; j < (s32)u; j++) {
@@ -1100,10 +1089,9 @@ ntfs_volume *ntfs_device_mount(struct nt
 		goto error_exit;
 	}
 	vol->attrdef_len = na->data_size;
-	vol->attrdef = (ATTR_DEF*)malloc(na->data_size);
+	vol->attrdef = (ATTR_DEF*)ntfs_malloc(na->data_size);
 	if (!vol->attrdef) {
 		ntfs_log_debug(FAILED);
-		ntfs_log_debug("Not enough memory to load $AttrDef.\n");
 		goto error_exit;
 	}
 	/* Read in the $DATA attribute value into the buffer. */
@@ -1303,10 +1291,10 @@ static int ntfs_mntent_check(const char 
 	FILE *f;
 	int err = 0;
 
-	real_file = malloc(PATH_MAX + 1);
+	real_file = ntfs_malloc(PATH_MAX + 1);
 	if (!real_file)
 		return -1;
-	real_fsname = malloc(PATH_MAX + 1);
+	real_fsname = ntfs_malloc(PATH_MAX + 1);
 	if (!real_fsname) {
 		err = errno;
 		goto exit;

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.410,1.411

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv5422

Modified Files:
	ChangeLog 
Log Message:
Change callers of malloc() to ntfs_malloc() (Szaka). Fix compilition (Yuval).

Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- ChangeLog	1 Nov 2006 12:31:11 -0000	1.410
+++ ChangeLog	1 Nov 2006 13:30:40 -0000	1.411
@@ -61,6 +61,7 @@ xx/xx/2006 - x.xx.x - .
 	  and rewrite it to be clearer.  (Yuval)
 	- Move ntfs_index_entry_mark_dirty() to index.c.  (Szaka)
 	- Introduce misc.c. Move ntfs_[mc]alloc there.  (Szaka)
+	- Change malloc() calls to ntfs_malloc().  (Szaka)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

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

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv5422/include/ntfs

Modified Files:
	support.h 
Log Message:
Change callers of malloc() to ntfs_malloc() (Szaka). Fix compilition (Yuval).

Index: support.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/support.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- support.h	1 Nov 2006 12:31:11 -0000	1.13
+++ support.h	1 Nov 2006 13:30:40 -0000	1.14
@@ -96,4 +96,8 @@
 	old_state;					\
 })
 
+/* Memory allocation with logging. */
+extern void *ntfs_calloc(size_t size);
+extern void *ntfs_malloc(size_t size);
+
 #endif /* defined _NTFS_SUPPORT_H */

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.86,1.87

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv5422/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
Change callers of malloc() to ntfs_malloc() (Szaka). Fix compilition (Yuval).

Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- ntfsmount.c	27 Oct 2006 14:15:32 -0000	1.86
+++ ntfsmount.c	1 Nov 2006 13:30:41 -0000	1.87
@@ -67,6 +67,7 @@
 #include "utils.h"
 #include "version.h"
 #include "ntfstime.h"
+#include "misc.h"
 
 #ifndef PATH_MAX
 #define PATH_MAX 4096
@@ -148,7 +149,7 @@ static long ntfs_fuse_get_nr_free_mft_re
 
 	if (!(ctx->state & NF_FreeMFTOutdate))
 		return ctx->free_mft;
-	buf = malloc(vol->cluster_size);
+	buf = ntfs_malloc(vol->cluster_size);
 	if (!buf)
 		return -ENOMEM;
 	while (1) {
@@ -180,7 +181,7 @@ static long ntfs_fuse_get_nr_free_cluste
 
 	if (!(ctx->state & NF_FreeClustersOutdate))
 		return ctx->free_clusters;
-	buf = malloc(vol->cluster_size);
+	buf = ntfs_malloc(vol->cluster_size);
 	if (!buf)
 		return -ENOMEM;
 	while (1) {
@@ -378,7 +379,7 @@ static int ntfs_fuse_getattr(const char 
 					!stream_name_len) {
 				INTX_FILE *intx_file;
 
-				intx_file = malloc(na->data_size);
+				intx_file = ntfs_malloc(na->data_size);
 				if (!intx_file) {
 					res = -errno;
 					ntfs_attr_close(na);
@@ -474,7 +475,7 @@ static int ntfs_fuse_readlink(const char
 		goto exit;
 	}
 	/* Receive file content. */
-	intx_file = malloc(na->data_size);
+	intx_file = ntfs_malloc(na->data_size);
 	if (!intx_file) {
 		res = -errno;
 		goto exit;
@@ -1400,11 +1401,10 @@ static struct fuse_operations ntfs_fuse_
 
 static int ntfs_fuse_init(void)
 {
-	ctx = malloc(sizeof(ntfs_fuse_context_t));
-	if (!ctx) {
-		ntfs_log_perror("malloc failed");
+	ctx = ntfs_malloc(sizeof(ntfs_fuse_context_t));
+	if (!ctx)
 		return -1;
-	}
+
 	*ctx = (ntfs_fuse_context_t) {
 		.state = NF_FreeClustersOutdate | NF_FreeMFTOutdate,
 		.uid = geteuid(),
@@ -1458,11 +1458,11 @@ static char *parse_mount_options(const c
 	 * +1		for null-terminator.
 	 * +PATH_MAX	for resolved by realpath() device name.
 	 */
-	ret = malloc(strlen(def_opts) + strlen(org_options) + 9 + PATH_MAX);
-	if (!ret) {
-		ntfs_log_perror("malloc failed");
+	ret = ntfs_malloc(strlen(def_opts) + strlen(org_options) + PATH_MAX +
+			9);
+	if (!ret)
 		return NULL;
-	}
+
 	*ret = 0;
 	options = strdup(org_options);
 	if (!options) {

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

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv29732/include/ntfs

Modified Files:
	support.h 
Log Message:
Introduce misc.c - Proud home of functions with no other home, starting with ntfs_[mc]alloc. (Szaka)

Index: support.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/support.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- support.h	27 Oct 2006 12:24:30 -0000	1.12
+++ support.h	1 Nov 2006 12:31:11 -0000	1.13
@@ -96,29 +96,4 @@
 	old_state;					\
 })
 
-/**
- * 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 ChangeLog,1.409,1.410

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv29732

Modified Files:
	ChangeLog 
Log Message:
Introduce misc.c - Proud home of functions with no other home, starting with ntfs_[mc]alloc. (Szaka)

Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- ChangeLog	30 Oct 2006 23:23:40 -0000	1.409
+++ ChangeLog	1 Nov 2006 12:31:11 -0000	1.410
@@ -60,6 +60,7 @@ xx/xx/2006 - x.xx.x - .
 	- Move ntfs_is_collation_rule_supported() from collate.h to collate.c
 	  and rewrite it to be clearer.  (Yuval)
 	- Move ntfs_index_entry_mark_dirty() to index.c.  (Szaka)
+	- Introduce misc.c. Move ntfs_[mc]alloc there.  (Szaka)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs Makefile.am, 1.36, 1.37 misc.c, NONE, 1.1

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv29732/libntfs

Modified Files:
	Makefile.am 
Added Files:
	misc.c 
Log Message:
Introduce misc.c - Proud home of functions with no other home, starting with ntfs_[mc]alloc. (Szaka)

Index: Makefile.am
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- Makefile.am	17 Jul 2006 11:49:52 -0000	1.36
+++ Makefile.am	1 Nov 2006 12:31:11 -0000	1.37
@@ -52,6 +52,7 @@ libntfs_la_SOURCES =	\
 	lcnalloc.c	\
 	logfile.c	\
 	logging.c	\
+	misc.c		\
 	mft.c		\
 	mst.c		\
 	runlist.c	\

--- NEW FILE ---
/**
 * mft.c - Miscellaneous functions. Part of the Linux-NTFS project.
 *
 * 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
 * by the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program/include file is distributed in the hope that it will be
 * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program (in the main directory of the Linux-NTFS
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif

#include "support.h"
#include "logging.h"

/**
 * ntfs_calloc - A logging supported calloc(3)
 * 
 * Return a pointer to the allocated memory or NULL if the request fails.
 * Memory is initialized with zeros.
 */
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;
}

/**
 * ntfs_malloc - A logging supported malloc(3)
 * 
 * Return a pointer to the allocated memory or NULL if the request fails.
 * Memory is uninitialized.
 */
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;
}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.150,1.151

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv21782/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
one more endian bug in ntfsinfo


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- ntfsinfo.c	28 Oct 2006 23:45:22 -0000	1.150
+++ ntfsinfo.c	30 Oct 2006 23:23:40 -0000	1.151
@@ -904,7 +904,7 @@ static void ntfs_dump_acl(const char *pr
 
 		/* proceed to next ACE */
 		ace = (ACCESS_ALLOWED_ACE *)(((char *)ace) +
-				le32_to_cpu(ace->size));
+				le16_to_cpu(ace->size));
 	}
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.408,1.409

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

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv21782

Modified Files:
	ChangeLog 
Log Message:
one more endian bug in ntfsinfo


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- ChangeLog	30 Oct 2006 13:29:45 -0000	1.408
+++ ChangeLog	30 Oct 2006 23:23:40 -0000	1.409
@@ -192,7 +192,7 @@ xx/xx/2006 - x.xx.x - .
 	- New APIs (dir.[ch]):
 	    ntfs_create_device() for Interix block and character devices
 	    creation.
-	    ntfs_crate_symlink() for Interix symbolic links creation.  (Yura)
+	    ntfs_create_symlink() for Interix symbolic links creation.  (Yura)
 	- Teach ntfs_create() to create Interix FIFOs and sockets.  (Yura)
 	- Fix the -u option in ntfsundelete.  Instead of a confusing optional
 	  parameter, there's a new option -i with a required parameter.  (Rich)

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs index.c,1.36,1.37

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv23852/libntfs

Modified Files:
	index.c 
Log Message:
Fix wrong error logic that would lead to segfault when malloc fails.

Index: index.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- index.c	30 Oct 2006 13:29:45 -0000	1.36
+++ index.c	30 Oct 2006 19:40:56 -0000	1.37
@@ -385,11 +385,11 @@ static INDEX_ENTRY *ntfs_ie_dup_novcn(IN
 		size -= sizeof(VCN);
 
 	dup = ntfs_malloc(size);
-	if (dup)
+	if (dup) {
 		memcpy(dup, ie, size);
-
-	dup->flags &= ~INDEX_ENTRY_NODE;
-	dup->length = size;
+		dup->flags &= ~INDEX_ENTRY_NODE;
+		dup->length = size;
+	}
 	return dup;
 }
 

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

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv18999/libntfs

Modified Files:
	dir.c 
Log Message:
Avoid a memory leak on the error code path.

Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- dir.c	27 Oct 2006 14:15:32 -0000	1.71
+++ dir.c	30 Oct 2006 13:43:09 -0000	1.72
@@ -1376,10 +1376,12 @@ err_out:
 			ntfs_log_perror("Failed to open SD (0x50) attribute of "
 					" inode 0x%llx. Run chkdsk.\n",
 					(unsigned long long)ni->mft_no);
-		else if (ntfs_attr_rm(na))
+		else if (ntfs_attr_rm(na)) {
 			ntfs_log_perror("Failed to remove SD (0x50) attribute "
 					"of inode 0x%llx. Run chkdsk.\n",
 					(unsigned long long)ni->mft_no);
+			ntfs_attr_close(na);
+		}
 	}
 	if (rollback_data) {
 		ntfs_attr *na;

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs index.c,1.35,1.36

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv17781/libntfs

Modified Files:
	index.c 
Log Message:
More big-endiness fixes.  (zhanglinbao, Yuval)

Index: index.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- index.c	29 Oct 2006 00:55:45 -0000	1.35
+++ index.c	30 Oct 2006 13:29:45 -0000	1.36
@@ -789,7 +789,7 @@ done:
 	return 0;
 }
 
-static INDEX_BLOCK *ntfs_ib_alloc(VCN ib_vcn, int ib_size,
+static INDEX_BLOCK *ntfs_ib_alloc(VCN ib_vcn, u32 ib_size,
 				  INDEX_HEADER_FLAGS node_type)
 {
 	INDEX_BLOCK *ib;
@@ -985,8 +985,8 @@ static INDEX_BLOCK *ntfs_ir_to_ia(INDEX_
 
 	ntfs_log_trace("Entering.\n");
 
-	ib = ntfs_ib_alloc(ib_vcn, ir->index_block_size, LEAF_NODE);
-	if (!ib)
+	if (!(ib = ntfs_ib_alloc(ib_vcn, le32_to_cpu(ir->index_block_size),
+			LEAF_NODE)))
 		return NULL;
 
 	ies_start = (char *)ntfs_ie_get_first(&ir->index);

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.407,1.408

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv17781

Modified Files:
	ChangeLog 
Log Message:
More big-endiness fixes.  (zhanglinbao, Yuval)

Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -p -r1.407 -r1.408
--- ChangeLog	29 Oct 2006 08:59:21 -0000	1.407
+++ ChangeLog	30 Oct 2006 13:29:45 -0000	1.408
@@ -52,8 +52,7 @@ xx/xx/2006 - x.xx.x - .
 	- Allow ntfscp to create the destination file if it does not already
 	  exists by calling ntfs_create().  (Hil)
 	- Fix GUID to string conversion.  (Anton)
-	- Fix some byte-order conversion for u32 variables that used le16
-	  conversion macros.  (zhanglinbao, Yuval)
+	- Multiple big-endiness fixes.  (zhanglinbao, Yuval)
 	- Spelling mistake fixes.  (Yuval)
 	- Remove inline keywords from static non-one-liners.  (Szaka, Yuval)
 	- Memory leak fixes.  (Yura, Yuval)

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.406,1.407

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv4713

Modified Files:
	ChangeLog 
Log Message:
I was assuming memmove() would copy byte by byte if it detects a smaller than word gap. Anton pointed out that it doesn't, glibc sources confirm, the C99 standard claims otherwise. Revert the compress.c patch as implementation is more important than specification.

Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- ChangeLog	29 Oct 2006 00:55:45 -0000	1.406
+++ ChangeLog	29 Oct 2006 08:59:21 -0000	1.407
@@ -57,8 +57,6 @@ xx/xx/2006 - x.xx.x - .
 	- Spelling mistake fixes.  (Yuval)
 	- Remove inline keywords from static non-one-liners.  (Szaka, Yuval)
 	- Memory leak fixes.  (Yura, Yuval)
-	- Use memmove() in compress.c for moving overlapping blocks instead
-	  of copying bytes manually.  (Yuval)
 	- Change ntfs_collate()'s signature to take size_t's.  (Yuval)
 	- Move ntfs_is_collation_rule_supported() from collate.h to collate.c
 	  and rewrite it to be clearer.  (Yuval)

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs compress.c,1.18,1.19

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv4713/libntfs

Modified Files:
	compress.c 
Log Message:
I was assuming memmove() would copy byte by byte if it detects a smaller than word gap. Anton pointed out that it doesn't, glibc sources confirm, the C99 standard claims otherwise. Revert the compress.c patch as implementation is more important than specification.

Index: compress.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/compress.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- compress.c	28 Oct 2006 23:35:56 -0000	1.18
+++ compress.c	29 Oct 2006 08:59:21 -0000	1.19
@@ -166,7 +166,7 @@ do_next_tag:
 	tag = *cb++;
 	/* Parse the eight tokens described by the tag. */
 	for (token = 0; token < 8; token++, tag >>= 1) {
-		u16 lg, pt, length;
+		u16 lg, pt, length, max_non_overlap;
 		register u16 i;
 		u8 *dest_back_addr;
 
@@ -214,9 +214,27 @@ do_next_tag:
 		/* Verify destination is in range. */
 		if (dest + length > dest_sb_end)
 			goto return_overflow;
-		/* memmove() is safe with overlapping blocks. */
-		memmove(dest, dest_back_addr, length);
-		dest += length;
+		/* The number of non-overlapping bytes. */
+		max_non_overlap = dest - dest_back_addr;
+		if (length <= max_non_overlap) {
+			/* The byte sequence doesn't overlap, just copy it. */
+			memcpy(dest, dest_back_addr, length);
+			/* Advance destination pointer. */
+			dest += length;
+		} else {
+			/*
+			 * The byte sequence does overlap, copy non-overlapping
+			 * part and then do a slow byte by byte copy for the
+			 * overlapping part. Also, advance the destination
+			 * pointer.
+			 */
+			memcpy(dest, dest_back_addr, max_non_overlap);
+			dest += max_non_overlap;
+			dest_back_addr += max_non_overlap;
+			length -= max_non_overlap;
+			while (length--)
+				*dest++ = *dest_back_addr++;
+		}
 		/* Advance source position and continue with the next token. */
 		cb += 2;
 	}