--- libntfs/attrib.c	Sat Sep  4 13:16:32 2004

+++ libntfs/attrib.c	Fri Jul 22 01:05:09 2005

@@ -709,9 +709,9 @@

  */

 s64 ntfs_attr_pread(ntfs_attr *na, const s64 pos, s64 count, void *b)

 {

-	s64 br, to_read, ofs, total, total2;

+	s64 br, old_to_read, to_read, ofs, total, total2;

 	ntfs_volume *vol;

 	runlist_element *rl;

 	Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x, pos 0x%llx, "

 			"count 0x%llx.\n", __FUNCTION__,

@@ -741,6 +744,7 @@

 	if (pos + count > na->data_size) {

 		if (pos >= na->data_size)

 			return 0;

+		Dprintf("trunacting read pos=%lld, na->data_size=%lld, (old) count=%lld\n", pos, na->data_size, count);

 		count = na->data_size - pos;

 	}

 	vol = na->ni->vol;

@@ -820,6 +825,10 @@

 		/* It is a real lcn, read it into @dst. */

 		to_read = min(count, (rl->length << vol->cluster_size_bits) -

 				ofs);

+		old_to_read = to_read;

+		to_read = (to_read + 511) / 512 * 512;

+		if(old_to_read != to_read)

+			Dprintf("adjusted %lld->%lld\n", old_to_read, to_read);

 retry:

 		Dprintf("%s(): Reading 0x%llx bytes from vcn 0x%llx, lcn 0x%llx, "

 				"ofs 0x%llx.\n", __FUNCTION__, to_read,

@@ -828,6 +837,8 @@

 				ofs, to_read, b);

 		/* If everything ok, update progress counters and continue. */

 		if (br > 0) {

+			if(br > old_to_read)

+				br = old_to_read;

 			total += br;

 			count -= br;

 			b = (u8*)b + br;

--- libntfs/device.c	Sat Sep  4 13:16:32 2004

+++ libntfs/device.c	Mon Jul 11 23:27:55 2005

@@ -441,10 +441,10 @@

  */

 static inline int ntfs_device_offset_valid(struct ntfs_device *dev, s64 ofs)

 {

-	char ch;

+	char ch[512];

 	if (dev->d_ops->seek(dev, ofs, SEEK_SET) >= 0 &&

-			dev->d_ops->read(dev, &ch, 1) == 1)

+			dev->d_ops->read(dev, &ch, 512) > 0)

 		return 0;

 	return -1;

 }

--- ntfsprogs/ntfsclone.c	Mon Jul 25 12:31:30 2005

+++ ntfsprogs/ntfsclone.c	Mon Jul 25 12:33:32 2005

@@ -1080,9 +1080,9 @@

 static int device_offset_valid(int fd, s64 ofs)

 {

-	char ch;

+	char ch[512];

-	if (lseek(fd, ofs, SEEK_SET) >= 0 && read(fd, &ch, 1) == 1)

+	if (lseek(fd, ofs, SEEK_SET) >= 0 && read(fd, &ch, 512) > 0)

 		return 0;

 	return -1;

 }

--- ntfsprogs/ntfsresize.c      Fri Oct  7 23:57:31 2005

+++ ntfsprogs/ntfsresize.c      Tue Oct 11 13:35:09 2005

@@ -1971,6 +1971,11 @@

		err_exit("Resident attribute in $Bitmap isn't supported!\n");

	bm_bsize = nr_clusters_to_bitmap_byte_size(resize->new_volume_size);

+	if(bm_bsize % 512 != 0) {

+		s64 old_bm_bsize = bm_bsize;

+		bm_bsize = (bm_bsize + 511) / 512 * 512;

+		Dprintf("adjusted bm_bsize: %lld->%lld\n", old_bm_bsize, bm_bsize);

+	}

 	nr_bm_clusters = rounded_up_division(bm_bsize, vol->cluster_size);

	if (resize->shrink) {

--- ntfsprogs/Makefile.am.orig	Sat Oct  8 00:35:40 2005

+++ ntfsprogs/Makefile.am	Fri Jan 20 11:26:37 2006

@@ -88,7 +88,7 @@

 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=22

+ntfsmount_CFLAGS	= $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=25

 endif

 # We don't distribute these

--- ntfsprogs/Makefile.in.orig	Fri Jan 20 11:24:48 2006

+++ ntfsprogs/Makefile.in	Fri Jan 20 11:26:40 2006

@@ -366,7 +366,7 @@

 @ENABLE_FUSE_MODULE_TRUE@ntfsmount_SOURCES = ntfsmount.c utils.c utils.h

 @ENABLE_FUSE_MODULE_TRUE@ntfsmount_LDADD = $(AM_LIBS) $(FUSE_MODULE_LIBS)

 @ENABLE_FUSE_MODULE_TRUE@ntfsmount_LDFLAGS = $(AM_LFLAGS)

-@ENABLE_FUSE_MODULE_TRUE@ntfsmount_CFLAGS = $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=22

+@ENABLE_FUSE_MODULE_TRUE@ntfsmount_CFLAGS = $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=25

 # We don't distribute these

 ntfsrm_SOURCES = ntfsrm.c ntfsrm.h utils.c utils.h

--- ntfsprogs/ntfsmount.c.orig	Mon Oct 10 14:47:38 2005

+++ ntfsprogs/ntfsmount.c	Fri Jan 20 11:42:09 2006

@@ -81,10 +81,10 @@

 	int state;

 	long free_clusters;

 	long free_mft;

-	uid_t uid;

-	gid_t gid;

-	mode_t fmask;

-	mode_t dmask;

+	unsigned int uid;

+	unsigned int gid;

+	unsigned int fmask;

+	unsigned int dmask;

 	BOOL ro;

 	BOOL show_sys_files;

 	BOOL succeed_chmod;

@@ -196,7 +196,7 @@

  * Return 0 on success or -errno on error.

  */

 static int ntfs_fuse_statfs(const char *path __attribute__((unused)),

-		struct statfs *sfs)

+		struct statvfs *sfs)

 {

 	long size;

 	ntfs_volume *vol;

@@ -204,10 +204,10 @@

 	vol = ctx->vol;

 	if (!vol)

 		return -ENODEV;

-	/* Type of filesystem. */

-	sfs->f_type = NTFS_SB_MAGIC;

 	/* Optimal transfer block size. */

 	sfs->f_bsize = vol->cluster_size;

+	/* XXX This field needs to be filled, I guess it's fine this way... */

+	sfs->f_frsize = vol->cluster_size;

 	/*

 	 * 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

@@ -228,7 +228,7 @@

 		size = 0;

 	sfs->f_ffree = size;

 	/* Maximum length of filenames. */

-	sfs->f_namelen = NTFS_MAX_NAME_LEN;

+	sfs->f_namemax = NTFS_MAX_NAME_LEN;

 	return 0;

 }

@@ -1462,8 +1462,9 @@

 int main(int argc, char *argv[])

 {

 	char *parsed_options;

+	struct fuse_args margs = FUSE_ARGS_INIT(0, NULL);

 	struct fuse *fh;

-	int ffd;

+	int ffd = 0;

 	utils_set_locale();

 	signal(SIGINT, signal_handler);

@@ -1491,7 +1492,20 @@

 	}

 	free(opts.device);

 	/* Create filesystem. */

-	ffd = fuse_mount(opts.mnt_point, parsed_options);

+	/*

+	 * XXX Eventually, ntfsmount should drop it's homebrew option parsing

+	 * routines and use stock ones. Here we don't go that far, we just use the

+	 * FUSE opt parsing API to dummily create the structure which satisfies

+	 * fuse_mount's current signature (that is, revert all the work which

+	 * has been accomplished by the homebrew routine... silly, eh?).

+	 */

+	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_free_args(&margs);

 	if (ffd == -1) {

 		Eprintf("fuse_mount failed.\n");

 		ntfs_fuse_destroy();