Changes by: szaka
Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20827/ntfsprogs
Modified Files:
mkntfs.8.in mkntfs.c
Log Message:
Version 3.0 isn't supported (wasn't checked)
Index: mkntfs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.8.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mkntfs.8.in 7 Jan 2006 09:29:29 -0000 1.17
+++ mkntfs.8.in 7 Jan 2006 15:30:19 -0000 1.18
@@ -4,7 +4,7 @@
.\"
.TH MKNTFS 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
.SH NAME
-mkntfs \- create an NTFS 1.2 (Windows NT/2000/XP) file system
+mkntfs \- create an NTFS file system
.SH SYNOPSIS
.B mkntfs
[\fIoptions\fR] \fIdevice \fR[\fInumber\-of\-sectors\fR]
@@ -87,8 +87,8 @@ mkntfs \- create an NTFS 1.2 (Windows NT
]
.SH DESCRIPTION
.B mkntfs
-is used to create an NTFS 1.2 (Windows NT 4.0) file system on a device (usually
-a disk partition).
+is used to create an NTFS file system on a device (usually a disk partition)
+or file.
.I device
is the special file corresponding to the device (e.g
.IR /dev/hdXX ).
@@ -147,10 +147,13 @@ greater than 4096 have the side effect t
volume (due to limitations in the NTFS compression algorithm currently in use
by Windows).
.TP
-\fB\-I\fR, \fB\-\-no\-indexing\fR
-Disable content indexing on the volume. (This is only meaningful on
-Windows 2000 and later. Windows NT 4.0 and earlier ignore this as they do
-not implement content indexing at all.)
+\fB\-N\fR, \fB\-\-ntfs\-version\fR STRING
+Select the version of NTFS you wish to create. This can be "1.2"
+(Windows NT 4.0) or "3.1" (Windows XP, Server 2003 and Vista).
+Versions are upwards compatible and Windows 2000, which uses version "3.0",
+can read/write both.
+
+If this option is omitted then version "1.2" is used.
.TP
\fB\-n\fR, \fB\-\-no\-action\fR
Causes
@@ -160,10 +163,6 @@ to create a filesystem. All steps of the
actual writing to the device.
.SS Advanced options
.TP
-\fB\-N\fR, \fB\-\-ntfs\-version\fR STRING
-Select the version of NTFS you wish to use. This can be one of "1.2", "3.0",
-or "3.1".
-.TP
\fB\-s\fR, \fB\-\-sector\-size\fR BYTES
Specify the size of sectors in bytes. Valid sector size values are 256, 512,
1024, 2048 and 4096 bytes per sector. If omitted,
@@ -229,6 +228,11 @@ multiplier (% of volume size)
Fake the time to be 00:00:00 UTC, Jan 1, 1970 instead of the current system
time. This is only really useful for debugging purposes.
.TP
+\fB\-I\fR, \fB\-\-no\-indexing\fR
+Disable content indexing on the volume. (This is only meaningful on
+Windows 2000 and later. Windows NT 4.0 and earlier ignore this as they do
+not implement content indexing at all.)
+.TP
\fB\-F\fR, \fB\-\-force\fR
Force
.B mkntfs
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- mkntfs.c 7 Jan 2006 09:29:29 -0000 1.125
+++ mkntfs.c 7 Jan 2006 15:30:19 -0000 1.126
@@ -6,7 +6,7 @@
* Copyright (c) 2002-2006 Szabolcs Szakacsits
* Copyright (c) 2005 Erik Sornes
*
- * This utility will create an NTFS 1.2, 3.0 or 3.1 volume on a user
+ * This utility will create an NTFS 1.2 or 3.1 volume on a user
* specified (block) device.
*
* Some things (option handling and determination of mount status) have been
@@ -432,10 +432,12 @@ static BOOL mkntfs_parse_options(int arg
if (strcmp(optarg , "1.2") == 0) {
opts2->ver_major = 1;
opts2->ver_minor = 2;
+/*
+ FIXME: version 3.0 was not checked
} else if (strcmp(optarg , "3.0") == 0) {
opts2->ver_major = 3;
opts2->ver_minor = 0;
- } else if (strcmp(optarg , "3.1") == 0) {
+*/ } else if (strcmp(optarg , "3.1") == 0) {
opts2->ver_major = 3;
opts2->ver_minor = 1;
} else {
|