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

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs dir.h,1.17,1.18

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

Changes by: cha0smaster

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

Modified Files:
	dir.h 
Log Message:
tidy up djgpp S_IF{SOCK,LNK} fix


Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/dir.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- dir.h	8 Jan 2006 15:56:03 -0000	1.17
+++ dir.h	30 Jan 2006 22:10:31 -0000	1.18
@@ -2,7 +2,7 @@
  * dir.h - Exports for directory handling. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2002 Anton Altaparmakov
- * Copyright (c) 2005 Yura Pakhuchiy
+ * Copyright (c) 2005-2006 Yura Pakhuchiy
  * Copyright (c) 2004-2005 Richard Russon
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -32,7 +32,27 @@
 #define MAX_PATH 1024
 #endif
 
-/* The little endian Unicode strings $I30, $SII, $SDH, $O, $Q, $R
+/*
+ * We do not have these under DJGPP, so define our version that do not conflict
+ * with other S_IFs defined under DJGPP.
+ */
+#ifdef DJGPP
+#ifndef S_IFLNK
+#define S_IFLNK  0120000
+#endif
+#ifndef S_ISLNK
+#define S_ISLNK(m)  (((m) & S_IFMT) == S_IFLNK)
+#endif
+#ifndef S_IFSOCK
+#define S_IFSOCK 0140000
+#endif
+#ifndef S_ISSOCK
+#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+#endif
+#endif
+
+/*
+ * The little endian Unicode strings $I30, $SII, $SDH, $O, $Q, $R
  * as a global constant.
  */
 extern ntfschar NTFS_INDEX_I30[5];

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.51,1.52

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

Changes by: cha0smaster

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

Modified Files:
	dir.c 
Log Message:
tidy up djgpp S_IF{SOCK,LNK} fix


Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- dir.c	29 Jan 2006 14:07:45 -0000	1.51
+++ dir.c	30 Jan 2006 22:10:31 -0000	1.52
@@ -2,7 +2,7 @@
  * dir.c - Directory handling code. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2002-2005 Anton Altaparmakov
- * Copyright (c)      2005 Yura Pakhuchiy
+ * Copyright (c) 2005-2006 Yura Pakhuchiy
  * Copyright (c) 2004-2005 Richard Russon
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -42,15 +42,6 @@
 #include <sys/sysmacros.h>
 #endif
 
-#ifdef DJGPP
-#ifndef S_IFLNK
-#define S_IFLNK 0xa000
-#endif
-#ifndef S_IFSOCK
-#define S_IFSOCK 0xc000
-#endif
-#endif
-
 #include "types.h"
 #include "debug.h"
 #include "attrib.h"

[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);
 }

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.348,1.349

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

Changes by: cha0smaster

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

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


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -p -r1.348 -r1.349
--- ChangeLog	14 Jan 2006 00:54:51 -0000	1.348
+++ ChangeLog	30 Jan 2006 21:53:42 -0000	1.349
@@ -95,6 +95,8 @@ xx/xx/2005 - 1.12.2-WIP
 	- ntfsmount: Fix bug with moving non-empty directories.  (Yura)
 	- ntfsinfo: dump $Secure:$SDS in verbose mode.  (Szaka)
 	- ntfsinfo: fix off-by-one in ACL dumping, one ACE was missed.  (Szaka)
+	- ntfsmount: Rename "succeed_chmod" -> "silent". Do not return error
+	  on chown too.  (Yura)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs configure.ac,1.96,1.97

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

Changes by: szaka

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

Modified Files:
	configure.ac 
Log Message:
Check for sys/sysmacros to get major and minor definitions (Christophe)


Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- configure.ac	7 Jan 2006 16:00:21 -0000	1.96
+++ configure.ac	29 Jan 2006 14:09:57 -0000	1.97
@@ -330,7 +330,7 @@ AC_CHECK_HEADERS([ctype.h fcntl.h libint
 	stddef.h stdint.h stdlib.h stdio.h stdarg.h string.h strings.h \
 	errno.h time.h unistd.h utime.h wchar.h getopt.h features.h endian.h \
 	byteswap.h sys/byteorder.h sys/endian.h sys/param.h sys/ioctl.h \
-	sys/mount.h sys/stat.h sys/types.h sys/vfs.h sys/statvfs.h \
+	sys/mount.h sys/stat.h sys/types.h sys/vfs.h sys/statvfs.h sys/sysmacros.h \
 	linux/major.h linux/fd.h linux/hdreg.h machine/endian.h gcrypt.h \
 	windows.h gnutls/pkcs12.h])
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.50,1.51

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

Changes by: szaka

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

Modified Files:
	dir.c 
