[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.55,1.56

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
That was ntfsmount bug with '.' and '..', no need for a workaround.


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- ntfsmount.c	10 Nov 2005 18:13:16 -0000	1.55
+++ ntfsmount.c	10 Nov 2005 21:26:41 -0000	1.56
@@ -494,7 +494,8 @@ static int ntfs_fuse_filler(ntfs_fuse_fi
 				MREF(mref), strerror(errno));
 		return 0;
 	}
-	if (MREF(mref) >= FILE_first_user || ctx->show_sys_files)
+	if (MREF(mref) == FILE_root || MREF(mref) >= FILE_first_user ||
+			ctx->show_sys_files)
 		fill_ctx->filler(fill_ctx->buf, filename, NULL, 0);
 	free(filename);
 	return 0;
@@ -516,9 +517,6 @@ static int ntfs_fuse_readdir(const char 
 	ni = ntfs_pathname_to_inode(vol, NULL, path);
 	if (!ni)
 		return -errno;
-	if (!strcmp(path, "/"))
-		filler(buf, ".", NULL, 0);
-	filler(buf, "..", NULL, 0);
 	if (ntfs_readdir(ni, &pos, &fill_ctx,
 			(ntfs_filldir_t)ntfs_fuse_filler))
 		err = -errno;