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

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.20,1.21

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

Changes by: cha0smaster

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

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


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ntfsmount.c	3 Aug 2005 14:06:04 -0000	1.20
+++ ntfsmount.c	3 Aug 2005 22:29:14 -0000	1.21
@@ -401,7 +401,7 @@ static int ntfs_fuse_read(const char *or
 		size = na->data_size - offset;
 	while (size) {
 		res = ntfs_attr_pread(na, offset, size, buf);
-		if (res < size)
+		if (res < (s64)size)
 			Eprintf("ntfs_attr_pread returned less bytes than "
 					"requested.\n");
 		if (res <= 0) {
@@ -450,7 +450,7 @@ static int ntfs_fuse_write(const char *o
 	}
 	while (size) {
 		res = ntfs_attr_pwrite(na, offset, size, buf);
-		if (res < size)
+		if (res < (s64)size)
 			Eprintf("ntfs_attr_pwrite returned less bytes than "
 					"requested.\n");
 		if (res <= 0) {
@@ -558,7 +558,7 @@ exit:
 	return res;
 }
 
-static int ntfs_fuse_rm_file(char *file)
+static int ntfs_fuse_rm_file(char *file __attribute__((unused)))
 {
 	return -EOPNOTSUPP;
 }
@@ -640,7 +640,7 @@ static int ntfs_fuse_getxattr(const char
 			goto exit;
 		}
 		if (ret)
-			ret++; /* For space delimiter .*/
+			ret++; /* For space delimiter. */
 		ret += tmp_name_len;
 		if ((size_t)ret <= size) {
 			/* Don't add space to the beginning of line. */

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.85,1.86

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
rl_expand(): make it a bit more readable


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- ntfsresize.c	3 Aug 2005 21:35:22 -0000	1.85
+++ ntfsresize.c	3 Aug 2005 21:46:35 -0000	1.86
@@ -1807,32 +1807,32 @@ static void rl_expand(runlist **rl, cons
 	int len;
 	runlist *p = *rl;
 
-	len = rl_items(p);
-	if (len <= 1)
+	len = rl_items(p) - 1;
+	if (len <= 0)
 		err_exit("rl_expand: bad runlist length: %d\n", len);
 
-	if (p[len - 1].vcn > last_vcn)
+	if (p[len].vcn > last_vcn)
 		err_exit("rl_expand: length is already more than requested "
-			 "(%lld > %lld)\n", p[len - 1].vcn, last_vcn);
+			 "(%lld > %lld)\n", p[len].vcn, last_vcn);
 
-	if (p[len - 2].lcn == LCN_HOLE) {
+	if (p[len - 1].lcn == LCN_HOLE) {
 
-		p[len - 2].length += last_vcn - p[len - 1].vcn;
-		p[len - 1].vcn = last_vcn;
+		p[len - 1].length += last_vcn - p[len].vcn;
+		p[len].vcn = last_vcn;
 
-	} else if (p[len - 2].lcn >= 0) {
+	} else if (p[len - 1].lcn >= 0) {
 
-		p = realloc(*rl, ++len * sizeof(runlist_element));
+		p = realloc(*rl, (++len + 1) * sizeof(runlist_element));
 		if (!p)
 			perr_exit("rl_expand: realloc");
 
-		p[len - 2].lcn = LCN_HOLE;
-		p[len - 2].length = last_vcn - p[len - 2].vcn;
-		rl_set(p + len - 1, last_vcn, LCN_ENOENT, 0LL);
+		p[len - 1].lcn = LCN_HOLE;
+		p[len - 1].length = last_vcn - p[len - 1].vcn;
+		rl_set(p + len, last_vcn, LCN_ENOENT, 0LL);
 		*rl = p;
 
 	} else
-		err_exit("rl_expand: bad LCN: %lld\n", p[len - 2].lcn);
+		err_exit("rl_expand: bad LCN: %lld\n", p[len - 1].lcn);
 }
 
 /**

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

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
rl_expand(): check if new length isn't already more than requested


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- ntfsresize.c	1 Aug 2005 22:10:41 -0000	1.84
+++ ntfsresize.c	3 Aug 2005 21:35:22 -0000	1.85
@@ -1809,7 +1809,11 @@ static void rl_expand(runlist **rl, cons
 
 	len = rl_items(p);
 	if (len <= 1)
-		err_exit("ntfs_rl_expand: bad runlist length: %d\n", len);
+		err_exit("rl_expand: bad runlist length: %d\n", len);
+
+	if (p[len - 1].vcn > last_vcn)
+		err_exit("rl_expand: length is already more than requested "
+			 "(%lld > %lld)\n", p[len - 1].vcn, last_vcn);
 
 	if (p[len - 2].lcn == LCN_HOLE) {
 
@@ -1820,7 +1824,7 @@ static void rl_expand(runlist **rl, cons
 
 		p = realloc(*rl, ++len * sizeof(runlist_element));
 		if (!p)
-			perr_exit("ntfs_rl_expand: realloc");
+			perr_exit("rl_expand: realloc");
 
 		p[len - 2].lcn = LCN_HOLE;
 		p[len - 2].length = last_vcn - p[len - 2].vcn;
@@ -1828,7 +1832,7 @@ static void rl_expand(runlist **rl, cons
 		*rl = p;
 
 	} else
-		err_exit("ntfs_rl_expand: bad LCN: %lld\n", p[len - 2].lcn);
+		err_exit("rl_expand: bad LCN: %lld\n", p[len - 2].lcn);
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs compress.c,1.10,1.11

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

Changes by: cha0smaster

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

Modified Files:
	compress.c 
Log Message:
Fix ntfs_is_cb_compressed for nasty runlist merging case in which
compression block was incorrectly treated as not compressed.


Index: compress.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/compress.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- compress.c	21 Jun 2005 09:55:15 -0000	1.10
+++ compress.c	3 Aug 2005 21:25:43 -0000	1.11
@@ -3,6 +3,7 @@
  *		project.
  *
  * Copyright (c) 2004-2005 Anton Altaparmakov
+ * Copyright (c)      2005 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
@@ -265,9 +266,17 @@ static __inline__ BOOL ntfs_is_cb_compre
 		rl++;
 		/* Map the next runlist fragment if it is not mapped. */
 		if (rl->lcn < LCN_HOLE || !rl->length) {
-			rl = ntfs_attr_find_vcn(na, rl->vcn);
+			VCN tvcn;
+
+			tvcn = rl->vcn;
+			rl = ntfs_attr_find_vcn(na, tvcn);
 			if (!rl || rl->lcn < LCN_HOLE || !rl->length)
 				return TRUE;
+			if (rl->vcn < tvcn) {
+				/* Runs merged. Need special handling. */
+				cb_clusters -= rl->length - (tvcn - rl->vcn);
+				continue;
+			}
 		}
 		/* If the current run is sparse, the cb is compressed. */
 		if (rl->lcn == LCN_HOLE)

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.258,1.259

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

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
Fix ntfs_is_cb_compressed for nasty runlist merging case in which
compression block was incorrectly treated as not compressed.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- ChangeLog	1 Aug 2005 22:10:38 -0000	1.258
+++ ChangeLog	3 Aug 2005 21:25:42 -0000	1.259
@@ -25,6 +25,8 @@ xx/xx/xxxx - 1.12.0-WIP
 	- Make find work correctly on volumes mounted by ntfsmount.  (Yura)
 	- Replaced all occurances of ENOTSUP to EOPNOTSUPP to be in better
 	  harmony with the kernel driver.  (Szaka)
+	- Fix ntfs_is_cb_compressed for nasty runlist merging case in which
+	  compression block was incorrectly treated as not compressed.  (Yura)
 
 20/07/2005 - 1.11.1 - Fix several ntfsmount bugs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.19,1.20

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
ntfsmount: perror => Eprintf on partial {read,write}.


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntfsmount.c	3 Aug 2005 13:52:51 -0000	1.19
+++ ntfsmount.c	3 Aug 2005 14:06:04 -0000	1.20
@@ -402,8 +402,8 @@ static int ntfs_fuse_read(const char *or
 	while (size) {
 		res = ntfs_attr_pread(na, offset, size, buf);
 		if (res < size)
-			perror("ntfs_attr_pread returned less bytes than "
-					"requested.");
+			Eprintf("ntfs_attr_pread returned less bytes than "
+					"requested.\n");
 		if (res <= 0) {
 			res = -errno;
 			goto exit;
@@ -451,8 +451,8 @@ static int ntfs_fuse_write(const char *o
 	while (size) {
 		res = ntfs_attr_pwrite(na, offset, size, buf);
 		if (res < size)
-			perror("ntfs_attr_pwrite returned less bytes than "
-					"requested.");
+			Eprintf("ntfs_attr_pwrite returned less bytes than "
+					"requested.\n");
 		if (res <= 0) {
 			res = -errno;
 			goto exit;

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.18,1.19

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

On Wed, 2005-08-03 at 14:58 +0100, Anton Altaparmakov wrote:
> On Wed, 2005-08-03 at 06:53 -0700, Yura Pakhuchiy wrote:
> > Changes by: cha0smaster
> > 
> > Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
> > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27378/ntfsprogs
> > 
> > Modified Files:
> > 	ntfsmount.c 
> > Log Message:
> > * attrib.c: refix ntfs_attr_p{read,write}
> > * ntfsmount.c: code that now not really needed, but for any case
> > 
> > 
> > Index: ntfsmount.c
> > ===================================================================
> > RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
> > retrieving revision 1.18
> > retrieving revision 1.19
> > diff -u -p -r1.18 -r1.19
> > --- ntfsmount.c	1 Aug 2005 22:04:28 -0000	1.18
> > +++ ntfsmount.c	3 Aug 2005 13:52:51 -0000	1.19
> > @@ -398,11 +397,25 @@ static int ntfs_fuse_read(const char *or
> >  		res = -errno;
> >  		goto exit;
> >  	}
> > -	res = ntfs_attr_pread(na, offset, size, buf);
> > -	if (res == -1)
> > -		res = -errno;		
> > -	ntfs_attr_close(na);
> > +	if (offset + size > na->data_size)
> > +		size = na->data_size - offset;
> > +	while (size) {
> > +		res = ntfs_attr_pread(na, offset, size, buf);
> > +		if (res < size)
> > +			perror("ntfs_attr_pread returned less bytes than "
> > +					"requested.");
> 
> Using perror in this case is wrong.  When res < size but res >= 0, errno
> is not set thus you are using a random errno from whenever something
> else failed...

Thanks, will fix.

-- 
Best regards,
        Yura

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.18,1.19

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

On Wed, 2005-08-03 at 06:53 -0700, Yura Pakhuchiy wrote:
> Changes by: cha0smaster
> 
> Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27378/ntfsprogs
> 
> Modified Files:
> 	ntfsmount.c 
> Log Message:
> * attrib.c: refix ntfs_attr_p{read,write}
> * ntfsmount.c: code that now not really needed, but for any case
> 
> 
> Index: ntfsmount.c
> ===================================================================
> RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
> retrieving revision 1.18
> retrieving revision 1.19
> diff -u -p -r1.18 -r1.19
> --- ntfsmount.c	1 Aug 2005 22:04:28 -0000	1.18
> +++ ntfsmount.c	3 Aug 2005 13:52:51 -0000	1.19
> @@ -398,11 +397,25 @@ static int ntfs_fuse_read(const char *or
>  		res = -errno;
>  		goto exit;
>  	}
> -	res = ntfs_attr_pread(na, offset, size, buf);
> -	if (res == -1)
> -		res = -errno;		
> -	ntfs_attr_close(na);
> +	if (offset + size > na->data_size)
> +		size = na->data_size - offset;
> +	while (size) {
> +		res = ntfs_attr_pread(na, offset, size, buf);
> +		if (res < size)
> +			perror("ntfs_attr_pread returned less bytes than "
> +					"requested.");

Using perror in this case is wrong.  When res < size but res >= 0, errno
is not set thus you are using a random errno from whenever something
else failed...

> @@ -436,14 +448,24 @@ static int ntfs_fuse_write(const char *o
>  		res = -errno;
>  		goto exit;
>  	}
> -	res = ntfs_attr_pwrite(na, offset, size, buf);
> -	if (res == -1)
> -		res = -errno;
> -	if (res < size)
> -		perror("ntfs_attr_pwrite returned less than requested.");
> +	while (size) {
> +		res = ntfs_attr_pwrite(na, offset, size, buf);
> +		if (res < size)
> +			perror("ntfs_attr_pwrite returned less bytes than "
> +					"requested.");

And same for here.

Best regards,

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

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.170,1.171

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

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
* attrib.c: refix ntfs_attr_p{read,write}
* ntfsmount.c: code that now not really needed, but for any case


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- attrib.c	1 Aug 2005 22:10:38 -0000	1.170
+++ attrib.c	3 Aug 2005 13:52:50 -0000	1.171
@@ -817,6 +817,8 @@ res_err_out:
 					errno = EIO;
 				goto rl_err_out;
 			}
+			/* Needed for case when runs merged. */
+			ofs = pos + total - (rl->vcn << vol->cluster_size_bits);
 		}
 		if (!rl->length)
 			goto rl_err_out;
@@ -1064,6 +1066,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 					errno = EIO;
 				goto rl_err_out;
 			}
+			/* Needed for case when runs merged. */
+			ofs = pos + total - (rl->vcn << vol->cluster_size_bits);
 		}
 		if (!rl->length) {
 			errno = EIO;

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

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
* attrib.c: refix ntfs_attr_p{read,write}
* ntfsmount.c: code that now not really needed, but for any case


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ntfsmount.c	1 Aug 2005 22:04:28 -0000	1.18
+++ ntfsmount.c	3 Aug 2005 13:52:51 -0000	1.19
@@ -378,11 +378,10 @@ static int ntfs_fuse_read(const char *or
 {
 	ntfs_volume *vol;
 	ntfs_inode *ni = NULL;
-	ntfs_attr *na;
-	int res;
+	ntfs_attr *na = NULL;
 	char *path = NULL;
 	ntfschar *stream_name;
-	int stream_name_len;
+	int stream_name_len, res, total = 0;
 
 	stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
 	if (stream_name_len < 0)
@@ -398,11 +397,25 @@ static int ntfs_fuse_read(const char *or
 		res = -errno;
 		goto exit;
 	}
-	res = ntfs_attr_pread(na, offset, size, buf);
-	if (res == -1)
-		res = -errno;		
-	ntfs_attr_close(na);
+	if (offset + size > na->data_size)
+		size = na->data_size - offset;
+	while (size) {
+		res = ntfs_attr_pread(na, offset, size, buf);
+		if (res < size)
+			perror("ntfs_attr_pread returned less bytes than "
+					"requested.");
+		if (res <= 0) {
+			res = -errno;
+			goto exit;
+		}
+		size -= res;
+		offset += res;
+		total += res;
+	}
+	res = total;
 exit:
+	if (na)
+		ntfs_attr_close(na);
 	if (ni && ntfs_inode_close(ni))
 		perror("Failed to close inode");
 	free(path);
@@ -416,11 +429,10 @@ static int ntfs_fuse_write(const char *o
 {
 	ntfs_volume *vol;
 	ntfs_inode *ni = NULL;
-	ntfs_attr *na;
-	int res;
+	ntfs_attr *na = NULL;
 	char *path = NULL;
 	ntfschar *stream_name;
-	int stream_name_len;
+	int stream_name_len, res, total = 0;
 
 	stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
 	if (stream_name_len < 0)
@@ -436,14 +448,24 @@ static int ntfs_fuse_write(const char *o
 		res = -errno;
 		goto exit;
 	}
-	res = ntfs_attr_pwrite(na, offset, size, buf);
-	if (res == -1)
-		res = -errno;
-	if (res < size)
-		perror("ntfs_attr_pwrite returned less than requested.");
+	while (size) {
+		res = ntfs_attr_pwrite(na, offset, size, buf);
+		if (res < size)
+			perror("ntfs_attr_pwrite returned less bytes than "
+					"requested.");
+		if (res <= 0) {
+			res = -errno;
+			goto exit;
+		}
+		size -= res;
+		offset += res;
+		total += res;
+	}
+	res = total;
+exit:	
 	ctx->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate);
-	ntfs_attr_close(na);
-exit:
+	if (na)
+		ntfs_attr_close(na);
 	if (ni && ntfs_inode_close(ni))
 		perror("Failed to close inode");
 	free(path);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs decrypt.c,1.22,1.23

[Anton A. <an...@us...>]

Changes by: antona

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

Modified Files:
	decrypt.c 
Log Message:
Remove include of openssl/md5.h as that is no longer used.


Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- decrypt.c	2 Aug 2005 09:44:58 -0000	1.22
+++ decrypt.c	2 Aug 2005 09:48:42 -0000	1.23
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <gcrypt.h>
-#include <openssl/md5.h>
 
 #include "decrypt.h"
 
@@ -403,6 +402,9 @@ unsigned ntfs_decrypt_user_key_decrypt(n
 
 #if 0
 // This is the old code based on OpenSSL.  Please do not remove it.  AIA
+
+#include <openssl/md5.h>
+
 /**
  * ntfs_desx_key_expand - expand a 128-bit desx key to the needed 192-bit key
  * @src:	source buffer containing 128-bit key

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs decrypt.c,1.21,1.22

[Anton A. <an...@us...>]

Changes by: antona

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

Modified Files:
	decrypt.c 
Log Message:
Fix a warning.


Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- decrypt.c	1 Aug 2005 22:10:40 -0000	1.21
+++ decrypt.c	2 Aug 2005 09:44:58 -0000	1.22
@@ -215,7 +215,8 @@ static inline void reverse_buffer(unsign
 
 ntfs_decrypt_user_key *ntfs_decrypt_user_key_open(
 		ntfs_decrypt_user_key_session *session __attribute__((unused)),
-		unsigned char *thumb_print, unsigned thumb_size)
+		unsigned char *thumb_print __attribute__((unused)),
+		unsigned thumb_size __attribute__((unused)))
 {
 #ifdef __CYGWIN__
 	CRYPT_HASH_BLOB hash_blob;

[Linux-NTFS-cvs] CVS: ntfsprogs README,1.16,1.17

[Anton A. <an...@us...>]

Changes by: antona

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

Modified Files:
	README 
Log Message:
Update


Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/README,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- README	1 Aug 2005 13:40:51 -0000	1.16
+++ README	2 Aug 2005 08:54:19 -0000	1.17
@@ -45,9 +45,13 @@ at:
 Quick Installation
 ==================
 
-   In most cases it should be sufficient to do:
+   If you obtained the source code from CVS all the autogenerated files will be
+   missing.  To generate them you will need the autoconf, automake, and libtool
+   packages installed and you will need to run: ./autogen.sh
+
+   If you obtained the source code from the tar ball or from a source package
+   like the .src.rpm for example, in most cases it should be sufficient to do:
 
-	./autogen.sh    <-- Only in case you received source from CVS.
 	./configure
 	make
 	make install	<-- You usually need to be root for this one.

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.257,1.258

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
Replaced all occurances of ENOTSUP to EOPNOTSUPP to be in better harmony 
with the kernel driver 


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- ChangeLog	1 Aug 2005 22:04:27 -0000	1.257
+++ ChangeLog	1 Aug 2005 22:10:38 -0000	1.258
@@ -23,6 +23,8 @@ xx/xx/xxxx - 1.12.0-WIP
 	- Fix ntfs_attr_p{read,write} to not return less bytes if trapped on
 	  unmapped runlist region.  (Yura)
 	- Make find work correctly on volumes mounted by ntfsmount.  (Yura)
+	- Replaced all occurances of ENOTSUP to EOPNOTSUPP to be in better
+	  harmony with the kernel driver.  (Szaka)
 
 20/07/2005 - 1.11.1 - Fix several ntfsmount bugs.
 
@@ -475,10 +477,11 @@ xx/xx/xxxx - 1.12.0-WIP
 	  text and other little bits.
 	- Add --disable-default-device-io-ops option to ./configure which makes
 	  for a smaller libntfs but results in ntfs_mount() always returning
-	  error with errno set to ENOTSUP.  You need to use ntfs_device_mount()
-	  instead.  This only makes sense with "make libs" and when an
-	  application linking statically against libntfs provides its own
-	  device io operations.  (Feature requested by Christophe Grenier.)
+	  error with errno set to EOPNOTSUPP.  You need to use
+	  ntfs_device_mount() instead.  This only makes sense with "make libs"
+	  and when an application linking statically against libntfs provides
+	  its own device io operations.  (Feature requested by 
+	  Christophe Grenier.)
 	- Fix a duplicated free() in mkntfs. (Andras Erdei)
 	- Fix option display in mkntfs. (Andras Erdei)
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.169,1.170 device.c,1.17,1.18 mft.c,1.31,1.32 volume.c,1.48,1.49 win32_io.c,1.37,1.38

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

Changes by: szaka

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

Modified Files:
	attrib.c device.c mft.c volume.c win32_io.c 
Log Message:
Replaced all occurances of ENOTSUP to EOPNOTSUPP to be in better harmony 
with the kernel driver 


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- attrib.c	1 Aug 2005 13:40:51 -0000	1.169
+++ attrib.c	1 Aug 2005 22:10:38 -0000	1.170
@@ -85,7 +85,7 @@ s64 ntfs_get_attribute_value(const ntfs_
 	if (a->flags) {
 		Dputs("Encountered non-zero attribute flags.  Cannot handle "
 				"this yet.");
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		return 0;
 	}
 	if (!a->non_resident) {
@@ -920,7 +920,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 		// TODO: Implement writing compressed attributes! (AIA)
 		// return ntfs_attr_pwrite_compressed(ntfs_attr *na,
 		//		const s64 pos, s64 count, void *b);
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		return -1;
 	}
 	if (!count)
@@ -1292,7 +1292,7 @@ rl_err_out:
 				goto done;
 			// TODO: Need to try to change initialized_size. If it
 			// succeeds goto done, otherwise goto err_out. (AIA)
-			errno = ENOTSUP;
+			errno = EOPNOTSUPP;
 			goto err_out;
 		}
 		goto done;
@@ -3810,11 +3810,11 @@ put_err_out:
  *
  * Return 0 on success and -1 on error with errno set to the error code. The
  * following error codes are defined:
- *	EINVAL	- Invalid arguments passed.
- *	EPERM	- The attribute is not allowed to be resident.
- *	EIO	- I/O error, damaged inode or bug.
- *	ENOSPC	- There is no enough space to perform conversion.
- *	ENOTSUP	- Requested conversion is not supported yet.
+ *	EINVAL	   - Invalid arguments passed.
+ *	EPERM	   - The attribute is not allowed to be resident.
+ *	EIO	   - I/O error, damaged inode or bug.
+ *	ENOSPC	   - There is no enough space to perform conversion.
+ *	EOPNOTSUPP - Requested conversion is not supported yet.
  *
  * Warning: We do not set the inode dirty and we do not write out anything!
  *	    We expect the caller to do this as this is a fairly low level
@@ -3870,7 +3870,7 @@ static int ntfs_attr_make_resident(ntfs_
 		Dprintf("%s(): Making compressed or encrypted files "
 				"resident is not implemented yet.\n",
 				__FUNCTION__);
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		return -1;
 	}
 
@@ -4812,8 +4812,8 @@ 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.
- *	ENOTSUP	- The desired resize is not implemented yet.
+ *	EINVAL	   - Invalid arguments were passed to the function.
+ *	EOPNOTSUPP - The desired resize is not implemented yet.
  */
 int ntfs_attr_truncate(ntfs_attr *na, const s64 newsize)
 {
@@ -4840,7 +4840,7 @@ int ntfs_attr_truncate(ntfs_attr *na, co
 	 * TODO: Implement making handling of compressed attributes.
 	 */
 	if (NAttrCompressed(na)) {
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		return -1;
 	}
 	if (NAttrNonResident(na)) {

Index: device.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/device.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- device.c	6 Jul 2005 22:47:17 -0000	1.17
+++ device.c	1 Aug 2005 22:10:39 -0000	1.18
@@ -529,7 +529,7 @@ s64 ntfs_device_size_get(struct ntfs_dev
  *
  * The following error codes are defined:
  *	EINVAL		Input parameter error
- *	ENOTSUP		System does not support HDIO_GETGEO ioctl
+ *	EOPNOTSUPP	System does not support HDIO_GETGEO ioctl
  *	ENOTTY		@dev is a file or a device not supporting HDIO_GETGEO
  */
 s64 ntfs_device_partition_start_sector_get(struct ntfs_device *dev)
@@ -548,7 +548,7 @@ s64 ntfs_device_partition_start_sector_g
 		}
 	}
 #else
-	errno = ENOTSUP;
+	errno = EOPNOTSUPP;
 #endif
 	return -1;
 }
@@ -562,7 +562,7 @@ s64 ntfs_device_partition_start_sector_g
  *
  * The following error codes are defined:
  *	EINVAL		Input parameter error
- *	ENOTSUP		System does not support HDIO_GETGEO ioctl
+ *	EOPNOTSUPP	System does not support HDIO_GETGEO ioctl
  *	ENOTTY		@dev is a file or a device not supporting HDIO_GETGEO
  */
 int ntfs_device_heads_get(struct ntfs_device *dev)
@@ -582,7 +582,7 @@ int ntfs_device_heads_get(struct ntfs_de
 		}
 	}
 #else
-	errno = ENOTSUP;
+	errno = EOPNOTSUPP;
 #endif
 	return -1;
 }
@@ -596,7 +596,7 @@ int ntfs_device_heads_get(struct ntfs_de
  *
  * The following error codes are defined:
  *	EINVAL		Input parameter error
- *	ENOTSUP		System does not support HDIO_GETGEO ioctl
+ *	EOPNOTSUPP	System does not support HDIO_GETGEO ioctl
  *	ENOTTY		@dev is a file or a device not supporting HDIO_GETGEO
  */
 int ntfs_device_sectors_per_track_get(struct ntfs_device *dev)
@@ -616,7 +616,7 @@ int ntfs_device_sectors_per_track_get(st
 		}
 	}
 #else
-	errno = ENOTSUP;
+	errno = EOPNOTSUPP;
 #endif
 	return -1;
 }

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- mft.c	6 Jul 2005 22:47:18 -0000	1.31
+++ mft.c	1 Aug 2005 22:10:39 -0000	1.32
@@ -667,7 +667,7 @@ static int ntfs_mft_bitmap_extend_alloca
 		ntfs_error(vol->sb, "Not enough space in this mft record to "
 				"accommodate extended mft bitmap attribute "
 				"extent.  Cannot handle this yet.");
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		goto undo_alloc;
 	}
 	status.mp_rebuilt = 1;
@@ -989,7 +989,7 @@ static int ntfs_mft_data_extend_allocati
 		ntfs_error(vol->sb, "Not enough space in this mft record to "
 				"accommodate extended mft data attribute "
 				"extent.  Cannot handle this yet.");
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		goto undo_alloc;
 	}
 	mp_rebuilt = TRUE;

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- volume.c	29 Jul 2005 14:44:24 -0000	1.48
+++ volume.c	1 Aug 2005 22:10:39 -0000	1.49
@@ -1151,7 +1151,7 @@ ntfs_volume *ntfs_mount(const char *name
 	 * defined as there are no device operations available in libntfs in
 	 * this case.
 	 */
-	errno = ENOTSUP;
+	errno = EOPNOTSUPP;
 	return NULL;
 #endif
 }
@@ -1341,8 +1341,8 @@ int ntfs_check_if_mounted(const char *fi
  * Return 0 if NTFS version is supported otherwise -1 with errno set.
  *
  * The following error codes are defined:
- *	ENOTSUP   Unknown NTFS version
- *	EINVAL	  Invalid argument
+ *	EOPNOTSUPP - Unknown NTFS version
+ *	EINVAL	   - Invalid argument
  */
 int ntfs_version_is_supported(ntfs_volume *vol)
 {
@@ -1365,7 +1365,7 @@ int ntfs_version_is_supported(ntfs_volum
 	if (NTFS_V3_0(major, minor) || NTFS_V3_1(major, minor))
 		return 0;
 
-	errno = ENOTSUP;
+	errno = EOPNOTSUPP;
 	return -1;
 }
 

Index: win32_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- win32_io.c	12 Jul 2005 16:18:11 -0000	1.37
+++ win32_io.c	1 Aug 2005 22:10:40 -0000	1.38
@@ -127,7 +127,7 @@ static int ntfs_w32error_to_errno(unsign
 		case ERROR_NEGATIVE_SEEK:
 			return ESPIPE;
 		case ERROR_NOT_SUPPORTED:
-			return ENOTSUP;
+			return EOPNOTSUPP;
 		case ERROR_BAD_NETPATH:
 			return ENOSHARE;
 		default:
@@ -787,7 +787,7 @@ static int ntfs_device_win32_open_partit
 						"volumes are not supported in "
 						"R/W status yet");
 				CloseHandle(handle);
-				errno = ENOTSUP;
+				errno = EOPNOTSUPP;
 				return -1;
 			}
 			fd->vol_handle = INVALID_HANDLE_VALUE;
@@ -895,7 +895,7 @@ static s64 ntfs_device_win32_seek(struct
 		if (fd->part_length == -1) {
 			Dputs("win32_seek(): Error: Position relative to end "
 					"of disk not implemented.");
-			errno = ENOTSUP;
+			errno = EOPNOTSUPP;
 			return -1;
 		}
 		abs_ofs = fd->part_length + offset;
@@ -1404,7 +1404,7 @@ static int ntfs_device_win32_ioctl(struc
 			*(int *)argp = (int)(fd->part_length / 512);
 			return 0;
 		}
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		return -1;
 #endif
 #if defined(BLKGETSIZE64)
@@ -1414,7 +1414,7 @@ static int ntfs_device_win32_ioctl(struc
 			*(s64 *)argp = fd->part_length;
 			return 0;
 		}
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		return -1;
 #endif
 #ifdef HDIO_GETGEO
@@ -1429,7 +1429,7 @@ static int ntfs_device_win32_ioctl(struc
 #endif
 	default:
 		Dprintf("win32_ioctl(): unimplemented ioctl %d.\n", request);
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		return -1;
 	}
 }

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs decrypt.c,1.20,1.21 mkntfs.c,1.62,1.63 ntfsresize.c,1.83,1.84

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

Changes by: szaka

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

Modified Files:
	decrypt.c mkntfs.c ntfsresize.c 
Log Message:
Replaced all occurances of ENOTSUP to EOPNOTSUPP to be in better harmony 
with the kernel driver 


Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- decrypt.c	28 Jul 2005 16:18:20 -0000	1.20
+++ decrypt.c	1 Aug 2005 22:10:40 -0000	1.21
@@ -320,7 +320,7 @@ decrypt_key_open_err: 
 		fnCertFreeCertificateContext(pCert);
 	errno = EINVAL;
 #else /* !defined(__CYGWIN__) */
-	errno = ENOTSUP;
+	errno = EOPNOTSUPP;
 #endif /* !defined(__CYGWIN__) */
 	return NULL;
 }
@@ -722,7 +722,7 @@ ntfs_decrypt_data_key *ntfs_decrypt_data
 				"and say that you saw this message.  We will "
 				"then implement support for DES.\n");
 		free(key);
-		errno = ENOTSUP;
+		errno = EOPNOTSUPP;
 		return NULL;
 	}
 	if (key_size != wanted_key_size) {

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- mkntfs.c	20 Jul 2005 19:06:49 -0000	1.62
+++ mkntfs.c	1 Aug 2005 22:10:40 -0000	1.63
@@ -1226,7 +1226,7 @@ static int insert_positioned_attr_in_mft
 	}
 	if (ic == IGNORE_CASE) {
 		Eprintf("FIXME: Hit unimplemented code path #1.\n");
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 	if (!ntfs_attr_lookup(type, uname, name_len, ic, 0, NULL, 0, ctx)) {
@@ -1243,12 +1243,12 @@ static int insert_positioned_attr_in_mft
 		Eprintf("Compressed attributes not supported yet.\n");
 		// FIXME: Compress attribute into a temporary buffer, set
 		// val accordingly and save the compressed size.
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 	if (flags & (ATTR_IS_ENCRYPTED || ATTR_IS_SPARSE)) {
 		Eprintf("Encrypted/sparse attributes not supported yet.\n");
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 	if (flags & ATTR_COMPRESSION_MASK) {
@@ -1299,7 +1299,7 @@ static int insert_positioned_attr_in_mft
 		// record.
 		// FIXME: the check for needing extension records should be
 		// earlier on as it is very quick: asize > m->bytes_allocated?
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 #ifdef DEBUG
@@ -1341,7 +1341,7 @@ static int insert_positioned_attr_in_mft
 		a->compressed_size = cpu_to_le64(0);
 		// FIXME: Write out the compressed data.
 		// FIXME: err = build_mapping_pairs_compressed();
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 	} else {
 		a->compression_unit = 0;
 		bw = ntfs_rlwrite(vol->dev, rl, val, val_len, &inited_size);
@@ -1411,7 +1411,7 @@ static int insert_non_resident_attr_in_m
 	}
 	if (ic == IGNORE_CASE) {
 		Eprintf("FIXME: Hit unimplemented code path #2.\n");
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 	if (!ntfs_attr_lookup(type, uname, name_len, ic, 0, NULL, 0, ctx)) {
@@ -1428,12 +1428,12 @@ static int insert_non_resident_attr_in_m
 		Eprintf("Compressed attributes not supported yet.\n");
 		// FIXME: Compress attribute into a temporary buffer, set
 		// val accordingly and save the compressed size.
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 	if (flags & (ATTR_IS_ENCRYPTED || ATTR_IS_SPARSE)) {
 		Eprintf("Encrypted/sparse attributes not supported yet.\n");
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 	if (val_len) {
@@ -1486,7 +1486,7 @@ static int insert_non_resident_attr_in_m
 		// record.
 		// FIXME: the check for needing extension records should be
 		// earlier on as it is very quick: asize > m->bytes_allocated?
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 #ifdef DEBUG
@@ -1531,7 +1531,7 @@ static int insert_non_resident_attr_in_m
 		a->compressed_size = cpu_to_le64(0);
 		// FIXME: Write out the compressed data.
 		// FIXME: err = build_mapping_pairs_compressed();
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 	} else {
 		a->compression_unit = 0;
 		bw = ntfs_rlwrite(vol->dev, rl, val, val_len, NULL);
@@ -1600,7 +1600,7 @@ static int insert_resident_attr_in_mft_r
 	}
 	if (ic == IGNORE_CASE) {
 		Eprintf("FIXME: Hit unimplemented code path #3.\n");
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 	if (!ntfs_attr_lookup(type, uname, name_len, ic, 0, val, val_len,
@@ -1632,7 +1632,7 @@ static int insert_resident_attr_in_mft_r
 		// record.
 		// FIXME: the check for needing extension records should be
 		// earlier on as it is very quick: asize > m->bytes_allocated?
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		goto err_out;
 	}
 #ifdef DEBUG
@@ -2121,7 +2121,7 @@ static int upgrade_to_large_index(MFT_RE
 	}
 	if (ic == IGNORE_CASE) {
 		Eprintf("FIXME: Hit unimplemented code path #4.\n");
-		err = -ENOTSUP;
+		err = -EOPNOTSUPP;
 		if (uname)
 			free(uname);
 		goto err_out;

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- ntfsresize.c	1 Aug 2005 20:33:26 -0000	1.83
+++ ntfsresize.c	1 Aug 2005 22:10:41 -0000	1.84
@@ -2184,7 +2184,7 @@ static ntfs_volume *mount_volume(void)
 			printf(corrupt_volume_msg);
 		else if (err == EPERM)
 			printf(hibernated_volume_msg);
-        	else if (err == EOPNOTSUPP) /* NOTE: same as ENOTSUP !!! */
+        	else if (err == EOPNOTSUPP)
 			printf(unclean_journal_msg);
 		exit(1);
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.17,1.18

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
ntfsmount: fix nr_links for directories.


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ntfsmount.c	1 Aug 2005 13:40:51 -0000	1.17
+++ ntfsmount.c	1 Aug 2005 22:04:28 -0000	1.18
@@ -264,6 +264,7 @@ static int ntfs_fuse_getattr(const char 
 				stbuf->st_size = 0;
 				stbuf->st_blocks = 0;
 			}
+			stbuf->st_nlink = 1; /* Needed for correct find work. */
 		} else {
 			stbuf->st_mode = S_IFREG | (0777 & ~ctx->fmask);
 			na = ntfs_attr_open(ni, AT_DATA, stream_name,
@@ -279,11 +280,11 @@ static int ntfs_fuse_getattr(const char 
 				if (stream_name_len)
 					res = -ENOENT;
 			}
+			stbuf->st_nlink = le16_to_cpu(ni->mrec->link_count);
 		}
 		stbuf->st_uid = ctx->uid;
 		stbuf->st_gid = ctx->gid;
 		stbuf->st_ino = ni->mft_no;
-		stbuf->st_nlink = le16_to_cpu(ni->mrec->link_count);
 		stbuf->st_atime = ni->atime;
 		stbuf->st_ctime = ni->ctime;
 		stbuf->st_mtime = ni->mtime;

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.256,1.257

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

Changes by: cha0smaster

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

Modified Files:
	ChangeLog 
Log Message:
ntfsmount: fix nr_links for directories.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- ChangeLog	1 Aug 2005 13:40:51 -0000	1.256
+++ ChangeLog	1 Aug 2005 22:04:27 -0000	1.257
@@ -22,6 +22,7 @@ xx/xx/xxxx - 1.12.0-WIP
 	  wasn't in use.  (Szaka)
 	- Fix ntfs_attr_p{read,write} to not return less bytes if trapped on
 	  unmapped runlist region.  (Yura)
+	- Make find work correctly on volumes mounted by ntfsmount.  (Yura)
 
 20/07/2005 - 1.11.1 - Fix several ntfsmount bugs.
 

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

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

On Tue, 2 Aug 2005, Szakacsits Szabolcs wrote:
> On Tue, 2 Aug 2005, Yura Pakhuchiy wrote:
> > On Tue, 2005-08-02 at 00:02 +0300, Szakacsits Szabolcs wrote:
> > > On Mon, 1 Aug 2005, Yura Pakhuchiy wrote:
> > > > On Mon, 2005-08-01 at 22:37 +0200, Szakacsits Szabolcs wrote:
> > > > > 
> > > > > Please also note that EOPNOTSUPP == ENOTSUP, which is used in quite
> > > > > many
> > > > > places in libntfs already.
> > > > 
> > > > Yes, I know, but prefer it because of portability, kernel doesn't have
> > > > ENOTSUP, only EOPNOTSUPP.
> > > 
> > > How about replacing all ENOTSUP to EOPNOTSUPP?
> > 
> > I think it's good idea. I use EOPNOTSUPP in all my new code, but never
> > had time for mass-replace in the library.
> 
> I can do it in about 10 seconds, if it's also OK for Anton.

Sure, I don't really care.  As long as they both exist on all OS we 
support that is fine.  And at least according to the man page for errno it 
says that both are listed by POSIX.1 so we should be fine.

Best regards,

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

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

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

On Tue, 2 Aug 2005, Yura Pakhuchiy wrote:
> On Tue, 2005-08-02 at 00:02 +0300, Szakacsits Szabolcs wrote:
>> On Mon, 1 Aug 2005, Yura Pakhuchiy wrote:
>>> On Mon, 2005-08-01 at 22:37 +0200, Szakacsits Szabolcs wrote:
>>>>
>>>> Please also note that EOPNOTSUPP == ENOTSUP, which is used in quite many
>>>> places in libntfs already.
>>>
>>> Yes, I know, but prefer it because of portability, kernel doesn't have
>>> ENOTSUP, only EOPNOTSUPP.
>>
>> How about replacing all ENOTSUP to EOPNOTSUPP?
>
> I think it's good idea. I use EOPNOTSUPP in all my new code, but never
> had time for mass-replace in the library.

I can do it in about 10 seconds, if it's also OK for Anton.

 	Szaka

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

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

On Tue, 2005-08-02 at 00:02 +0300, Szakacsits Szabolcs wrote:
> On Mon, 1 Aug 2005, Yura Pakhuchiy wrote:
> > On Mon, 2005-08-01 at 22:37 +0200, Szakacsits Szabolcs wrote:
> >>
> >> Please also note that EOPNOTSUPP == ENOTSUP, which is used in quite many
> >> places in libntfs already.
> >
> > Yes, I know, but prefer it because of portability, kernel doesn't have
> > ENOTSUP, only EOPNOTSUPP.
> 
> How about replacing all ENOTSUP to EOPNOTSUPP?

I think it's good idea. I use EOPNOTSUPP in all my new code, but never
had time for mass-replace in the library.

-- 
Best regards,
        Yura

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

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

On Mon, 1 Aug 2005, Yura Pakhuchiy wrote:
> On Mon, 2005-08-01 at 22:37 +0200, Szakacsits Szabolcs wrote:
>>
>> Please also note that EOPNOTSUPP == ENOTSUP, which is used in quite many
>> places in libntfs already.
>
> Yes, I know, but prefer it because of portability, kernel doesn't have
> ENOTSUP, only EOPNOTSUPP.

How about replacing all ENOTSUP to EOPNOTSUPP?

 	Szaka

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

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

On Mon, 2005-08-01 at 22:37 +0200, Szakacsits Szabolcs wrote:
> Hi Yura,
> 
> On Fri, 29 Jul 2005, Yura Pakhuchiy wrote:
> > On Fri, 2005-07-29 at 17:31 +0200, Szakacsits Szabolcs wrote:
> > > On Fri, 29 Jul 2005, Yura Pakhuchiy wrote:
> > > > 
> > > > I don't think so. We should return EIO on real errors (eg. damaged
> > > > volume), but unclean logfile it's not damaged volume, it's simply case
> > > > that we don't support yet. So I think that EOPNOTSUPP is absolutely
> > > > correct here.
> 
> Please also note that EOPNOTSUPP == ENOTSUP, which is used in quite many
> places in libntfs already.

Yes, I know, but prefer it because of portability, kernel doesn't have
ENOTSUP, only EOPNOTSUPP.

> > > You converted all ntfs_check_logfile() and ntfs_is_logfile_clean() error
> > > cases to EOPNOTSUPP. Damaged volumes too.
> > 
> > Yes, because this functions check consistency of logfile content, even
> > if it's absolutely invalid it's not a damaged volume. On damaged volumes
> > we will receive error much earlier, during previous steps of mount,
> > ntfs_inode_open for logfile or ntfs_attr_open.
> 
> Well, anyway, maybe it's still better because I've never met ENOTSUP from
> ntfs_mount so we could now distinguish immediately this error case from
> all the others.

Great! Glad that you agreed. :-)

-- 
Best regards,
        Yura

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

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

Hi Yura,

On Fri, 29 Jul 2005, Yura Pakhuchiy wrote:
> On Fri, 2005-07-29 at 17:31 +0200, Szakacsits Szabolcs wrote:
> > On Fri, 29 Jul 2005, Yura Pakhuchiy wrote:
> > > 
> > > I don't think so. We should return EIO on real errors (eg. damaged
> > > volume), but unclean logfile it's not damaged volume, it's simply case
> > > that we don't support yet. So I think that EOPNOTSUPP is absolutely
> > > correct here.

Please also note that EOPNOTSUPP == ENOTSUP, which is used in quite many
places in libntfs already.

> > You converted all ntfs_check_logfile() and ntfs_is_logfile_clean() error
> > cases to EOPNOTSUPP. Damaged volumes too.
> 
> Yes, because this functions check consistency of logfile content, even
> if it's absolutely invalid it's not a damaged volume. On damaged volumes
> we will receive error much earlier, during previous steps of mount,
> ntfs_inode_open for logfile or ntfs_attr_open.

Well, anyway, maybe it's still better because I've never met ENOTSUP from
ntfs_mount so we could now distinguish immediately this error case from
all the others.

	Szaka

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

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
White space cleanup


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- ntfsresize.c	1 Aug 2005 20:22:24 -0000	1.82
+++ ntfsresize.c	1 Aug 2005 20:33:26 -0000	1.83
@@ -1688,7 +1688,7 @@ static void relocate_attributes(ntfs_res
 		else if (ret == 1)
 			continue;
 
-		if (resize->mref == FILE_Bitmap && 
+		if (resize->mref == FILE_Bitmap &&
 		    resize->ctx->attr->type == AT_DATA)
 			continue;
 
@@ -1827,7 +1827,7 @@ static void rl_expand(runlist **rl, cons
 		rl_set(p + len - 1, last_vcn, LCN_ENOENT, 0LL);
 		*rl = p;
 
-	} else 
+	} else
 		err_exit("ntfs_rl_expand: bad LCN: %lld\n", p[len - 2].lcn);
 }
 
@@ -2186,7 +2186,7 @@ static ntfs_volume *mount_volume(void)
 			printf(hibernated_volume_msg);
         	else if (err == EOPNOTSUPP) /* NOTE: same as ENOTSUP !!! */
 			printf(unclean_journal_msg);
-	 exit(1);
+		exit(1);
 	}
 
 	if (vol->flags & VOLUME_IS_DIRTY)
@@ -2260,7 +2260,7 @@ static void check_resize_constraints(ntf
 	if (resize->badclusters) {
 		printf("%sThe NTFS volume has at least %lld bad sector%s.\n",
 		       !opt.badsectors ? NERR_PREFIX : "",
-		       resize->badclusters, 
+		       resize->badclusters,
 		       resize->badclusters  - 1 ? "s" : "");
 		if (!opt.badsectors) {
 			printf(bad_sectors_warning_msg);