Log Message:
Define S_IFLNK and S_IFSOCK for djgpp (Christophe)


Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- dir.c	18 Dec 2005 16:27:21 -0000	1.50
+++ dir.c	29 Jan 2006 14:07:45 -0000	1.51
@@ -38,6 +38,19 @@
 #include <sys/stat.h>
 #endif
 
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
+#ifdef DJGPP
+#ifndef S_IFLNK
+#define S_IFLNK 0xa000
+#endif
+#ifndef S_IFSOCK
+#define S_IFSOCK 0xc000
+#endif
+#endif
+
 #include "types.h"
 #include "debug.h"
 #include "attrib.h"

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.103,1.104

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

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
Improved dumping SDS entries: stop at bogus values instead of crashing and 
don't stop at empty entries


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- ntfsinfo.c	14 Jan 2006 00:54:52 -0000	1.103
+++ ntfsinfo.c	29 Jan 2006 01:24:24 -0000	1.104
@@ -1110,7 +1110,15 @@ static void ntfs_dump_sds(ATTR_RECORD *a
 	
 	sd = sds;
 	
-	while (sd->length && sd->length != 32 && sd->hash) {
+	/*
+	 * FIXME: The right way is based on the indexes, so we couldn't
+	 * miss real entries. For now, dump until it makes sense.
+	 */
+	while (sd->length && sd->hash && 
+	       le64_to_cpu(sd->offset) < (u64)na->data_size &&
+	       le32_to_cpu(sd->length) < (u64)na->data_size &&
+	       le64_to_cpu(sd->offset) + 
+			le32_to_cpu(sd->length) < (u64)na->data_size) {
 		ntfs_dump_sds_entry(sd);
 		sd = (SECURITY_DESCRIPTOR_HEADER *)((char *)sd +
 				(cpu_to_le32(sd->length + 0x0F) &

[Linux-NTFS-cvs] CVS: ntfsprogs TODO.include,1.8,1.9

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

Changes by: antona

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

Modified Files:
	TODO.include 
Log Message:
Update TODO with config.h sort out needed...


Index: TODO.include
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/TODO.include,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- TODO.include	4 Aug 2005 12:21:23 -0000	1.8
+++ TODO.include	27 Jan 2006 12:29:40 -0000	1.9
@@ -5,3 +5,7 @@ Add usnjrnl.h (copy from kernel driver):
 Finish logfile.h: in particular, add:
 
 - more about the $LogFile on disk structures
+
+Remove ifdef HAVE_CONFIG_H and make config.h compulsory.  Further, place
+config.h in include/ntfs/config.h at least when distributing (make install,
+make dist, make rpm).

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.8.in,1.21,1.22

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.8.in 
Log Message:
minor change


Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ntfsmount.8.in	24 Jan 2006 16:57:47 -0000	1.21
+++ ntfsmount.8.in	25 Jan 2006 23:36:09 -0000	1.22
@@ -154,8 +154,8 @@ streams, so you are recommended to use t
 Named data streams act like normals files, so you can read from them, write to
 them and even delete them (using rm).  You can list all the named data streams
 a file has by getting the "ntfs.streams.list" extended attribute.  NOTE: This
-list feature is unique to the NTFS FUSE module and may never be supported by the
-kernel driver.
+list feature is unique to the \fBntfsmount\fR and may never be supported by the
+\fBkernel driver\fR.
 .SH EXAMPLES
 Mount /dev/hda1 to /mnt/ntfs\-fuse using ntfsmount:
 .RS

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.8.in,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-serv30902/ntfsprogs

Modified Files:
	ntfsmount.8.in 
Log Message:
update about direct_io


Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ntfsmount.8.in	8 Jan 2006 21:01:23 -0000	1.20
+++ ntfsmount.8.in	24 Jan 2006 16:57:47 -0000	1.21
@@ -92,6 +92,7 @@ useful on 2.4.X kernels, as on 2.6 kerne
 automatically determined for optimum performance.
 .TP
 .B direct_io
+(NOTE: Only for FUSE 2.3.0)
 This option disables the use of page cache (file content cache) in
 the kernel for this filesystem.  This has several affects:
 - Each read() or write() system call will initiate one or more

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs sd.c,1.11,1.12

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

Changes by: szaka

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

Modified Files:
	sd.c 
Log Message:
Set the size of the $SECURITY_DESCRIPTOR of the root directory appropriately
and as 'format' also does (the extra space was unused garbage)


Index: sd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/sd.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sd.c	7 Jan 2006 08:31:09 -0000	1.11
+++ sd.c	15 Jan 2006 12:55:04 -0000	1.12
@@ -217,9 +217,8 @@ void init_root_sd_31(u8 **sd_val, int *s
 	ACCESS_ALLOWED_ACE *ace;
 	SID *sid;
 
-	static char sd_array[0x1200];
-	//char* sd_val = NULL;
-	*sd_val_len = 0x1200;
+	static char sd_array[0x1030];
+	*sd_val_len = 0x1030;
 	*sd_val = (u8*)&sd_array;
 
 	//security descriptor relative

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.102,1.103

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

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
Fix off-by-one in ACL dumping, one ACE was missed


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- ntfsinfo.c	7 Jan 2006 08:20:33 -0000	1.102
+++ ntfsinfo.c	14 Jan 2006 00:54:52 -0000	1.103
@@ -4,7 +4,7 @@
  * Copyright (c) 2002-2004 Matthew J. Fanto
  * Copyright (c) 2002-2005 Anton Altaparmakov
  * Copyright (c) 2002-2005 Richard Russon
- * Copyright (c) 2003-2005 Szabolcs Szakacsits
+ * Copyright (c) 2003-2006 Szabolcs Szakacsits
  * Copyright (c) 2004-2005 Yuval Fledel
  * Copyright (c) 2004-2005 Yura Pakhuchiy
  * Copyright (c)      2005 Cristian Klein
@@ -834,7 +834,7 @@ static void ntfs_dump_acl(const char *pr
 	ace = (ACCESS_ALLOWED_ACE *)((char *)acl + 8);
 
 	/* iterate through ACE's */
-	for (i = 1; i < ace_count; i++) {
+	for (i = 1; i <= ace_count; i++) {
 		const char *ace_type;
 		char *sid;
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.347,1.348

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
Fix off-by-one in ACL dumping, one ACE was missed


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -p -r1.347 -r1.348
--- ChangeLog	7 Jan 2006 08:20:33 -0000	1.347
+++ ChangeLog	14 Jan 2006 00:54:51 -0000	1.348
@@ -94,6 +94,7 @@ xx/xx/2005 - 1.12.2-WIP
 	- ntfsmount: Add FreeBSD support.  (Yura)
 	- ntfsmount: Fix bug with moving non-empty directories.  (Yura)
 	- ntfsinfo: dump $Secure:$SDS in verbose mode.  (Szaka)
+	- ntfsinfo: fix off-by-one in ACL dumping, one ACE was missed.  (Szaka)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.8.in,1.20,1.21 ntfscat.8.in,1.12,1.13 ntfsclone.8.in,1.26,1.27 ntfscluster.8.in,1.12,1.13 ntfscp.8.in,1.11,1.12 ntfsfix.8.in,1.13,1.14 ntfsinfo.8.in,1.13,1.14 ntfslabel.8.in,1.9,1.10 ntfsls.8.in,1.12,1.13 ntfsmount.8.in,1.19,1.20 ntfsprogs.8.in,1.17,1.18 ntfsresize.8.in,1.33,1.34 ntfsundelete.8.in,1.19,1.20

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

Changes by: szaka

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

Modified Files:
	mkntfs.8.in ntfscat.8.in ntfsclone.8.in ntfscluster.8.in 
	ntfscp.8.in ntfsfix.8.in ntfsinfo.8.in ntfslabel.8.in 
	ntfsls.8.in ntfsmount.8.in ntfsprogs.8.in ntfsresize.8.in 
	ntfsundelete.8.in 
Log Message:
Refer by the sort URL to the manual pages


Index: mkntfs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.8.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mkntfs.8.in	8 Jan 2006 20:57:00 -0000	1.20
+++ mkntfs.8.in	8 Jan 2006 21:01:23 -0000	1.21
@@ -314,7 +314,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR badblocks (8),

Index: ntfscat.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.8.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ntfscat.8.in	8 Jan 2006 20:57:00 -0000	1.12
+++ ntfscat.8.in	8 Jan 2006 21:01:23 -0000	1.13
@@ -130,7 +130,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR ntfsls (8),

Index: ntfsclone.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.8.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ntfsclone.8.in	8 Jan 2006 20:57:00 -0000	1.26
+++ ntfsclone.8.in	8 Jan 2006 21:01:23 -0000	1.27
@@ -310,7 +310,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR ntfsresize (8)

Index: ntfscluster.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.8.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ntfscluster.8.in	8 Jan 2006 20:57:00 -0000	1.12
+++ ntfscluster.8.in	8 Jan 2006 21:01:23 -0000	1.13
@@ -122,7 +122,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR ntfsinfo (8),

Index: ntfscp.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.8.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntfscp.8.in	8 Jan 2006 20:57:00 -0000	1.11
+++ ntfscp.8.in	8 Jan 2006 21:01:23 -0000	1.12
@@ -122,7 +122,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR ntfsprogs (8)

Index: ntfsfix.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.8.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ntfsfix.8.in	8 Jan 2006 20:57:00 -0000	1.13
+++ ntfsfix.8.in	8 Jan 2006 21:01:23 -0000	1.14
@@ -67,7 +67,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR mkntfs (8),

Index: ntfsinfo.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.8.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ntfsinfo.8.in	8 Jan 2006 20:57:00 -0000	1.13
+++ ntfsinfo.8.in	8 Jan 2006 21:01:23 -0000	1.14
@@ -89,7 +89,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR ntfsprogs (8)

Index: ntfslabel.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.8.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ntfslabel.8.in	8 Jan 2006 20:57:00 -0000	1.9
+++ ntfslabel.8.in	8 Jan 2006 21:01:23 -0000	1.10
@@ -98,7 +98,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR mkntfs (8),

Index: ntfsls.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.8.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ntfsls.8.in	8 Jan 2006 20:57:00 -0000	1.12
+++ ntfsls.8.in	8 Jan 2006 21:01:23 -0000	1.13
@@ -171,7 +171,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR ntfsprogs (8)

Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntfsmount.8.in	8 Jan 2006 20:57:00 -0000	1.19
+++ ntfsmount.8.in	8 Jan 2006 21:01:23 -0000	1.20
@@ -234,7 +234,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR ntfsprogs (8),

Index: ntfsprogs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsprogs.8.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ntfsprogs.8.in	8 Jan 2006 20:57:00 -0000	1.17
+++ ntfsprogs.8.in	8 Jan 2006 21:01:23 -0000	1.18
@@ -66,7 +66,7 @@ http://www.linux\-ntfs.org/content/view/
 These manual pages can be viewed online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR libntfs\-gnomevfs (8)

Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ntfsresize.8.in	8 Jan 2006 20:57:00 -0000	1.33
+++ ntfsresize.8.in	8 Jan 2006 21:01:23 -0000	1.34
@@ -265,7 +265,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .sp
 .B Ntfsresize

Index: ntfsundelete.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.8.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntfsundelete.8.in	8 Jan 2006 20:57:00 -0000	1.19
+++ ntfsundelete.8.in	8 Jan 2006 21:01:23 -0000	1.20
@@ -322,7 +322,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://man.linux-ntfs.org/ntfsprogs.8.html
+http://man.linux-ntfs.org/
 .hy
 .SH SEE ALSO
 .BR ntfsinfo (8),

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.8.in,1.19,1.20 ntfscat.8.in,1.11,1.12 ntfsclone.8.in,1.25,1.26 ntfscluster.8.in,1.11,1.12 ntfscp.8.in,1.10,1.11 ntfsfix.8.in,1.12,1.13 ntfsinfo.8.in,1.12,1.13 ntfslabel.8.in,1.8,1.9 ntfsls.8.in,1.11,1.12 ntfsmount.8.in,1.18,1.19 ntfsprogs.8.in,1.16,1.17 ntfsresize.8.in,1.32,1.33 ntfsundelete.8.in,1.18,1.19

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

Changes by: szaka

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

Modified Files:
	mkntfs.8.in ntfscat.8.in ntfsclone.8.in ntfscluster.8.in 
	ntfscp.8.in ntfsfix.8.in ntfsinfo.8.in ntfslabel.8.in 
	ntfsls.8.in ntfsmount.8.in ntfsprogs.8.in ntfsresize.8.in 
	ntfsundelete.8.in 
Log Message:
Fix URL to the manual pages on the web


Index: mkntfs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.8.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mkntfs.8.in	7 Jan 2006 18:41:38 -0000	1.19
+++ mkntfs.8.in	8 Jan 2006 20:57:00 -0000	1.20
@@ -314,7 +314,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR badblocks (8),

Index: ntfscat.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.8.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntfscat.8.in	7 Jan 2006 18:41:38 -0000	1.11
+++ ntfscat.8.in	8 Jan 2006 20:57:00 -0000	1.12
@@ -130,7 +130,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR ntfsls (8),

Index: ntfsclone.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.8.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ntfsclone.8.in	7 Jan 2006 22:21:25 -0000	1.25
+++ ntfsclone.8.in	8 Jan 2006 20:57:00 -0000	1.26
@@ -310,7 +310,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR ntfsresize (8)

Index: ntfscluster.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.8.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntfscluster.8.in	7 Jan 2006 18:41:38 -0000	1.11
+++ ntfscluster.8.in	8 Jan 2006 20:57:00 -0000	1.12
@@ -122,7 +122,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR ntfsinfo (8),

Index: ntfscp.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.8.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfscp.8.in	7 Jan 2006 18:41:38 -0000	1.10
+++ ntfscp.8.in	8 Jan 2006 20:57:00 -0000	1.11
@@ -122,7 +122,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR ntfsprogs (8)

Index: ntfsfix.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.8.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ntfsfix.8.in	7 Jan 2006 22:21:25 -0000	1.12
+++ ntfsfix.8.in	8 Jan 2006 20:57:00 -0000	1.13
@@ -67,7 +67,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR mkntfs (8),

Index: ntfsinfo.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.8.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ntfsinfo.8.in	7 Jan 2006 18:41:38 -0000	1.12
+++ ntfsinfo.8.in	8 Jan 2006 20:57:00 -0000	1.13
@@ -89,7 +89,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR ntfsprogs (8)

Index: ntfslabel.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.8.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ntfslabel.8.in	7 Jan 2006 18:41:38 -0000	1.8
+++ ntfslabel.8.in	8 Jan 2006 20:57:00 -0000	1.9
@@ -98,7 +98,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR mkntfs (8),

Index: ntfsls.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.8.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntfsls.8.in	7 Jan 2006 18:41:38 -0000	1.11
+++ ntfsls.8.in	8 Jan 2006 20:57:00 -0000	1.12
@@ -171,7 +171,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR ntfsprogs (8)

Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ntfsmount.8.in	7 Jan 2006 18:41:38 -0000	1.18
+++ ntfsmount.8.in	8 Jan 2006 20:57:00 -0000	1.19
@@ -234,7 +234,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR ntfsprogs (8),

Index: ntfsprogs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsprogs.8.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ntfsprogs.8.in	7 Jan 2006 18:41:38 -0000	1.16
+++ ntfsprogs.8.in	8 Jan 2006 20:57:00 -0000	1.17
@@ -66,7 +66,7 @@ http://www.linux\-ntfs.org/content/view/
 These manual pages can be viewed online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR libntfs\-gnomevfs (8)

Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ntfsresize.8.in	7 Jan 2006 22:21:25 -0000	1.32
+++ ntfsresize.8.in	8 Jan 2006 20:57:00 -0000	1.33
@@ -265,7 +265,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .sp
 .B Ntfsresize

Index: ntfsundelete.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.8.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ntfsundelete.8.in	7 Jan 2006 18:41:38 -0000	1.18
+++ ntfsundelete.8.in	8 Jan 2006 20:57:00 -0000	1.19
@@ -322,7 +322,7 @@ http://www.linux\-ntfs.org/content/view/
 The manual pages are available online at:
 .br
 .nh
-http://wiki.linux\-ntfs.org/doku.php?id=man
+http://man.linux-ntfs.org/ntfsprogs.8.html
 .hy
 .SH SEE ALSO
 .BR ntfsinfo (8),

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs dir.h,1.16,1.17

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

Changes by: cha0smaster

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

Modified Files:
	dir.h 
Log Message:
Oops, by accident commited incomplete stuff to dir.h


Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/dir.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- dir.h	8 Jan 2006 15:53:27 -0000	1.16
+++ dir.h	8 Jan 2006 15:56:03 -0000	1.17
@@ -2,7 +2,7 @@
  * dir.h - Exports for directory handling. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2002 Anton Altaparmakov
- * Copyright (c) 2005-2006 Yura Pakhuchiy
+ * Copyright (c) 2005 Yura Pakhuchiy
  * Copyright (c) 2004-2005 Richard Russon
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -74,11 +74,6 @@ extern int ntfs_link(ntfs_inode *ni, ntf
 #define NTFS_DT_SOCK		12
 #define NTFS_DT_WHT		14
 
-/* DJGPP do not know about this. */
-#ifndef S_IFREG
-
-#endif
-
 /*
  * This is the "ntfs_filldir" function type, used by ntfs_readdir() to let
  * the caller specify what kind of dirent layout it wants to have.

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs dir.h,1.15,1.16 volume.h,1.22,1.23

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

Changes by: cha0smaster

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

Modified Files:
	dir.h volume.h 
Log Message:
should fix build under Solaris


Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/dir.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dir.h	10 Nov 2005 18:13:16 -0000	1.15
+++ dir.h	8 Jan 2006 15:53:27 -0000	1.16
@@ -2,7 +2,7 @@
  * dir.h - Exports for directory handling. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2002 Anton Altaparmakov
- * Copyright (c) 2005 Yura Pakhuchiy
+ * Copyright (c) 2005-2006 Yura Pakhuchiy
  * Copyright (c) 2004-2005 Richard Russon
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -74,6 +74,11 @@ extern int ntfs_link(ntfs_inode *ni, ntf
 #define NTFS_DT_SOCK		12
 #define NTFS_DT_WHT		14
 
+/* DJGPP do not know about this. */
+#ifndef S_IFREG
+
+#endif
+
 /*
  * This is the "ntfs_filldir" function type, used by ntfs_readdir() to let
  * the caller specify what kind of dirent layout it wants to have.

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- volume.h	24 Nov 2005 14:23:38 -0000	1.22
+++ volume.h	8 Jan 2006 15:53:28 -0000	1.23
@@ -2,7 +2,7 @@
  * volume.h - Exports for NTFS volume handling. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2004 Anton Altaparmakov
- * Copyright (c)      2005 Yura Pakhuchiy
+ * Copyright (c) 2005-2006 Yura Pakhuchiy
  * Copyright (c) 2004-2005 Richard Russon
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -45,14 +45,19 @@
  * Under Cygwin, DJGPP and FreeBSD we do not have MS_RDONLY and MS_NOATIME,
  * so we define them ourselves.
  */
-#if !defined(MS_RDONLY)
-/**
- * enum MS_MOUNT -
+#ifndef MS_RDONLY
+#define MS_RDONLY 1
+#endif
+/*
+ * Solaris defines MS_RDONLY but not MS_NOATIME thus we need to carefully
+ * define MS_NOATIME.
  */
-typedef enum {
-	MS_RDONLY = 1,
-	MS_NOATIME,
-} MS_MOUNT;
+#ifndef MS_NOATIME
+#if (MS_RDONLY != 1)
+#	define MS_NOATIME 1
+#else
+#	define MS_NOATIME 2
+#endif
 #endif
 
 /* Forward declaration */

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.127,1.128

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Fix some typos


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- mkntfs.c	8 Jan 2006 14:54:55 -0000	1.127
+++ mkntfs.c	8 Jan 2006 15:12:19 -0000	1.128
@@ -3230,7 +3230,6 @@ static int create_hardlink_res(MFT_RECOR
 		return i;
 	}
 	/* Insert the index entry for file_name in @idx. */
-	/* remmet ut kun for debugging */
 	idx_size = (fn_size + 7)  & ~7;
 	idx_entry_new = ntfs_calloc(1, idx_size + 0x10);
 	if (!idx_entry_new)
@@ -3931,7 +3930,7 @@ static BOOL mkntfs_initialize_rl_logfile
 		/* 
 		 * FIXME: The $LogFile size is 64 MiB upwards from 12GiB but
 		 * the "200" divider below apparently approximates "100" or
-		 * some other walue as the volume size decreases. For example:
+		 * some other value as the volume size decreases. For example:
 		 *      Volume size   LogFile size    Ratio
 		 *	  8799808        46048       191.100
 		 *	  8603248        45072       190.877
@@ -4051,7 +4050,7 @@ static BOOL mkntfs_fill_device_with_zero
 
 	volume_size = g_vol->nr_clusters << g_vol->cluster_size_bits;
 
-	ntfs_log_progress("Initialising device with zeroes:   0%%");
+	ntfs_log_progress("Initializing device with zeroes:   0%%");
 	mid_clust = (volume_size >> 1) / g_vol->cluster_size;
 	for (position = 0; position < (unsigned long long)g_vol->nr_clusters;
 			position++) {
@@ -4084,7 +4083,7 @@ static BOOL mkntfs_fill_device_with_zero
 			if (!append_to_bad_blocks(position))
 				return FALSE;
 			ntfs_log_quiet("\nFound bad cluster (%lld). Adding to "
-				"list of bad blocks.\nInitialising "
+				"list of bad blocks.\nInitializing "
 				"device with zeroes: %3.0f%%", position,
 				position / progress_inc);
 			/* Seek to next cluster. */
@@ -4850,7 +4849,7 @@ static BOOL mkntfs_create_root_structure
 		/* dump_mft_record(m); */
 	}
 	/* create systemfiles for ntfs volumes (3.1) */
-	/* starting vith file 24 (ignoring file 16-23) */
+	/* starting with file 24 (ignoring file 16-23) */
 	if (g_vol->major_ver >= 3) {
 		extend_flags = FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM |
 			FILE_ATTR_ARCHIVE | FILE_ATTR_VIEW_INDEX_PRESENT;
@@ -5018,7 +5017,7 @@ static int mkntfs_redirect(struct mkntfs
 	if (!mkntfs_initialize_rl_mft())
 		goto done;
 
-	/* Initialise $LogFile. */
+	/* Initialize $LogFile. */
 	if (!mkntfs_initialize_rl_logfile())
 		goto done;
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.126,1.127

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

Changes by: szaka

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

Modified Files:
	mkntfs.c 
Log Message:
Adjust $LogFile size for 3.1 volumes which got much bigger (the small 
$LogFile became a performance bootleneck for the increasingly faster disks)


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- mkntfs.c	7 Jan 2006 15:30:19 -0000	1.126
+++ mkntfs.c	8 Jan 2006 14:54:55 -0000	1.127
@@ -3921,11 +3921,30 @@ static BOOL mkntfs_initialize_rl_logfile
 		g_logfile_size = 512LL * 1024;		/*   -> 512kiB	*/
 	else if (volume_size <= 200LL * 1024 * 1024)	/* < 200MiB	*/
 		g_logfile_size = 2048LL * 1024;		/*   -> 2MiB	*/
-	else if (volume_size >= 400LL << 20)		/* > 400MiB	*/
-		g_logfile_size = 4 << 20;		/*   -> 4MiB	*/
-	else
-		g_logfile_size = (volume_size / 100) &
-				~(g_vol->cluster_size - 1);
+	else if (g_vol->major_ver < 3) {
+		if (volume_size >= 400LL << 20)		/* > 400MiB	*/
+			g_logfile_size = 4 << 20;	/*   -> 4MiB	*/
+		else
+			g_logfile_size = (volume_size / 100) &
+					~(g_vol->cluster_size - 1);
+	} else	{
+		/* 
+		 * FIXME: The $LogFile size is 64 MiB upwards from 12GiB but
+		 * the "200" divider below apparently approximates "100" or
+		 * some other walue as the volume size decreases. For example:
+		 *      Volume size   LogFile size    Ratio
+		 *	  8799808        46048       191.100
+		 *	  8603248        45072       190.877
+		 *	  7341704        38768       189.375
+		 *	  6144828        32784       187.433
+		 *	  4192932        23024       182.111
+		 */
+		if (volume_size >= 12LL << 30)		/* > 12GiB	*/
+			g_logfile_size = 64 << 20;	/*   -> 64MiB	*/
+		else
+			g_logfile_size = (volume_size / 200) &
+					~(g_vol->cluster_size - 1);
+	}
 	j = g_logfile_size / g_vol->cluster_size;
 	while (g_rl_logfile[0].lcn + j >= g_vol->nr_clusters) {
 		/*

[Linux-NTFS-cvs] CVS: ntfsprogs README,1.19,1.20

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

Changes by: szaka

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

Modified Files:
	README 
Log Message:
Removed legacy ntfsfix comments, it still kept confusing people


Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/README,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- README	1 Dec 2005 20:44:18 -0000	1.19
+++ README	8 Jan 2006 13:30:42 -0000	1.20
@@ -71,7 +71,7 @@ NTFS library
 
 Provides common NTFS access functions to the ntfsprogs and other foreign
 open source applications.  Note, that the library is still under development
-and a lot of functionality is not yet included.
+and not all functionality is included yet.
 
 NTFS Gnome VFS module
 =====================
@@ -84,19 +84,13 @@ module in practice see man 8 libntfs-gno
 NTFS utilities
 ==============
 
-The ntfsprogs will eventually include utilities for doing all required tasks
-to NTFS partitions.  In general, just run a utility without any command line
+The ntfsprogs includes utilities for doing all required tasks to NTFS 
+partitions.  In general, just run a utility without any command line
 options to display the version number and usage syntax.
 
 The following utilities are so far implemented:
 
-NtfsFix - Attempt to fix an NTFS partition that has been damaged by the old
-Linux NTFS driver.  Note that you should run it every time after you have used
-the old Linux NTFS driver to write to an NTFS partition to prevent massive data
-corruption from happening when Windows mounts the partition.
-IMPORTANT: Run this only *after* unmounting the partition in Linux but *before*
-rebooting into Windows NT/2000 or you *will* suffer! - You have been warned!
-See man 8 ntfsfix for details.
+ntfsfix - Attempt to fix an NTFS partition and force Windows to check NTFS.
 
 mkntfs - Format a partition with the NTFS filesystem.  See man 8 mkntfs for
 command line options.

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.8.in,1.24,1.25 ntfsfix.8.in,1.11,1.12 ntfsresize.8.in,1.31,1.32

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

Changes by: szaka

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

Modified Files:
	ntfsclone.8.in ntfsfix.8.in ntfsresize.8.in 
Log Message:
More manual reverts, updates


Index: ntfsclone.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.8.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ntfsclone.8.in	7 Jan 2006 18:41:38 -0000	1.24
+++ ntfsclone.8.in	7 Jan 2006 22:21:25 -0000	1.25
@@ -1,9 +1,9 @@
 .\" Copyright (c) 2003\-2005 Richard Russon.
-.\" Copyright (c) 2003\-2005 Szabolcs Szakacsits.
+.\" Copyright (c) 2003\-2006 Szabolcs Szakacsits.
 .\" Copyright (c) 2004 Per Olofsson.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCLONE 8 "December 2005" "ntfsprogs version @VERSION@"
+.TH NTFSCLONE 8 "January 2006" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsclone \- Efficiently clone, image, restore or rescue an NTFS
 .SH SYNOPSIS
@@ -51,7 +51,7 @@ NTFS support then the file can be mounte
 .SS Sparse Files
 A file is sparse if it has unallocated blocks (holes). The reported size of
 such files are always higher than the disk space consumed by them.  The
-.B du
+.BR du
 command can tell the real disk space used by a sparse file.
 The holes are always read as zeros. All major Linux filesystem like,
 ext2, ext3, reiserfs, Reiser4, JFS and XFS, supports
@@ -85,14 +85,14 @@ with the options
 (handle sparse files "efficiently") and
 .B \-j
 (filter the archive through bzip2). Although
-.B tar
+.BR tar
 still reads and analyses the entire file, it doesn't pass on the
 large data blocks having only zeros to filters and it also avoids
 writing large amount of zeros to the disk needlessly. But since
-.B tar
+.BR tar
 can't create an archive from the standard input, you can't do this
 in\-place by just reading
-.B ntfsclone
+.BR ntfsclone
 standard output.
 .SS The Special Image Format
 It's also possible, actually it's recommended, to save an NTFS filesystem
@@ -119,7 +119,7 @@ using '\-' as the
 file.
 .SS Metadata\-only Cloning
 One of the features of
-.B ntfsclone
+.BR ntfsclone
 is that, it can also save only the NTFS metadata using the option
 .B \-m
 or
@@ -178,8 +178,8 @@ compression, encryption or streaming thr
 .TP
 \fB\-r\fR, \fB\-\-restore\-image\fR
 Restore from the special image format specified by
-.I SOURCE .
-If the
+.I SOURCE
+argument. If the
 .I SOURCE
 is '\-' then the image is read from the standard input.
 .TP
@@ -279,8 +279,8 @@ Pack NTFS metadata for NTFS experts
 .SH KNOWN ISSUES
 There are no known problems with
 .BR ntfsclone .
-If you find a bug please send an email describing the problem to the
-development team:
+If you think you have found a problem then please send an email describing it
+to the development team:
 .br
 .nh
 linux\-ntfs\-de...@li...

Index: ntfsfix.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.8.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntfsfix.8.in	7 Jan 2006 18:41:38 -0000	1.11
+++ ntfsfix.8.in	7 Jan 2006 22:21:25 -0000	1.12
@@ -1,8 +1,8 @@
-.\" Copyright (c) 2004 Szabolcs Szakacsits.
+.\" Copyright (c) 2005-2006 Szabolcs Szakacsits.
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSFIX 8 "November 2005" "ntfsprogs version @VERSION@"
+.TH NTFSFIX 8 "January 2006" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsfix \- fix common errors and force Windows to check NTFS
 .SH SYNOPSIS
@@ -20,7 +20,8 @@ check for the first boot into Windows.
 .sp
 You may run
 .B ntfsfix
-on an NTFS volume if you think it's damaged and it can't be mounted.
+on an NTFS volume if you think it was damaged by Windows or some other way 
+and it can't be mounted.
 .SH OPTIONS
 Below is a summary of all the options that
 .B ntfsfix
@@ -52,8 +53,7 @@ linux\-ntfs\-de...@li...
 .hy
 .SH AUTHORS
 .B ntfsfix
-was written by Anton Altaparmakov.
-.B ntfsfix.
+was written by Anton Altaparmakov, with contributions from Szabolcs Szakacsits.
 .SH AVAILABILITY
 .B ntfsfix
 is part of the

Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ntfsresize.8.in	7 Jan 2006 18:41:38 -0000	1.31
+++ ntfsresize.8.in	7 Jan 2006 22:21:25 -0000	1.32
@@ -1,8 +1,8 @@
-.\" Copyright (c) 2002\-2005 Szabolcs Szakacsits.
+.\" Copyright (c) 2002\-2006 Szabolcs Szakacsits.
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSRESIZE 8 "December 2005" "ntfsprogs version @VERSION@"
+.TH NTFSRESIZE 8 "January 2006" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsresize \- resize an NTFS filesystem without data loss
 .SH SYNOPSIS
@@ -43,6 +43,7 @@ parameter is given in kilo\-, mega\- or 
 .B Ntfsresize
 conforms to the SI, ATA, IEEE standards and the disk manufacturers
 by using k=10^3, M=10^6 and G=10^9.
+
 If both
 .B \-\-info
 and
@@ -96,6 +97,7 @@ starting sector and with the same partit
 Otherwise you won't be able to access your filesystem. Use the 'u'
 fdisk command to switch to the reliable sector unit from the
 default cylinder one.
+
 Also make sure you set the bootable flag for the partition if it
 existed before. Failing to do so you might not be able to boot your
 computer from the disk.
@@ -148,6 +150,7 @@ first.
 \fB\-f\fR, \fB\-\-force\fR
 Forces ntfsresize to proceed with the resize operation even if the filesystem
 is marked for consistency check.
+
 Please note, ntfsresize always marks the filesystem
 for consistency check before a real resize operation
 and it leaves that way for extra
@@ -167,6 +170,7 @@ Continue with the real resizing only if 
 Support disks having hardware errors, bad sectors with those
 .B ntfsresize
 would refuse to work by default.
+
 Prior using this option, it's strongly recommended to make a backup by
 .BR ntfsclone (8)
 using the \-\-rescue option, then running 'chkdsk /f /r volume:' on Windows
@@ -174,6 +178,7 @@ from the command line. If the disk guara
 It's defected. Please also note, that no software can repair these type of
 hardware errors. The most what they can do is to work around the permanent
 defects.
+
 This option doesn't have any effect if the disk is flawless.
 .TP
 \fB\-P\fR, \fB\-\-no\-progress\-bar\fR
@@ -191,7 +196,7 @@ and exit.
 Display help and exit.
 .SH EXIT CODES
 The exit code is 0 on success, non\-zero otherwise.
-.SH BUGS
+.SH KNOWN ISSUES
 No reliability problem is known. If you need
 help please try the Ntfsresize FAQ first (see below) and if you
 don't find your answer then send your question, comment or bug report to

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.8.in,1.18,1.19 ntfscat.8.in,1.10,1.11 ntfsclone.8.in,1.23,1.24 ntfscluster.8.in,1.10,1.11 ntfscp.8.in,1.9,1.10 ntfsfix.8.in,1.10,1.11 ntfsinfo.8.in,1.11,1.12 ntfslabel.8.in,1.7,1.8 ntfsls.8.in,1.10,1.11 ntfsmount.8.in,1.17,1.18 ntfsprogs.8.in,1.15,1.16 ntfsresize.8.in,1.30,1.31 ntfsundelete.8.in,1.17,1.18

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

Changes by: szaka

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

Modified Files:
	mkntfs.8.in ntfscat.8.in ntfsclone.8.in ntfscluster.8.in 
	ntfscp.8.in ntfsfix.8.in ntfsinfo.8.in ntfslabel.8.in 
	ntfsls.8.in ntfsmount.8.in ntfsprogs.8.in ntfsresize.8.in 
	ntfsundelete.8.in 
Log Message:
Revert to the unambiguous update dates for all manual pages


Index: mkntfs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.8.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mkntfs.8.in	7 Jan 2006 15:30:19 -0000	1.18
+++ mkntfs.8.in	7 Jan 2006 18:41:38 -0000	1.19
@@ -1,8 +1,9 @@
-.\" Copyright (c) 2001,2002 Anton Altaparmakov.
+.\" Copyright (c) 2001\-2002 Anton Altaparmakov.
 .\" Copyright (c) 2005 Richard Russon.
+.\" Copyright (c) 2005\-2006 Szabolcs Szakacsits.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH MKNTFS 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH MKNTFS 8 "January 2006" "ntfsprogs version @VERSION@"
 .SH NAME
 mkntfs \- create an NTFS file system
 .SH SYNOPSIS

Index: ntfscat.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.8.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfscat.8.in	21 Nov 2005 21:25:14 -0000	1.10
+++ ntfscat.8.in	7 Jan 2006 18:41:38 -0000	1.11
@@ -1,7 +1,7 @@
 .\" Copyright (c) 2003\-2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCAT 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSCAT 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfscat \- print NTFS files and streams on the standard output
 .SH SYNOPSIS

Index: ntfsclone.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.8.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ntfsclone.8.in	7 Dec 2005 21:52:46 -0000	1.23
+++ ntfsclone.8.in	7 Jan 2006 18:41:38 -0000	1.24
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2004 Per Olofsson.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCLONE 8 "2005\-12\-08" "ntfsprogs version @VERSION@"
+.TH NTFSCLONE 8 "December 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsclone \- Efficiently clone, image, restore or rescue an NTFS
 .SH SYNOPSIS

Index: ntfscluster.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.8.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfscluster.8.in	21 Nov 2005 21:25:15 -0000	1.10
+++ ntfscluster.8.in	7 Jan 2006 18:41:38 -0000	1.11
@@ -1,7 +1,7 @@
 .\" Copyright (c) 2003\-2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCLUSTER 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSCLUSTER 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfscluster \- identify files in a specified region of an NTFS volume.
 .SH SYNOPSIS

Index: ntfscp.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.8.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ntfscp.8.in	22 Nov 2005 00:17:23 -0000	1.9
+++ ntfscp.8.in	7 Jan 2006 18:41:38 -0000	1.10
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCP 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSCP 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfscp \- overwrite file on an NTFS volume.
 .SH SYNOPSIS

Index: ntfsfix.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.8.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfsfix.8.in	22 Nov 2005 00:17:23 -0000	1.10
+++ ntfsfix.8.in	7 Jan 2006 18:41:38 -0000	1.11
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSFIX 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSFIX 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsfix \- fix common errors and force Windows to check NTFS
 .SH SYNOPSIS

Index: ntfsinfo.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.8.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntfsinfo.8.in	21 Nov 2005 21:25:15 -0000	1.11
+++ ntfsinfo.8.in	7 Jan 2006 18:41:38 -0000	1.12
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSINFO 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSINFO 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsinfo \- dump a file's attributes
 .SH SYNOPSIS

Index: ntfslabel.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.8.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ntfslabel.8.in	21 Nov 2005 21:25:15 -0000	1.7
+++ ntfslabel.8.in	7 Jan 2006 18:41:38 -0000	1.8
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSLABEL 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSLABEL 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfslabel \- display/change the label on an ntfs file system
 .SH SYNOPSIS

Index: ntfsls.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.8.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfsls.8.in	22 Nov 2005 00:17:23 -0000	1.10
+++ ntfsls.8.in	7 Jan 2006 18:41:38 -0000	1.11
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSLS 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSLS 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsls \- list directory contents on an NTFS filesystem
 .SH SYNOPSIS

Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ntfsmount.8.in	29 Nov 2005 18:03:28 -0000	1.17
+++ ntfsmount.8.in	7 Jan 2006 18:41:38 -0000	1.18
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSMOUNT 8 "2005\-11\-27" "ntfsprogs version @VERSION@"
+.TH NTFSMOUNT 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsmount \- NTFS module for FUSE.
 .SH SYNOPSIS

Index: ntfsprogs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsprogs.8.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ntfsprogs.8.in	26 Nov 2005 01:46:20 -0000	1.15
+++ ntfsprogs.8.in	7 Jan 2006 18:41:38 -0000	1.16
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2005 Szabolcs Szakacsits.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSPROGS 8 "2005\-11\-26" "ntfsprogs version @VERSION@"
+.TH NTFSPROGS 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsprogs \- several tools for doing neat things with NTFS partitions
 .SH OVERVIEW

Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ntfsresize.8.in	7 Jan 2006 06:26:43 -0000	1.30
+++ ntfsresize.8.in	7 Jan 2006 18:41:38 -0000	1.31
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSRESIZE 8 "2005\-12\-08" "ntfsprogs version @VERSION@"
+.TH NTFSRESIZE 8 "December 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsresize \- resize an NTFS filesystem without data loss
 .SH SYNOPSIS

Index: ntfsundelete.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.8.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ntfsundelete.8.in	22 Nov 2005 00:17:23 -0000	1.17
+++ ntfsundelete.8.in	7 Jan 2006 18:41:38 -0000	1.18
@@ -1,7 +1,7 @@
 .\" Copyright (c) 2002\-2005 Richard Russon.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSUNDELETE 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
+.TH NTFSUNDELETE 8 "November 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsundelete \- recover a deleted file from an NTFS volume.
 .SH SYNOPSIS

[Linux-NTFS-cvs] CVS: ntfsprogs configure.ac,1.95,1.96

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

Changes by: cha0smaster

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

Modified Files:
	configure.ac 
Log Message:
Fix build under systems other than Linux and FreeBSD.


Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- configure.ac	2 Dec 2005 17:32:34 -0000	1.95
+++ configure.ac	7 Jan 2006 16:00:21 -0000	1.96
@@ -223,7 +223,13 @@ if test "$enable_fuse_module" != "no"; t
 				AC_MSG_WARN([ntfsmount requires FUSE version >= 2.4.2 under FreeBSD, because earlier versions have problems with readdir.])
 			fi
 		]);;
-	*) AC_MSG_ERROR([ntfsmount can be built only under Linux and FreeBSD.]);;
+	*)
+		if test "$enable_fuse_module" = "yes"; then
+			AC_MSG_ERROR([ntfsmount can be built only under Linux and FreeBSD.])
+		else
+			AC_MSG_WARN([ntfsmount can be built only under Linux and FreeBSD.])
+		fi
+		;;
 	esac
 fi
 AM_CONDITIONAL(ENABLE_FUSE_MODULE, $compile_fuse_module)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.8.in,1.17,1.18 mkntfs.c,1.125,1.126

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

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 {

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.8.in,1.16,1.17 mkntfs.c,1.124,1.125

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

Changes by: szaka

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

Modified Files:
	mkntfs.8.in mkntfs.c 
Log Message:
Change the NTFS version short option from the cryptic -w to -N 


Index: mkntfs.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.8.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mkntfs.8.in	22 Nov 2005 00:17:23 -0000	1.16
+++ mkntfs.8.in	7 Jan 2006 09:29:29 -0000	1.17
@@ -44,6 +44,10 @@ mkntfs \- create an NTFS 1.2 (Windows NT
 .B \-n
 ]
 [
+.B \-N
+.I ntfs\-version
+]
+[
 .B \-p
 .I part\-start\-sect
 ]
@@ -71,10 +75,6 @@ mkntfs \- create an NTFS 1.2 (Windows NT
 .B \-v
 ]
 [
-.B \-w
-.I ntfs\-version
-]
-[
 .B \-z
 .I mft\-zone\-multiplier
 ]
@@ -160,6 +160,10 @@ 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,
@@ -225,10 +229,6 @@ 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\-w\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\-F\fR, \fB\-\-force\fR
 Force
 .B mkntfs

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- mkntfs.c	7 Jan 2006 08:31:09 -0000	1.124
+++ mkntfs.c	7 Jan 2006 09:29:29 -0000	1.125
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005 Anton Altaparmakov
  * Copyright (c) 2001-2005 Richard Russon
- * Copyright (c) 2002-2005 Szabolcs Szakacsits
+ * 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
@@ -198,7 +198,7 @@ struct mkntfs_options {
 	long mft_zone_multiplier;	/* -z, value from 1 to 4. Default is 1. */
 	long long num_sectors;		/* size of device in sectors */
 	long cluster_size;		/* -c, format with this cluster-size */
-	u8 ver_major;			/* -w, ntfs version to create */
+	u8 ver_major;			/* -N, ntfs version to create */
 	u8 ver_minor;
 	char *label;			/* -L, volume label */
 } opts;
@@ -235,7 +235,7 @@ static void mkntfs_usage(void)
 		"    -S, --sectors-per-track NUM     Specify the number of sectors per track\n"
 		"    -z, --mft-zone-multiplier NUM   Set the MFT zone multiplier\n"
 		"    -T, --zero-time                 Fake the time to be 00:00 UTC, Jan 1, 1970\n"
-		"    -w, --ntfs-version STRING       NTFS version information\n"
+		"    -N, --ntfs-version VERSION      NTFS version: 3.1 or 1.2 (default)\n"
 		"    -F, --force                     Force execution despite errors\n"
 		"\n"
 		"Output options:\n"
@@ -260,7 +260,8 @@ static void mkntfs_version(void)
 	ntfs_log_info("Create an NTFS volume on a user specified (block) device.\n\n");
 	ntfs_log_info("Copyright (c) 2000-2005 Anton Altaparmakov\n");
 	ntfs_log_info("Copyright (c) 2001-2005 Richard Russon\n");
-	ntfs_log_info("Copyright (c) 2002-2005 Szabolcs Szakacsits\n");
+	ntfs_log_info("Copyright (c) 2002-2006 Szabolcs Szakacsits\n");
+	ntfs_log_info("Copyright (c) 2005      Erik Sornes\n");
 	ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
 }
 
@@ -342,7 +343,7 @@ static void mkntfs_init_options(struct m
  */
 static BOOL mkntfs_parse_options(int argc, char *argv[], struct mkntfs_options *opts2)
 {
-	static const char *sopt = "-c:CfFhH:IlL:np:qQs:S:TvVw:z:";
+	static const char *sopt = "-c:CfFhH:IlL:nN:p:qQs:S:TvVz:";
 	static const struct option lopt[] = {
 		{ "cluster-size",	required_argument,	NULL, 'c' },
 		{ "debug",		no_argument,		NULL, 'Z' },
@@ -356,7 +357,7 @@ static BOOL mkntfs_parse_options(int arg
 		{ "mft-zone-multiplier",required_argument,	NULL, 'z' },
 		{ "no-action",		no_argument,		NULL, 'n' },
 		{ "no-indexing",	no_argument,		NULL, 'I' },
-		{ "ntfs-version",	required_argument,	NULL, 'w' },
+		{ "ntfs-version",	required_argument,	NULL, 'N' },
 		{ "partition-start",	required_argument,	NULL, 'p' },
 		{ "quick",		no_argument,		NULL, 'Q' },
 		{ "quiet",		no_argument,		NULL, 'q' },
@@ -426,6 +427,26 @@ static BOOL mkntfs_parse_options(int arg
 		case 'n':
 			opts2->no_action = TRUE;
 			break;
+		case 'N':	/* ntfs-version */
+			if ((opts2->ver_major == 0) && (opts2->ver_minor == 0)) {
+				if (strcmp(optarg , "1.2") == 0) {
+					opts2->ver_major = 1;
+					opts2->ver_minor = 2;
+				} else if (strcmp(optarg , "3.0") == 0) {
+					opts2->ver_major = 3;
+					opts2->ver_minor = 0;
+				} else if (strcmp(optarg , "3.1") == 0) {
+					opts2->ver_major = 3;
+					opts2->ver_minor = 1;
+				} else {
+					ntfs_log_error("NTFS version '%s' is invalid.\n", optarg);
+					err++;
+				}
+			} else {
+				ntfs_log_error("You may only specify the NTFS version once.\n");
+				err++;
+			}
+			break;
 		case 'p':
 			if (!mkntfs_parse_llong(optarg, "partition start", &opts2->part_start_sect))
 				err++;
@@ -450,26 +471,6 @@ static BOOL mkntfs_parse_options(int arg
 		case 'V':
 			ver++;	/* display version info */
 			break;
-		case 'w':	/* ntfs-version */
-			if ((opts2->ver_major == 0) && (opts2->ver_minor == 0)) {
-				if (strcmp(optarg , "1.2") == 0) {
-					opts2->ver_major = 1;
-					opts2->ver_minor = 2;
-				} else if (strcmp(optarg , "3.0") == 0) {
-					opts2->ver_major = 3;
-					opts2->ver_minor = 0;
-				} else if (strcmp(optarg , "3.1") == 0) {
-					opts2->ver_major = 3;
-					opts2->ver_minor = 1;
-				} else {
-					ntfs_log_error("NTFS version '%s' is not supported.\n", optarg);
-					err++;
-				}
-			} else {
-				ntfs_log_error("You may only specify the NTFS version once.\n");
-				err++;
-			}
-			break;
 		case 'Z':	/* debug - turn on everything */
 			ntfs_log_set_levels(NTFS_LOG_LEVEL_DEBUG | NTFS_LOG_LEVEL_TRACE | NTFS_LOG_LEVEL_VERBOSE | NTFS_LOG_LEVEL_QUIET);
 			break;
@@ -483,7 +484,7 @@ static BOOL mkntfs_parse_options(int arg
 			if (((optopt == 'c') || (optopt == 'H') ||
 			     (optopt == 'L') || (optopt == 'p') ||
 			     (optopt == 's') || (optopt == 'S') ||
-			     (optopt == 'w') || (optopt == 'z')) &&
+			     (optopt == 'N') || (optopt == 'z')) &&
 			     (!optarg)) {
 				ntfs_log_error("Option '%s' requires an argument.\n", argv[optind-1]);
 			} else if (optopt != '?') {