[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.8.in,1.22,1.23 ntfsmount.c,1.73,1.74

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.8.in ntfsmount.c 
Log Message:
ntfsmount: Rename "succeed_chmod" -> "silent". Do not return error on chown too.


Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ntfsmount.8.in	25 Jan 2006 23:36:09 -0000	1.22
+++ ntfsmount.8.in	30 Jan 2006 21:53:42 -0000	1.23
@@ -1,8 +1,8 @@
-.\" Copyright (c) 2005 Yura Pakhuchiy.
+.\" Copyright (c) 2005-2006 Yura Pakhuchiy.
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSMOUNT 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSMOUNT 8 "January 2006" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsmount \- NTFS module for FUSE.
 .SH SYNOPSIS
@@ -119,8 +119,8 @@ Mount filesystem read\-only.
 By default ntfsmount acts as "default_permissions,allow_other" was passed to it,
 this option cancel this behaviour.
 .TP
-.B succeed_chmod
-Don't change any permissions and don't return error on chmod operation.
+.B silent
+Do nothing on chmod and chown operations, but do not return error.
 .TP
 .B locale=
 You can set locale with this option. It's useful if locale enviroment variables

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- ntfsmount.c	3 Dec 2005 16:40:20 -0000	1.73
+++ ntfsmount.c	30 Jan 2006 21:53:42 -0000	1.74
@@ -1,7 +1,7 @@
 /**
  * ntfsmount - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2005 Yura Pakhuchiy
+ * Copyright (c) 2005-2006 Yura Pakhuchiy
  * Copyright (c) 2005 Yuval Fledel
  *
  * NTFS module for FUSE.
@@ -94,7 +94,7 @@ typedef struct {
 	ntfs_fuse_streams_interface streams;
 	BOOL ro;
 	BOOL show_sys_files;
-	BOOL succeed_chmod;
+	BOOL silent;
 	BOOL force;
 	BOOL debug;
 	BOOL noatime;
@@ -707,7 +707,17 @@ static int ntfs_fuse_chmod(const char *p
 {
 	if (strchr(path, ':') && ctx->streams == NF_STREAMS_INTERFACE_WINDOWS)
 		return -EINVAL; /* n/a for named data streams. */
-	if (ctx->succeed_chmod)
+	if (ctx->silent)
+		return 0;
+	return -EOPNOTSUPP;
+}
+
+static int ntfs_fuse_chown(const char *path, uid_t uid __attribute__((unused)),
+		gid_t gid __attribute__((unused)))
+{
+	if (strchr(path, ':') && ctx->streams == NF_STREAMS_INTERFACE_WINDOWS)
+		return -EINVAL; /* n/a for named data streams. */
+	if (ctx->silent)
 		return 0;
 	return -EOPNOTSUPP;
 }
@@ -1347,6 +1357,7 @@ static struct fuse_operations ntfs_fuse_
 	.truncate	= ntfs_fuse_truncate,
 	.statfs		= ntfs_fuse_statfs,
 	.chmod		= ntfs_fuse_chmod,
+	.chown		= ntfs_fuse_chown,
 	.mknod		= ntfs_fuse_mknod,
 	.symlink	= ntfs_fuse_symlink,
 	.link		= ntfs_fuse_link,
@@ -1515,13 +1526,13 @@ static char *parse_mount_options(const c
 				goto err_exit;
 			}
 			ctx->show_sys_files = TRUE;
-		} else if (!strcmp(opt, "succeed_chmod")) {
+		} else if (!strcmp(opt, "silent")) {
 			if (val) {
-				ntfs_log_error("'succeed_chmod' option should "
+				ntfs_log_error("'silent' option should "
 						"not have value.\n");
 				goto err_exit;
 			}
-			ctx->succeed_chmod = TRUE;
+			ctx->silent = TRUE;
 		} else if (!strcmp(opt, "force")) {
 			if (val) {
 				ntfs_log_error("'force' option should not "
@@ -1597,13 +1608,14 @@ static void usage(void)
 {
 	ntfs_log_info("\n%s v%s (libntfs %s) - NTFS module for FUSE.\n\n",
 			EXEC_NAME, VERSION, ntfs_libntfs_version());
-	ntfs_log_info("Copyright (c) 2005 Yura Pakhuchiy\n\n");
+	ntfs_log_info("Copyright (c) 2005-2006 Yura Pakhuchiy\n\n");
 	ntfs_log_info("usage:  %s device mount_point [-o options]\n\n",
 			EXEC_NAME);
 	ntfs_log_info("ntfsmount options are:\n\tforce\n\tno_def_opts\n\tumask"
 		"\n\tfmask\n\tdmask\n\tuid\n\tgid\n\tshow_sys_files\n\t"
-		"succeed_chmod\n\tlocale\n\tstreams_interface\n"
-		"Also look into FUSE documentation about it options.\n");
+		"silent\n\tlocale\n\tstreams_interface\n"
+		"Also look into FUSE documentation about it options "
+		"(NOTE: not all FUSE options are supported by ntfsmount).\n");
 	ntfs_log_info("Default options are: \"%s\".\n\n", def_opts);
 	ntfs_log_info("%s%s\n", ntfs_bugs, ntfs_home);
 }