[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscat.c, 1.27, 1.28 ntfsclone.c, 1.93, 1.94 ntfscluster.c, 1.33, 1.34 ntfscmp.c, 1.20, 1.21 ntfscp.c, 1.38, 1.39 ntfsdecrypt.c, 1.31, 1.32 ntfsdump_logfile.c, 1.34, 1.35 ntfsinfo.c, 1.152, 1.153 ntfslabel.c, 1.21, 1.22 ntfsls.c, 1.37, 1.38 ntfsmftalloc.c, 1.10, 1.11 ntfsmount.c, 1.91, 1.92 ntfsmove.c, 1.23, 1.24 ntfsresize.c, 1.122, 1.123 ntfsrm.c, 1.72, 1.73 ntfstruncate.c, 1.33, 1.34 ntfsundelete.c, 1.56, 1.57 ntfswipe.c, 1.44, 1.45

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

Changes by: yura

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

Modified Files:
	ntfscat.c ntfsclone.c ntfscluster.c ntfscmp.c ntfscp.c 
	ntfsdecrypt.c ntfsdump_logfile.c ntfsinfo.c ntfslabel.c 
	ntfsls.c ntfsmftalloc.c ntfsmount.c ntfsmove.c ntfsresize.c 
	ntfsrm.c ntfstruncate.c ntfsundelete.c ntfswipe.c 
Log Message:

* Rename MS_{RDONLY,NOATIME} to NTFS_MNT_{RDONLY,NOATIME}.
* Introduce NTFS_MNT_CASE_SENSITIVE.


Index: ntfscat.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ntfscat.c	5 Apr 2006 12:43:07 -0000	1.27
+++ ntfscat.c	12 Nov 2006 22:46:50 -0000	1.28
@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol) {
 		ntfs_log_perror("ERROR: couldn't mount volume");
 		return 1;

Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- ntfsclone.c	28 Oct 2006 23:41:41 -0000	1.93
+++ ntfsclone.c	12 Nov 2006 22:46:50 -0000	1.94
@@ -1593,7 +1593,7 @@ static s64 open_volume(void)
 {
 	s64 device_size;
 
-	mount_volume(MS_RDONLY);
+	mount_volume(NTFS_MNT_RDONLY);
 
 	device_size = ntfs_device_size_get(vol->dev, 1);
 	if (device_size <= 0)
@@ -1825,7 +1825,7 @@ int main(int argc, char **argv)
 	/* 'force' again mount for dirty volumes (e.g. after resize).
 	   FIXME: use mount flags to avoid potential side-effects in future */
 	opt.force++;
-	mount_volume(MS_NOATIME);
+	mount_volume(NTFS_MNT_NOATIME);
 
 	free(lcn_bitmap.bm);
 	setup_lcn_bitmap();

Index: ntfscluster.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ntfscluster.c	5 Apr 2006 12:43:07 -0000	1.33
+++ ntfscluster.c	12 Nov 2006 22:46:50 -0000	1.34
@@ -492,7 +492,7 @@ int main(int argc, char *argv[])
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol)
 		return 1;
 

Index: ntfscmp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ntfscmp.c	27 Oct 2006 12:24:30 -0000	1.20
+++ ntfscmp.c	12 Nov 2006 22:46:50 -0000	1.21
@@ -939,7 +939,7 @@ static ntfs_volume *mount_volume(const c
 				 "You must 'umount' it first.\n", volume);
 	}
 
-	vol = ntfs_mount(volume, MS_RDONLY);
+	vol = ntfs_mount(volume, NTFS_MNT_RDONLY);
 	if (vol == NULL) {
 
 		int err = errno;

Index: ntfscp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ntfscp.c	4 Oct 2006 00:47:04 -0000	1.38
+++ ntfscp.c	12 Nov 2006 22:46:50 -0000	1.39
@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (opts.noaction)
-		flags = MS_RDONLY;
+		flags = NTFS_MNT_RDONLY;
 
 	vol = utils_mount_volume(opts.device, flags, opts.force);
 	if (!vol) {

Index: ntfsdecrypt.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ntfsdecrypt.c	25 Sep 2006 16:58:38 -0000	1.31
+++ ntfsdecrypt.c	12 Nov 2006 22:46:50 -0000	1.32
@@ -1315,7 +1315,7 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 	/* Mount the ntfs volume. */
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol) {
 		ntfs_log_error("Failed to mount ntfs volume.  Aborting.\n");
 		ntfs_rsa_private_key_release(rsa_key);

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ntfsdump_logfile.c	20 Nov 2005 14:15:33 -0000	1.34
+++ ntfsdump_logfile.c	12 Nov 2006 22:46:50 -0000	1.35
@@ -197,7 +197,7 @@ static int logfile_open(BOOL is_volume, 
 		ntfs_inode *ni;
 		ntfs_attr *na;
 
-		vol = ntfs_mount(filename, MS_RDONLY);
+		vol = ntfs_mount(filename, NTFS_MNT_RDONLY);
 		if (!vol)
 			log_err_exit(NULL, "Failed to mount %s: %s\n",
 					filename, strerror(errno));

Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- ntfsinfo.c	5 Nov 2006 14:42:46 -0000	1.152
+++ ntfsinfo.c	12 Nov 2006 22:46:50 -0000	1.153
@@ -2204,7 +2204,7 @@ int main(int argc, char **argv)
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol) {
 		printf("Failed to open '%s': %s\n", opts.device,
 				strerror(errno));

Index: ntfslabel.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ntfslabel.c	5 Apr 2006 12:43:07 -0000	1.21
+++ ntfslabel.c	12 Nov 2006 22:46:50 -0000	1.22
@@ -394,8 +394,8 @@ int main(int argc, char **argv)
 	if (!opts.label)
 		opts.noaction++;
 
-	vol = utils_mount_volume(opts.device, opts.noaction ? MS_RDONLY : 0,
-			opts.force);
+	vol = utils_mount_volume(opts.device, opts.noaction ?
+			NTFS_MNT_RDONLY : 0, opts.force);
 	if (!vol)
 		return 1;
 

Index: ntfsls.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ntfsls.c	5 Apr 2006 12:43:07 -0000	1.37
+++ ntfsls.c	12 Nov 2006 22:46:50 -0000	1.38
@@ -651,7 +651,7 @@ int main(int argc, char **argv)
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol) {
 		// FIXME: Print error... (AIA)
 		return 2;

Index: ntfsmftalloc.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmftalloc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfsmftalloc.c	20 Nov 2005 14:15:33 -0000	1.10
+++ ntfsmftalloc.c	12 Nov 2006 22:46:50 -0000	1.11
@@ -313,7 +313,7 @@ int main(int argc, char **argv)
 	/* Mount the device. */
 	if (opts.no_action) {
 		ntfs_log_quiet("Running in READ-ONLY mode!\n");
-		ul = MS_RDONLY;
+		ul = NTFS_MNT_RDONLY;
 	} else
 		ul = 0;
 	vol = ntfs_mount(dev_name, ul);

Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- ntfsmount.c	10 Nov 2006 17:23:12 -0000	1.91
+++ ntfsmount.c	12 Nov 2006 22:46:50 -0000	1.92
@@ -1410,8 +1410,9 @@ static int ntfs_fuse_mount(const char *d
 {
 	ntfs_volume *vol;
 
-	vol = utils_mount_volume(device, ((ctx->ro) ? MS_RDONLY : 0) |
-			((ctx->noatime) ? MS_NOATIME : 0), ctx->force);
+	vol = utils_mount_volume(device, ((ctx->ro) ? NTFS_MNT_RDONLY : 0) |
+			((ctx->noatime) ? NTFS_MNT_NOATIME : 0) |
+			NTFS_MNT_CASE_SENSITIVE, ctx->force);
 	if (!vol) {
 		ntfs_log_error("Mount failed.\n");
 		return -1;

Index: ntfsmove.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ntfsmove.c	25 Sep 2006 16:58:38 -0000	1.23
+++ ntfsmove.c	12 Nov 2006 22:46:50 -0000	1.24
@@ -875,7 +875,7 @@ int main(int argc, char *argv[])
 	utils_set_locale();
 
 	if (opts.noaction)
-		flags |= MS_RDONLY;
+		flags |= NTFS_MNT_RDONLY;
 
 	vol = utils_mount_volume(opts.device, flags, opts.force);
 	if (!vol) {

Index: ntfsresize.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- ntfsresize.c	27 Oct 2006 12:24:30 -0000	1.122
+++ ntfsresize.c	12 Nov 2006 22:46:50 -0000	1.123
@@ -484,7 +484,7 @@ static int parse_options(int argc, char 
 			opt.info++;
 			break;
 		case 'n':
-			opt.ro_flag = MS_RDONLY;
+			opt.ro_flag = NTFS_MNT_RDONLY;
 			break;
 		case 'P':
 			opt.show_progress = 0;
@@ -520,7 +520,7 @@ static int parse_options(int argc, char 
 			err++;
 		}
 		if (opt.info) {
-			opt.ro_flag = MS_RDONLY;
+			opt.ro_flag = NTFS_MNT_RDONLY;
 			if (opt.bytes) {
 				printf(NERR_PREFIX "Options --info and --size "
 					"can't be used together.\n");
@@ -2237,7 +2237,7 @@ static ntfs_volume *mount_volume(void)
 				 "You must 'umount' it first.\n", opt.volume);
 	}
 
-	if (!(vol = ntfs_mount(opt.volume, opt.ro_flag | MS_NOATIME))) {
+	if (!(vol = ntfs_mount(opt.volume, opt.ro_flag | NTFS_MNT_NOATIME))) {
 
 		int err = errno;
 

Index: ntfsrm.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- ntfsrm.c	5 Apr 2006 12:43:08 -0000	1.72
+++ ntfsrm.c	12 Nov 2006 22:46:50 -0000	1.73
@@ -1027,7 +1027,7 @@ int main(int argc, char *argv[])
 #endif
 
 	if (opts.noaction)
-		flags |= MS_RDONLY;
+		flags |= NTFS_MNT_RDONLY;
 
 	//ntfs_log_set_levels (NTFS_LOG_LEVEL_DEBUG | NTFS_LOG_LEVEL_TRACE);
 	//ntfs_log_set_levels (NTFS_LOG_LEVEL_DEBUG);

Index: ntfstruncate.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ntfstruncate.c	5 Apr 2006 02:45:56 -0000	1.33
+++ ntfstruncate.c	12 Nov 2006 22:46:50 -0000	1.34
@@ -738,7 +738,7 @@ int main(int argc, char **argv)
 	/* Mount the device. */
 	if (opts.no_action) {
 		ntfs_log_quiet("Running in READ-ONLY mode!\n");
-		ul = MS_RDONLY;
+		ul = NTFS_MNT_RDONLY;
 	} else
 		ul = 0;
 	vol = ntfs_mount(dev_name, ul);

Index: ntfsundelete.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- ntfsundelete.c	5 Apr 2006 12:43:08 -0000	1.56
+++ ntfsundelete.c	12 Nov 2006 22:46:51 -0000	1.57
@@ -2123,7 +2123,7 @@ int main(int argc, char *argv[])
 
 	utils_set_locale();
 
-	vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force);
+	vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force);
 	if (!vol)
 		return 1;
 

Index: ntfswipe.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- ntfswipe.c	5 Apr 2006 12:43:08 -0000	1.44
+++ ntfswipe.c	12 Nov 2006 22:46:51 -0000	1.45
@@ -1340,7 +1340,7 @@ int main(int argc, char *argv[])
 		print_summary();
 
 	if (opts.info || opts.noaction)
-		flags = MS_RDONLY;
+		flags = NTFS_MNT_RDONLY;
 
 	vol = utils_mount_volume(opts.device, flags, opts.force);
 	if (!vol)