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

[Linux-NTFS-cvs] CVS: linux-ntfs Makefile.am,1.5,1.6 Makefile.in,1.10,1.11 config.h.in,1.15,1.16 configure,1.25,1.26 configure.in,1.23,1.24

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv22057

Modified Files:
	Makefile.am Makefile.in config.h.in configure configure.in 
Log Message:
Cleanups and updates.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- Makefile.am	11 Jun 2001 19:11:37 -0000	1.5
+++ Makefile.am	14 Apr 2002 14:15:47 -0000	1.6
@@ -10,5 +10,6 @@
 
 EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.ntfsfix ChangeLog \
-		INSTALL NEWS README autogen.sh linux-ntfs.spec.in TODO.mkntfs
+		INSTALL NEWS README autogen.sh linux-ntfs.spec.in TODO.mkntfs \
+		TODO.ntfslabel
 
 AUTOMAKE_OPTIONS = gnu

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- Makefile.in	26 Jan 2002 04:32:35 -0000	1.10
+++ Makefile.in	14 Apr 2002 14:15:47 -0000	1.11
@@ -95,5 +95,6 @@
 
 EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.ntfsfix ChangeLog \
-		INSTALL NEWS README autogen.sh linux-ntfs.spec.in TODO.mkntfs
+		INSTALL NEWS README autogen.sh linux-ntfs.spec.in TODO.mkntfs \
+		TODO.ntfslabel
 
 

Index: config.h.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/config.h.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- config.h.in	26 Jan 2002 04:32:35 -0000	1.15
+++ config.h.in	14 Apr 2002 14:15:47 -0000	1.16
@@ -76,10 +76,4 @@
 #undef HAVE_REALLOC
 
-/* Define if you have the setitimer function.  */
-#undef HAVE_SETITIMER
-
-/* Define if you have the sigaction function.  */
-#undef HAVE_SIGACTION
-
 /* Define if you have the srandom function.  */
 #undef HAVE_SRANDOM
@@ -94,4 +88,7 @@
 #undef HAVE_TIME
 
+/* Define if you have the vfprintf function.  */
+#undef HAVE_VFPRINTF
+
 /* Define if you have the vprintf function.  */
 #undef HAVE_VPRINTF
@@ -130,10 +127,4 @@
 #undef HAVE_MNTENT_H
 
-/* Define if you have the <sched.h> header file.  */
-#undef HAVE_SCHED_H
-
-/* Define if you have the <signal.h> header file.  */
-#undef HAVE_SIGNAL_H
-
 /* Define if you have the <stdarg.h> header file.  */
 #undef HAVE_STDARG_H
@@ -156,7 +147,4 @@
 /* Define if you have the <sys/stat.h> header file.  */
 #undef HAVE_SYS_STAT_H
-
-/* Define if you have the <sys/time.h> header file.  */
-#undef HAVE_SYS_TIME_H
 
 /* Define if you have the <sys/types.h> header file.  */

Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure,v
retrieving revision 1.25
retrieving revision 1.26
diff -U2 -r1.25 -r1.26
--- configure	12 Apr 2002 15:23:47 -0000	1.25
+++ configure	14 Apr 2002 14:15:47 -0000	1.26
@@ -964,5 +964,5 @@
 PACKAGE=linux-ntfs
 
-VERSION=1.7.0.WIP
+VERSION=1.6.99
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
@@ -5623,6 +5623,6 @@
 
 for ac_hdr in stdlib.h fcntl.h unistd.h errno.h sys/stat.h sys/ioctl.h \
-	sys/types.h linux/types.h asm/byteorder.h sys/mount.h sys/time.h \
-	signal.h sched.h time.h mntent.h stdio.h stdarg.h string.h \
+	sys/types.h linux/types.h asm/byteorder.h sys/mount.h \
+	time.h mntent.h stdio.h stdarg.h string.h \
 	getopt.h linux/major.h limits.h linux/fd.h
 do
@@ -5927,7 +5927,7 @@
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
 
-for ac_func in memset strdup puts printf fprintf vprintf perror strerror \
-	malloc calloc free realloc open close read write lseek fdatasync \
-	ioctl fflush atexit exit sigaction setitimer time srandom random
+for ac_func in memset strdup puts printf fprintf vprintf vfprintf perror \
+	strerror malloc calloc free realloc open close read write lseek \
+	fdatasync ioctl fflush atexit exit time srandom random
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

Index: configure.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- configure.in	12 Apr 2002 15:23:47 -0000	1.23
+++ configure.in	14 Apr 2002 14:15:47 -0000	1.24
@@ -13,5 +13,5 @@
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(linux-ntfs,1.7.0.WIP)
+AM_INIT_AUTOMAKE(linux-ntfs,1.6.99)
 
 AM_MAINTAINER_MODE
@@ -98,6 +98,6 @@
 AC_HEADER_STDC
 AC_CHECK_HEADERS(stdlib.h fcntl.h unistd.h errno.h sys/stat.h sys/ioctl.h \
-	sys/types.h linux/types.h asm/byteorder.h sys/mount.h sys/time.h \
-	signal.h sched.h time.h mntent.h stdio.h stdarg.h string.h \
+	sys/types.h linux/types.h asm/byteorder.h sys/mount.h \
+	time.h mntent.h stdio.h stdarg.h string.h \
 	getopt.h linux/major.h limits.h linux/fd.h)
 
@@ -111,7 +111,7 @@
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(memset strdup puts printf fprintf vprintf perror strerror \
-	malloc calloc free realloc open close read write lseek fdatasync \
-	ioctl fflush atexit exit sigaction setitimer time srandom random)
+AC_CHECK_FUNCS(memset strdup puts printf fprintf vprintf vfprintf perror \
+	strerror malloc calloc free realloc open close read write lseek \
+	fdatasync ioctl fflush atexit exit time srandom random)
 
 dnl Perform program name transformation.

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsfix.c,1.22,1.23

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv22057/ntfstools

Modified Files:
	ntfsfix.c 
Log Message:
Cleanups and updates.


Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- ntfsfix.c	12 Mar 2002 22:11:02 -0000	1.22
+++ ntfsfix.c	14 Apr 2002 14:15:47 -0000	1.23
@@ -77,5 +77,5 @@
 	ntfs_volume *vol = NULL;
 	__u16 flags;
-	attr_search_context ctx;
+	attr_search_context *ctx = NULL;
 	MFT_REF mref;
 
@@ -343,7 +343,11 @@
 	printf("Going to empty the journal ($LogFile)... ");
 	/* Find the $DATA attribute. */
-	memset(&ctx, 0, sizeof(attr_search_context));
-	ctx.mrec = (MFT_RECORD*)(b1 + (2 * mrs));
-	if (!find_first_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
+	ctx = get_attr_search_ctx(NULL, (MFT_RECORD*)(b1 + (2 * mrs)));
+	if (!ctx) {
+		puts(FAILED);
+		perror("Failed to allocate attribute search context");
+		goto log_file_error;
+	}
+	if (!find_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, ctx)) {
 		puts(FAILED);
 		fprintf(stderr, "Error: Attribute $DATA was not found in" \
@@ -351,5 +355,5 @@
 		goto log_file_error;
 	}
-	a = ctx.attr;
+	a = ctx->attr;
 	/* The $DATA attribute of the $LogFile has to be non-resident. */
 	if (!a->non_resident) {
@@ -426,4 +430,6 @@
 	i = 0;
 final_exit:
+	if (ctx)
+		put_attr_search_ctx(ctx);
 	if (b1)
 		free(b1);

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs Makefile.am,1.9,1.10 Makefile.in,1.13,1.14 attrib.c,1.16,1.17 disk_io.c,1.14,1.15 mft.c,1.12,1.13 mst.c,1.1,1.2 unistr.c,1.7,1.8 volume.c,1.20,1.21 bitmap.c,1.5,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv20229

Modified Files:
	Makefile.am Makefile.in attrib.c disk_io.c mft.c mst.c 
	unistr.c volume.c 
Removed Files:
	bitmap.c 
Log Message:
Cleanup library code. Throw away unused stuff.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- Makefile.am	6 Dec 2001 01:14:52 -0000	1.9
+++ Makefile.am	14 Apr 2002 14:08:29 -0000	1.10
@@ -22,11 +22,9 @@
         attrib.c \
         bootsect.c \
-        bitmap.c \
         mft.c \
         volume.c \
         disk_io.c \
-	ntfs_rec.c \
-	unistr.c \
-	ntfsd.c
+	mst.c \
+	unistr.c
 
 INCLUDES = $(linux_ntfsincludedir) $(all_includes)

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- Makefile.in	26 Jan 2002 04:32:35 -0000	1.13
+++ Makefile.in	14 Apr 2002 14:08:29 -0000	1.14
@@ -106,11 +106,9 @@
         attrib.c \
         bootsect.c \
-        bitmap.c \
         mft.c \
         volume.c \
         disk_io.c \
-	ntfs_rec.c \
-	unistr.c \
-	ntfsd.c
+	mst.c \
+	unistr.c
 
 
@@ -125,6 +123,6 @@
 LIBS = @LIBS@
 libntfs_la_LIBADD = 
-libntfs_la_OBJECTS =  attrib.lo bootsect.lo bitmap.lo mft.lo volume.lo \
-disk_io.lo ntfs_rec.lo unistr.lo ntfsd.lo
+libntfs_la_OBJECTS =  attrib.lo bootsect.lo mft.lo volume.lo disk_io.lo \
+mst.lo unistr.lo
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -138,7 +136,6 @@
 TAR = gtar
 GZIP_ENV = --best
-DEP_FILES =  .deps/attrib.P .deps/bitmap.P .deps/bootsect.P \
-.deps/disk_io.P .deps/mft.P .deps/ntfs_rec.P .deps/ntfsd.P \
-.deps/unistr.P .deps/volume.P
+DEP_FILES =  .deps/attrib.P .deps/bootsect.P .deps/disk_io.P .deps/mft.P \
+.deps/mst.P .deps/unistr.P .deps/volume.P
 SOURCES = $(libntfs_la_SOURCES)
 OBJECTS = $(libntfs_la_OBJECTS)

Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- attrib.c	13 Jun 2001 00:40:49 -0000	1.16
+++ attrib.c	14 Apr 2002 14:08:29 -0000	1.17
@@ -4,5 +4,5 @@
  * attrib.c - Attribute handling code. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -35,108 +35,5 @@
 #include "support.h"
 #include "mft.h"
-
-int write_non_resident_attr(attr *a)
-{
-	return -ENOTSUP;
-}
-
-int ntfs_flush_attr(attr *a)
-{
-	int err = 0;
-
-	if (!AttrDirty(a) || !AttrMapped(a))
-		return 0;
-	if (!AttrNonResident(a)) {
-		/* Resident, just flush the mft entry. */
-		if (err = ntfs_flush_mft_entry(a->a_m_entry))
-			return err;
-		ClearAttrDirty(a);
-	} else	/* Non-resident, write out to disk. */
-		err = write_non_resident_attr(a);
-	ntfs_flush();
-	return err;
-}
-
-BOOL __set_attr_dirty(attr *a)
-{
-	ntfs_volume *v;
-	
-	/* If resident just mark mft entry as dirty. */
-	if (!AttrNonResident(a)) {
-		ntfs_set_mft_entry_dirty(a->a_m_entry);
-		return;
-	}
-	/* It is non-resident so add to dirty list. */
-	v = a->a_vol;
-	list_add_tail(&a->a_dirty_list, &v->dirty_attrs);
-	v->nr_dirty_attrs++;
-	return TRUE;
-}
-
-__inline__ attr *__allocate_attr(void)
-{
-	attr *a = (attr *)malloc(sizeof(attr));
-	if (!a)
-		return NULL;
-	memset(a, 0, sizeof(attr));
-	INIT_LIST_HEAD(&a->a_dirty_list);
-	return a;
-}
-
-__inline__ int __free_attr(attr *a)
-{
-	if (a->a_count || AttrDirty(a) || AttrMapped(a))
-		return -EBUSY;
-	if (a->a_run_list)
-		free(a->a_run_list);
-	free(a);
-	return 0;
-}
-
-int __map_attr_value(attr *a)
-{
-	if (!AttrNonResident(a)) {
-	}
-	return -ENOTSUP;
-}
-
-int __unmap_attr_value(attr *a)
-{
-	if (!AttrMapped(a))
-		return 0;
-	return -ENOTSUP;
-}
- 
-int insert_attr(mft_entry *me, attr **a, ATTR_RECORD *arec, attr_val *aval,
-		const BOOL dirty, const BOOL nonresident, run_list *arl,
-		const BOOL inattrlist, ATTR_LIST_ENTRY *alist,
-		ATTR_LIST_ENTRY *alistentry, const BOOL inextrecord)
-{
-	attr *aent;
-	
-	if (!*a && !(*a = __allocate_attr()))
-		return -errno;
-	aent = *a;
-	aent->a_rec = arec;
-	if (aval) {
-		if (nonresident) {
-			aent->a_run_list = arl;
-			SetAttrNonResident(aent);
-		}
-		aent->a_val = aval;
-		
-	} else {
-		if (__map_attr_value(aent)) {
-			// error
-		}
-	}
-	
-	return -ENOTSUP;
-}
-
-int remove_attr(attr *a)
-{
-	return -ENOTSUP;
-}
+#include "debug.h"
 
 /**
@@ -194,5 +91,5 @@
 #ifdef DEBUG
 	if (!ctx || !ctx->mrec || !ctx->attr) {
-		fprintf(stderr, "find_attr() received NULL pointer!\n");
+		Dputs("find_attr() received NULL pointer!");
 		return FALSE;
 	}
@@ -285,7 +182,5 @@
 		}
 	}
-#ifdef DEBUG
-	fprintf(stderr, "find_attr(): File is corrupt. Run chkdsk.\n");
-#endif
+	Dputs("find_attr(): File is corrupt. Run chkdsk.");
 	return FALSE;
 }
@@ -316,11 +211,11 @@
 #ifdef DEBUG
 	if (!ctx || !ctx->mrec) {
-		fprintf(stderr, "find_first_attr() received NULL pointer!\n");
+		Dputs("find_first_attr() received NULL pointer!");
 		return FALSE;
 	}
 	if (ctx->attr)
-		fprintf(stderr, "find_first_attr(): received non-NULL "
-				"attribute pointer.\nThis will be overwritten "
-				"resulting in possible memory leakage.\n");
+		Dprintf("find_first_attr(): received non-NULL attribute "
+				"pointer.\nThis will be overwritten resulting "
+				"in possible memory leakage.\n");
 #endif
 	m = ctx->mrec;
@@ -331,7 +226,5 @@
 		return find_attr(type, name, name_len, ic, upcase, upcase_len,
 				val, val_len, ctx);
-#ifdef DEBUG
-	fprintf(stderr, "find_first_attr(): file is corrupt.");
-#endif
+	Dputs("find_first_attr(): file is corrupt.");
 	return FALSE;
 }
@@ -848,4 +741,87 @@
 	errno = ENOENT;
 	return 0;
+}
+
+/**
+ * init_attr_search_ctx - initialize an attribute search context
+ * @ctx:	attribute search context to initialize
+ * @ni:		ntfs inode with which to initialize the search context
+ * @mrec:	mft record with which to initialize the search context
+ *
+ * Initialize the attribute search context @ctx with @ni and @mrec.
+ */
+static __inline__ void init_attr_search_ctx(attr_search_context *ctx,
+		ntfs_inode *ni, MFT_RECORD *mrec)
+{
+	ctx->mrec = mrec;
+	/* Sanity checks are performed elsewhere. */
+	ctx->attr = (ATTR_RECORD*)((char*)mrec +
+			le16_to_cpu(mrec->attrs_offset));
+	ctx->is_first = TRUE;
+	ctx->ntfs_ino = ni;
+	ctx->al_entry = NULL;
+	ctx->base_ntfs_ino = NULL;
+	ctx->base_mrec = NULL;
+	ctx->base_attr = NULL;
+}
+
+/**
+ * reinit_attr_search_ctx - reinitialize an attribute search context
+ * @ctx:	attribute search context to reinitialize
+ *
+ * Reinitialize the attribute search context @ctx, unmapping an associated
+ * extent mft record if present, and initialize the search context again.
+ *
+ * This is used when a search for a new attribute is being started to reset
+ * the search context to the beginning.
+ */
+void reinit_attr_search_ctx(attr_search_context *ctx)
+{
+	if (!ctx->base_ntfs_ino) {
+		/* No attribute list. */
+		ctx->is_first = TRUE;
+		/* Sanity checks are performed elsewhere. */
+		ctx->attr = (ATTR_RECORD*)((char*)ctx->mrec +
+				le16_to_cpu(ctx->mrec->attrs_offset));
+		return;
+	} /* Attribute list. */
+	if (ctx->ntfs_ino != ctx->base_ntfs_ino)
+		fprintf(stderr, __FUNCTION__ "(): EEEEEK!\n");
+	//	unmap_mft_record(READ, ctx->ntfs_ino);
+	init_attr_search_ctx(ctx, ctx->base_ntfs_ino, ctx->base_mrec);
+	return;
+}
+
+/**
+ * get_attr_search_ctx - allocate and initialize a new attribute search context
+ * @ctx:	address of pointer in which to return the new search context
+ * @ni:		ntfs inode with which to initialize the search context
+ * @mrec:	mft record with which to initialize the search context
+ *
+ * Allocate a new attribute search context, initialize it with @ni and @mrec,
+ * and return it. Return NULL on error with errno set to ENOMEM.
+ */
+attr_search_context *get_attr_search_ctx(ntfs_inode *ni, MFT_RECORD *mrec)
+{
+	attr_search_context *ctx = malloc(sizeof(attr_search_context));
+	if (ctx)
+		init_attr_search_ctx(ctx, ni, mrec);
+	return ctx;
+}
+
+/**
+ * put_attr_search_ctx - release an attribute search context
+ * @ctx:	attribute search context to free
+ *
+ * Release the attribute search context @ctx, unmapping an associated extent
+ * mft record if present.
+ */
+void put_attr_search_ctx(attr_search_context *ctx)
+{
+	if (ctx->base_ntfs_ino && ctx->ntfs_ino != ctx->base_ntfs_ino)
+		fprintf(stderr, __FUNCTION__ "(): EEEEEK!\n");
+		//unmap_mft_record(READ, ctx->ntfs_ino);
+	free(ctx);
+	return;
 }
 

Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- disk_io.c	1 Jun 2001 02:07:26 -0000	1.14
+++ disk_io.c	14 Apr 2002 14:08:30 -0000	1.15
@@ -4,5 +4,5 @@
  * disk_io.c - Disk io functions. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- mft.c	14 Apr 2002 13:34:49 -0000	1.12
+++ mft.c	14 Apr 2002 14:08:30 -0000	1.13
@@ -4,5 +4,5 @@
  * mft.c - Mft record handling code. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or

Index: mst.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mst.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- mst.c	14 Apr 2002 13:28:19 -0000	1.1
+++ mst.c	14 Apr 2002 14:08:30 -0000	1.2
@@ -2,7 +2,7 @@
  * $Id$
  *
- * ntfs_rec.c - NTFS record handling code. Part of the Linux-NTFS project.
+ * mst.c - Multi sector fixup handling code. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or

Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/unistr.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- unistr.c	9 Jun 2001 16:31:13 -0000	1.7
+++ unistr.c	14 Apr 2002 14:08:30 -0000	1.8
@@ -4,5 +4,5 @@
  * unistr.c - Unicode string handling. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -26,4 +26,5 @@
 #include "types.h"
 #include "unistr.h"
+#include "debug.h"
 
 /*
@@ -108,5 +109,5 @@
 #ifdef DEBUG
 	if (!name1 || !name2 || ic && !upcase && upcase_len) {
-		fprintf(stderr, "ntfs_collate_names received NULL pointer!\n");
+		Dputs("ntfs_collate_names received NULL pointer!");
 		exit(1);
 	}
@@ -161,5 +162,5 @@
 #ifdef DEBUG
 	if (!s1 || !s2) {
-		fprintf(stderr, "ntfs_wcsncmp() received NULL pointer!\n");
+		Dputs("ntfs_wcsncmp() received NULL pointer!");
 		exit(1);
 	}
@@ -204,5 +205,5 @@
 #ifdef DEBUG
 	if (!s1 || !s2 || !upcase) {
-		fprintf(stderr, "ntfs_wcsncasecmp() received NULL pointer!\n");
+		Dputs("ntfs_wcsncasecmp() received NULL pointer!");
 		exit(1);
 	}

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- volume.c	12 Apr 2002 15:23:47 -0000	1.20
+++ volume.c	14 Apr 2002 14:08:30 -0000	1.21
@@ -4,5 +4,5 @@
  * volume.c - NTFS volume handling code. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -30,5 +30,4 @@
 
 #include "types.h"
-#include "list.h"
 #include "volume.h"
 #include "support.h"
@@ -40,49 +39,13 @@
 #include "debug.h"
 
-/**
- * ntfs_sync_volume - sync a mounted ntfs volume to physical storage
- * @vol:	ntfs volume to sync
- *
- * Sync a mounted ntfs volumes to physical storage.
- *
- * Return zero on success and -1 if one or more mft records and/or
- * non-resident attributes were	busy, and could not be committed to disk.
- */
-int ntfs_sync_volume(ntfs_volume *vol)
-{
-	struct list_head *tmp;
-	int s = 0;
-
-	list_for_each(tmp, &vol->dirty_attrs) {
-		if (!ntfs_flush_attr(list_entry(tmp, attr, a_dirty_list)) || s)
-			continue;
-		s = -1;
-	}
-	list_for_each(tmp, &vol->dirty_mft_entries) {
-		if (!ntfs_flush_mft_entry(list_entry(tmp, mft_entry,
-							m_dirty_list)) || s)
-			continue;
-		s = -1;
-	}
-	return s;
-}
-
-static __inline__ ntfs_volume *__allocate_ntfs_volume()
+static ntfs_volume *__allocate_ntfs_volume(void)
 {
-	ntfs_volume *v = (ntfs_volume *)malloc(sizeof(ntfs_volume));
-	if (!v)
-		return NULL;
-	memset(v, 0, sizeof(ntfs_volume));
-	INIT_LIST_HEAD(&v->open_files);
-	INIT_LIST_HEAD(&v->mft_entries);
-	INIT_LIST_HEAD(&v->dirty_mft_entries);
-	INIT_LIST_HEAD(&v->dirty_attrs);
-	return v;
+	return (ntfs_volume*)calloc(1, sizeof(ntfs_volume));
 }
 
-static __inline__ int __free_ntfs_volume(ntfs_volume *v)
+static void __release_ntfs_volume(ntfs_volume *v)
 {
-	if (v->nr_open_files || v->nr_mft_entries || v->nr_dirty_attrs)
-		return -1;
+	if (v->fd)
+		close(v->fd);
 	if (v->dev_name)
 		free(v->dev_name);
@@ -98,35 +61,34 @@
 		free(v->upcase);
 	free(v);
-	return 0;
 }
 
 /**
- * __init_ntfs_volume - initialize an ntfs_volume
- * @v:		ntfs_volume to initialize
+ * ntfs_mount - open ntfs volume
+ * @name:	name of device/file to open
+ * @rwflag:	optional mount flags
+ *
+ * This function mounts an ntfs volume. @name should contain the name of the
+ * device/file to mount as the ntfs volume.
+ *
+ * @rwflags is an optional second parameter. The same flags are used as for
+ * the mount system call (man 2 mount). Currently only the following flag
+ * is implemented:
+ *	MS_RDONLY	- mount volume read-only
+ * 
+ * The function opens the device or file @name and verifies that it contains a
+ * valid bootsector. Then, it allocates an ntfs_volume structure and initializes
+ * some of the values inside the structure from the information stored in the
+ * bootsector. It proceeds to load the necessary system files and completes
+ * setting up the structure. 
  *
- * Before we can use any of the libntfs higher level functions to open files,
- * load mft records and such like, we need to load the system files but these
- * are files. Catch 22!
- *
- * So we have to cheat, i.e. we setup a minumum set of fields in @v to more or
- * less faked values, just to allow us to use the library functions to open the
- * system files. Perhaps not the most beautiful solution but IMO the most
- * elegant one. Otherwise we would have to keep around special functions to work
- * without all the information required or we would need to do everything
- * manually (as it used to be in the early days of Linux-NTFS).
- *
- * Using a fake-it approach means we still use the same code for everything,
- * even for meta data, which is way cool. It does mean we have some uglyness in
- * the mount code path but hey, it's just the mount... All the real fun comes
- * after mounting anyway.
+ * ntfs_mount() returns a pointer to the allocated ntfs_volume structure.
+ * On error, the return value is NULL and errno is set appropriately.
  *
- * Once we have opened the system files we do the proper initialisation of @v,
- * disposing off the faked info as we go along.
+ * Note, that a copy is made of @name, and hence it can be discarded as
+ * soon as the function returns.
+ *
+ * FIXME: Should document all error codes that can be returned and what each
+ * means.
  */
-int __init_ntfs_volume(ntfs_volume *v)
-{
-	return 0;
-}
-
 ntfs_volume *ntfs_mount(const char *name, unsigned long rwflag)
 {
@@ -136,4 +98,5 @@
 	NTFS_BOOT_SECTOR *bs = NULL;
 	MFT_RECORD *mb = NULL;
+	attr_search_context *ctx = NULL;
 	ATTR_RECORD *a;
 	VOLUME_INFORMATION *vinf;
@@ -145,7 +108,11 @@
 	__u8 sectors_per_cluster, bits;
 	__s8 c;
-	attr_search_context ctx;
 	MFT_REF mref;
-	int err, ro = rwflag & MS_RDONLY;
+	int err, eo, ro = rwflag & MS_RDONLY;
+#ifdef DEBUG
+	BOOL debug = 1;
+#else
+	BOOL debug = 0;
+#endif
 
 	if (!name) {
@@ -155,28 +122,16 @@
 	/* Allocate the volume structure. */
 	vol = __allocate_ntfs_volume();
-	if (!vol) {
-		perror("Error allocating memory for ntfs volume structure");
-		errno = ENOMEM;
+	if (!vol)
 		goto error_exit;
-	}
 	/* Make a copy of the partition name. */
-	if (!(vol->dev_name = strdup(name))) {
-		perror("Error allocating memory for partition name");
-		errno = ENOMEM;
+	if (!(vol->dev_name = strdup(name)))
 		goto error_exit;
-	}
 	/* Allocate the boot sector structure. */
-	if (!(bs = (NTFS_BOOT_SECTOR *)malloc(sizeof(NTFS_BOOT_SECTOR)))) {
-		Vputs(FAILED);
-		perror("Error allocating memory for bootsector");
-		errno = ENOMEM;
+	if (!(bs = (NTFS_BOOT_SECTOR *)malloc(sizeof(NTFS_BOOT_SECTOR))))
 		goto error_exit;
-	}
-	Vprintf("Reading bootsector... ");
+	Dprintf("Reading bootsector... ");
 	if ((vol->fd = open(name, ro ? O_RDONLY: O_RDWR)) == -1) {
-		int eo = errno;
-		Vputs(FAILED);
-		perror("Error opening partition file");
-		errno = eo;
+		Dputs(FAILED);
+		Dperror("Error opening partition file");
 		goto error_exit;
 	}
@@ -184,42 +139,30 @@
 	br = ntfs_pread(vol->fd, bs, sizeof(NTFS_BOOT_SECTOR), 1, 0);
 	if (br != 1) {
-		int eo = errno;
-		Vputs(FAILED);
-#define ESTR "Error reading bootsector"
-		if (br == -1) {
-			perror(ESTR);
-			errno = eo;
-		} else if (!br) {
-			fprintf(stderr, "Error: partition is smaller than " \
-					"bootsector size. Weird!\n");
-			errno = EINVAL;
-		} else {
-			fprintf(stderr, ESTR ": unknown error\n");
+		Dputs(FAILED);
+		if (br != -1)
 			errno = EINVAL;
-		}
-#undef ESTR
+		if (!br)
+			Dputs("Error: partition is smaller than bootsector "
+					"size. Weird!");
+		else
+			Dperror("Error reading bootsector");
 		goto error_exit;
 	}
-	Vputs(OK);
-#ifdef DEBUG
-	if (!is_boot_sector_ntfs(bs, 0)) {
-#else
-	if (!is_boot_sector_ntfs(bs, 1)) {
-#endif
-		fprintf(stderr, "Error: %s is not a valid NTFS partition!\n",
-				name);
+	Dputs(OK);
+	if (!is_boot_sector_ntfs(bs, !debug)) {
+		Dprintf("Error: %s is not a valid NTFS partition!\n", name);
 		errno = EINVAL;
 		goto error_exit;
 	}
-	/* The bounds checks on mft_lcn and mft_mirr_lcn (i.e. them being
+	/*
+	 * The bounds checks on mft_lcn and mft_mirr_lcn (i.e. them being
 	 * below or equal the number_of_clusters) really belong in the
-	 * is_boot_sector_ntfs but in this way we can just do this once. */
+	 * is_boot_sector_ntfs but in this way we can just do this once.
+	 */
 	sectors_per_cluster = bs->bpb.sectors_per_cluster;
-#ifdef DEBUG
-	printf("NumberOfSectors = %Li\n", sle64_to_cpu(bs->number_of_sectors));
-	printf("SectorsPerCluster = 0x%x\n", sectors_per_cluster);
-#endif
+	Dprintf("NumberOfSectors = %Li\n", sle64_to_cpu(bs->number_of_sectors));
+	Dprintf("SectorsPerCluster = 0x%x\n", sectors_per_cluster);
 	if (sectors_per_cluster & sectors_per_cluster - 1) {
-		fprintf(stderr, "Error: %s is not a valid NTFS partition! "
+		Dprintf("Error: %s is not a valid NTFS partition! "
 				"sectors_per_cluster is not a power of 2.\n",
 				name);
@@ -228,17 +171,15 @@
 	}
 	vol->number_of_clusters = sle64_to_cpu(bs->number_of_sectors) >>
-						ffs(sectors_per_cluster) - 1;
+			ffs(sectors_per_cluster) - 1;
 
 	vol->mft_lcn = sle64_to_cpu(bs->mft_lcn);
 	vol->mftmirr_lcn = sle64_to_cpu(bs->mftmirr_lcn);
-#ifdef DEBUG
-	printf("MFT LCN = %Li\n", vol->mft_lcn);
-	printf("MFTMirr LCN = 0x%Li\n", vol->mftmirr_lcn);
-#endif
-	if ((vol->mft_lcn > vol->number_of_clusters) ||
-	    (vol->mftmirr_lcn > vol->number_of_clusters)) {
-		fprintf(stderr, "Error: %s is not a valid NTFS partition! "
-				"($Mft LCN or\n$MftMirr LCN is greater than "
-				"the number of clusters!\n", name);
+	Dprintf("MFT LCN = %Li\n", vol->mft_lcn);
+	Dprintf("MFTMirr LCN = 0x%Li\n", vol->mftmirr_lcn);
+	if (vol->mft_lcn > vol->number_of_clusters ||
+			vol->mftmirr_lcn > vol->number_of_clusters) {
+		Dprintf("Error: %s is not a valid NTFS partition! ($Mft LCN "
+				"or\n$MftMirr LCN is greater than the number "
+				"of clusters!\n", name);
 		errno = EINVAL;
 		goto error_exit;
@@ -247,5 +188,5 @@
 					le16_to_cpu(bs->bpb.bytes_per_sector);
 	if (vol->cluster_size & vol->cluster_size - 1) {
-		fprintf(stderr, "Error: %s is not a valid NTFS partition! "
+		Dprintf("Error: %s is not a valid NTFS partition! "
 				"cluster_size is not a power of 2.\n", name);
 		errno = EINVAL;
@@ -259,9 +200,7 @@
 	 */
 	c = bs->clusters_per_mft_record;
-#ifdef DEBUG
-	printf("ClusterSize = 0x%x\n", vol->cluster_size);
-	printf("ClusterSizeBits = %u\n", vol->cluster_size_bits);
-	printf("ClustersPerMftRecord = 0x%x\n", c);
-#endif
+	Dprintf("ClusterSize = 0x%x\n", vol->cluster_size);
+	Dprintf("ClusterSizeBits = %u\n", vol->cluster_size_bits);
+	Dprintf("ClustersPerMftRecord = 0x%x\n", c);
 	/*
 	 * When clusters_per_mft_record is negative, it means that it is to
@@ -275,5 +214,5 @@
 		vol->mft_record_size = vol->cluster_size * c;
 	if (vol->mft_record_size & vol->mft_record_size - 1) {
-		fprintf(stderr, "Error: %s is not a valid NTFS partition! "
+		Dprintf("Error: %s is not a valid NTFS partition! "
 				"mft_record_size is not a power of 2.\n", name);
 		errno = EINVAL;
@@ -281,75 +220,66 @@
 	}
 	vol->mft_record_size_bits = ffs(vol->mft_record_size) - 1;
-	vol->max_open_files = 10000;
-#ifdef DEBUG
-	printf("MftRecordSize = 0x%x\n", vol->mft_record_size);
-	printf("MftRecordSizeBits = %u\n", vol->mft_record_size_bits);
-	printf("max_open_files set to %u\n", vol->max_open_files);
-#endif
+	Dprintf("MftRecordSize = 0x%x\n", vol->mft_record_size);
+	Dprintf("MftRecordSizeBits = %u\n", vol->mft_record_size_bits);
 	/* Start with $Mft. */
-	Vprintf("Loading $Mft... ");
-	if (!(mb = (MFT_RECORD *)malloc(vol->mft_record_size))) {
-		Vputs(FAILED);
-		perror("Error allocating memory for $Mft");
-		errno = ENOMEM;
+	Dprintf("Loading $Mft... ");
+	if (!(mb = (MFT_RECORD*)malloc(vol->mft_record_size))) {
+		Dputs(FAILED);
+		Dperror("Error allocating memory for $Mft");
 		goto error_exit;
 	}
 	/* Can't use any of the higher level functions yet! */
-	br = mst_pread(vol->fd, (char *)mb, vol->mft_record_size, 1, 
+	br = mst_pread(vol->fd, (char*)mb, vol->mft_record_size, 1, 
 					vol->mft_lcn << vol->cluster_size_bits);
 	if (br != 1) {
-		Vputs(FAILED);
-#define ESTR "Error reading $Mft"
+		Dputs(FAILED);
 		if (br == -1)
-			perror(ESTR);
+			Dperror("Error reading $Mft");
 		else if (br < 4)
-			fprintf(stderr, "Error: $Mft LCN is outside of "
-					"the partition?!?\n");
+			Dputs("Error: $Mft is outside of the partition?!?");
 		else
-	                fprintf(stderr, ESTR ": unknown error\n");
-#undef ESTR
+			Dputs("Error reading $Mft.");
 		errno = EIO;
 		goto error_exit;
 	}
-	if (is_baad_record(mb)) {
-		Vputs(FAILED);
-		fprintf(stderr, "Error: Incomplete multi sector "
-		                "transfer detected in $Mft.\nCannot "
-		                "handle this yet. )-:\n");
+	if (is_baad_recordp(mb)) {
+		Dputs(FAILED);
+		Dputs("Error: Incomplete multi sector transfer detected in "
+				"$Mft.");
 		errno = EIO;
 		goto error_exit;
 	}
 	if (!is_mft_recordp(mb)) {
-		Vputs(FAILED);
-		fprintf(stderr, "Error: Invalid mft record for $Mft.\n"
-				"Cannot handle this yet. )-:\n");
+		Dputs(FAILED);
+		Dputs("Error: Invalid mft record for $Mft.");
 		errno = EIO;
 		goto error_exit;
 	}
 	/* Find the bitmap attribute. */
-	memset(&ctx, 0, sizeof(attr_search_context));
-	ctx.mrec = mb;
-	ctx.attr = (ATTR_RECORD*)((char*)mb + le16_to_cpu(mb->attrs_offset));
-	if (p2n(ctx.attr) < p2n(mb) ||
-	    (char*)ctx.attr > (char*)mb + vol->mft_record_size) {
-		Vputs(FAILED);
-		fprintf(stderr, "Error: corrupt mft record for $Mft.\n"
-				"Cannot handle this yet. )-:\n");
+	ctx = get_attr_search_ctx(NULL, mb);
+	if (!ctx) {
+		Dputs(FAILED);
+		Dperror("Failed to allocate attribute search context");
+		goto error_exit;
+	}
+	if (p2n(ctx->attr) < p2n(mb) ||
+			(char*)ctx->attr > (char*)mb + vol->mft_record_size) {
+		Dputs(FAILED);
+		Dputs("Error: corrupt mft record for $Mft.");
 		errno = EIO;
 		goto error_exit;
 	}
-	ctx.is_first = TRUE;
-	if (!find_attr($BITMAP, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
-		Vputs(FAILED);
-		fprintf(stderr, "$bitmap attribute not found in $Mft?!?\n");
+	if (!find_attr($BITMAP, NULL, 0, 0, NULL, 0, NULL, 0, ctx)) {
+		Dputs(FAILED);
+		Dputs("$bitmap attribute not found in $Mft?!?");
 		errno = EIO;
 		goto error_exit;
 	}
-	a = ctx.attr;
+	a = ctx->attr;
 	/* Get attribute value size and allocate a big enough buffer. */
 	l = get_attribute_value_length(a);
 	if (!l) {
-		Vputs(OK);
-		puts("Error: $bitmap in $Mft has zero length! T'is weird!");
+		Dputs(OK);
+		Dputs("Error: $bitmap in $Mft has zero length?!?");
 		errno = EIO;
 		goto error_exit;
@@ -357,18 +287,18 @@
 	vol->mft_bitmap = (__u8*)malloc(l);
 	if (!vol->mft_bitmap) {
-		Vputs(FAILED);
-		puts("Not enough memory to load bitmap attribute from $Mft.");
-		errno = ENOMEM;
+		Dputs(FAILED);
+		Dputs("Not enough memory to load bitmap attribute from $Mft.");
 		goto error_exit;
 	}
 	/* Read in the bitmap attribute value into the buffer. */
 	if (l != get_attribute_value(vol, mb, a, vol->mft_bitmap)) {
-		Vputs(FAILED);
-		puts("Amount of data read does not correspond to expected "
-		     "length!");
+		Dputs(FAILED);
+		Dputs("Amount of data read does not correspond to expected "
+				"length!");
 		errno = EIO;
 		goto error_exit;
 	}
-#ifdef DEBUG
+#if 0
+	// Output the mft bitmap. Can be useful when debugging write code.
 	{ int _i_;
 	printf("$MFT $BITMAP =\n");
@@ -380,21 +310,18 @@
 #endif
 	/* Find the $DATA attribute in $Mft. */
-	memset(&ctx, 0, sizeof(attr_search_context));
-	ctx.mrec = mb;
-	ctx.attr = (ATTR_RECORD*)((char*)mb + le16_to_cpu(mb->attrs_offset));
-	ctx.is_first = TRUE;
-	if (!find_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
-		Vputs(FAILED);
-		fprintf(stderr, "$DATA attribute not found in $Mft?!?\n");
+	reinit_attr_search_ctx(ctx);
+	if (!find_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, ctx)) {
+		Dputs(FAILED);
+		Dputs("$DATA attribute not found in $Mft?!?");
 		errno = EIO;
 		goto error_exit;
 	}
-	a = ctx.attr;
+	a = ctx->attr;
 	/* Determine the number of mft records in $Mft. */
 	vol->number_of_mft_records = a->data_size >> vol->mft_record_size_bits;
 	/* The $DATA attribute of the $Mft has to be non-resident. */
 	if (!a->non_resident) {
-		Vputs(FAILED);
-		fprintf(stderr, "$Mft $DATA attribute is resident!?!\n");
+		Dputs(FAILED);
+		Dputs("$Mft $DATA attribute is resident!?!");
 		errno = EINVAL;
 		goto error_exit;
@@ -403,37 +330,43 @@
 	vol->mft_runlist = decompress_run_list(a);
 	if (!vol->mft_runlist) {
-		Vputs(FAILED);
-		fprintf(stderr, "Error decompressing run list from $Mft $DATA"
-			        " attribute.\n");
+		Dputs(FAILED);
+		Dputs("Error decompressing run list from $Mft $DATA "
+				"attribute.");
 		errno = EINVAL;
 		goto error_exit;
 	}
-	Vputs(OK);
+	Dputs(OK);
 	/* Done with the $Mft mft record. */
+	put_attr_search_ctx(ctx);
+	ctx = NULL;
 	free(mb);
 	mb = NULL;
 	/* Now load the bitmap from $Bitmap. */
-	Vprintf("Loading $Bitmap... ");
+	Dprintf("Loading $Bitmap... ");
 	mref = (MFT_REF)FILE_$Bitmap;
-	if (err = __read_file_record(vol, &mref, &mb, NULL)) {
-		Vputs(FAILED);
+	if ((err = __read_file_record(vol, &mref, &mb, NULL))) {
+		Dputs(FAILED);
 		errno = -err;
 		goto error_exit;
 	}
-	memset(&ctx, 0, sizeof(attr_search_context));
-	ctx.mrec = mb;
+	ctx = get_attr_search_ctx(NULL, mb);
+	if (!ctx) {
+		Dputs(FAILED);
+		Dperror("Failed to allocate attribute search context");
+		goto error_exit;
+	}
 	/* Find the bitmap (it is in the $DATA attribute). */
-	if (!find_first_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
-		Vputs(FAILED);
-		fprintf(stderr, "bitmap attribute not found in $Bitmap?!?\n");
+	if (!find_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, ctx)) {
+		Dputs(FAILED);
+		Dputs("bitmap attribute not found in $Bitmap?!?");
 		errno = EIO;
 		goto error_exit;
 	}
-	a = ctx.attr;
+	a = ctx->attr;
 	/* Get attribute value size and allocate a big enough buffer.*/
 	l = get_attribute_value_length(a);
 	if (!l) {
-		Vputs(OK);
-		puts("Error: bitmap in $Bitmap has zero length! T'is weird!");
+		Dputs(OK);
+		Dputs("Error: bitmap in $Bitmap has zero length?!?");
 		errno = EIO;
 		goto error_exit;
@@ -441,6 +374,6 @@
 	vol->lcn_bitmap = (__u8*)malloc(l);
 	if (!vol->lcn_bitmap) {
-		Vputs(FAILED);
-		puts("Not enough memory to load $Bitmap.");
+		Dputs(FAILED);
+		Dputs("Not enough memory to load $Bitmap.");
 		errno = ENOMEM;
 		goto error_exit;
@@ -448,47 +381,55 @@
 	/* Read in the bitmap attribute value into the buffer. */
 	if (l != get_attribute_value(vol, mb, a, vol->lcn_bitmap)) {
-		Vputs(FAILED);
-		puts("Amount of data read does not correspond to expected "
-		     "length!");
+		Dputs(FAILED);
+		Dputs("Amount of data read does not correspond to expected "
+				"length!");
 		errno = EIO;
 		goto error_exit;
 	}
 	/* Done with the $BitMap mft record. */
-	Vputs(OK);
+	Dputs(OK);
+	put_attr_search_ctx(ctx);
+	ctx = NULL;
 	free(mb);
 	mb = NULL;
 	/* Now load the upcase table from $UpCase. */
-	Vprintf("Loading $UpCase... ");
+	Dprintf("Loading $UpCase... ");
 	mref = (MFT_REF)FILE_$UpCase;
 	if (err = __read_file_record(vol, &mref, &mb, NULL)) {
-		Vputs(FAILED);
+		Dputs(FAILED);
 		errno = -err;
 		goto error_exit;
 	}     
-	memset(&ctx, 0, sizeof(attr_search_context));
-	ctx.mrec = mb;
+	ctx = get_attr_search_ctx(NULL, mb);
+	if (!ctx) {
+		Dputs(FAILED);
+		Dperror("Failed to allocate attribute search context");
+		goto error_exit;
+	}
 	/* Find the bitmap (it is in the $DATA attribute). */
-	if (!find_first_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
-		Vputs(FAILED);
-		fprintf(stderr, "$DATA attribute not found in $UpCase?!?\n");
+	if (!find_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, ctx)) {
+		Dputs(FAILED);
+		Dputs("$DATA attribute not found in $UpCase?!?");
 		errno = EIO;
 		goto error_exit;
 	}
-	a = ctx.attr;
+	a = ctx->attr;
 	/* Get attribute value size and allocate a big enough buffer.*/
 	l = get_attribute_value_length(a);
 	if (!l) {
-		Vputs(FAILED);
-		puts("Error: $DATA in $UpCase has zero length! T'is weird!");
+		Dputs(FAILED);
+		Dputs("Error: $DATA in $UpCase has zero length! T'is weird!");
 		errno = EIO;
 		goto error_exit;
 	}
-	/* Note: Normally, the upcase table has a length equal to 65536
+	/*
+	 * Note: Normally, the upcase table has a length equal to 65536
 	 * 2-byte Unicode characters but allow for different cases, so no
 	 * checks done. Just check we don't overflow 32-bits worth of Unicode
-	 * characters. */
+	 * characters.
+	 */
 	if (l & ~0x1ffffffffULL) {
-		Vputs(FAILED);
-		puts("Error: Upcase table is too big (max 32-bit allowed).");
+		Dputs(FAILED);
+		Dputs("Error: Upcase table is too big (max 32-bit allowed).");
 		errno = EINVAL;
 		goto error_exit;
@@ -497,13 +438,12 @@
 	vol->upcase = (uchar_t*)malloc(l);
 	if (!vol->upcase) {
-		Vputs(FAILED);
-		puts("Not enough memory to load $UpCase.");
-		errno = ENOMEM;
+		Dputs(FAILED);
+		Dputs("Not enough memory to load $UpCase.");
 		goto error_exit;
 	}
 	/* Read in the $DATA attribute value into the buffer. */
 	if (l != get_attribute_value(vol, mb, a, (__u8*)vol->upcase)) {
-		Vputs(FAILED);
-		puts("Amount of data read does not correspond to expected "
+		Dputs(FAILED);
+		Dputs("Amount of data read does not correspond to expected "
 		     "length!");
 		errno = EIO;
@@ -511,32 +451,39 @@
 	}
 	/* Done with the $UpCase mft record. */
-	Vputs(OK);
+	Dputs(OK);
+	put_attr_search_ctx(ctx);
+	ctx = NULL;
 	free(mb);
 	mb = NULL;
 	/* Now load $Volume and set the version information and flags in the
 	 * vol structure accordingly. */
-	Vprintf("Loading $Volume... ");
+	Dprintf("Loading $Volume... ");
 	mref = (MFT_REF)FILE_$Volume;
 	if (err = __read_file_record(vol, &mref, &mb, NULL)) {
-		Vputs(FAILED);
+		Dputs(FAILED);
 		errno = -err;
 		goto error_exit;
 	}
-	memset(&ctx, 0, sizeof(attr_search_context));
-	ctx.mrec = mb;
+	ctx = get_attr_search_ctx(NULL, mb);
+	if (!ctx) {
+		Dputs(FAILED);
+		Dperror("Failed to allocate attribute search context");
+		goto error_exit;
+	}
 	/* Find the $VOLUME_INFORMATION attribute. */
-	if (!find_first_attr($VOLUME_INFORMATION, NULL, 0, 0, NULL, 0, NULL, 0,
-				&ctx)) {
-		Vputs(FAILED);
-		fprintf(stderr, "$VOLUME_INFORMATION attribute not found in "
-				"$Volume?!?\n");
+	if (!find_attr($VOLUME_INFORMATION, NULL, 0, 0, NULL, 0, NULL, 0,
+			ctx)) {
+		Dputs(FAILED);
+		Dputs("$VOLUME_INFORMATION attribute not found in "
+				"$Volume?!?");
 		errno = EIO;
 		goto error_exit;
 	}
-	a = ctx.attr;
+	a = ctx->attr;
 	/* Has to be resident. */
 	if (a->non_resident) {
-		fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION must " \
-				"be resident (and it isn't)!\n");
+		Dputs(FAILED);
+		Dputs("Error: Attribute $VOLUME_INFORMATION must be resident "
+				"(and it isn't)!");
 		errno = EIO;
 		goto error_exit;
@@ -546,10 +493,10 @@
 	/* Sanity checks. */
 	if ((char*)vinf + le32_to_cpu(a->value_length) > 
-				le16_to_cpu(mb->bytes_in_use) + (char*)mb ||
-				le16_to_cpu(a->value_offset) + 
-				le32_to_cpu(a->value_length) >
-						le32_to_cpu(a->length)) {
-		fprintf(stderr, "Error: Attribute $VOLUME_INFORMATION in " \
-				"$Volume is corrupt!\n");
+			le16_to_cpu(mb->bytes_in_use) + (char*)mb ||
+			le16_to_cpu(a->value_offset) + 
+			le32_to_cpu(a->value_length) > le32_to_cpu(a->length)) {
+		Dputs(FAILED);
+		Dputs("Error: Attribute $VOLUME_INFORMATION in $Volume is "
+				"corrupt!");
 		errno = EIO;
 		goto error_exit;
@@ -562,38 +509,38 @@
 	vol->flags = vinf->flags;
 	/* Find the $VOLUME_NAME attribute. */
-	memset(&ctx, 0, sizeof(attr_search_context));
-	ctx.mrec = mb;
-	if (!find_first_attr($VOLUME_NAME, NULL, 0, 0, NULL, 0, NULL, 0,
-			&ctx)) {
-		Vputs(FAILED);
-		fprintf(stderr, "$VOLUME_NAME attribute not found in "
-				"$Volume?!?\n");
+	reinit_attr_search_ctx(ctx);
+	if (!find_attr($VOLUME_NAME, NULL, 0, 0, NULL, 0, NULL, 0, ctx)) {
+		Dputs(FAILED);
+		Dputs("$VOLUME_NAME attribute not found in $Volume?!?");
 		errno = EIO;
 		goto error_exit;
 	}
-	a = ctx.attr;
+	a = ctx->attr;
 	/* Has to be resident. */
 	if (a->non_resident) {
-		fprintf(stderr, "Error: Attribute $VOLUME_NAME must " \
-				"be resident (and it isn't)!\n");
+		Dputs(FAILED);
+		Dputs("Error: Attribute $VOLUME_NAME must be resident!");
 		errno = EIO;
 		goto error_exit;
 	}
 	/* Get a pointer to the value of the attribute. */
-        vol->vol_name = malloc(le32_to_cpu(a->value_length) / 2 + 1);
+	vname = (uchar_t*)(le16_to_cpu(a->value_offset) + (char*)a);
+	u = le32_to_cpu(a->value_length) / 2;
+	/* Convert the Unicode volume name to ASCII. */
+	// FIXME: We need proper locale support and Unicode -> current locale
+	// conversion! (AIA)
+	vol->vol_name = malloc(le32_to_cpu(a->value_length) / 2 + 1);
 	if (!vol->vol_name) {
-		fprintf(stderr, "Error: Unable to allocate memory for volume "
-				"name!\n");
-		errno = ENOMEM;
+		Dputs(FAILED);
+		Dputs("Error: Unable to allocate memory for volume name!");
 		goto error_exit;
 	}
-	vname = (uchar_t*)(le16_to_cpu(a->value_offset) + (char*)a);
-	u = le32_to_cpu(a->value_length) / 2;
-	for (j = 0; j < u; j++) {
+	for (j = 0; j < u; j++)
 		vol->vol_name[j] = le16_to_cpu(vname[j]);
-	}
 	vol->vol_name[u] = '\0';
 
-	Vputs(OK);
+	Dputs(OK);
+	put_attr_search_ctx(ctx);
+	ctx = NULL;
 	free(mb);
 	mb = NULL;
@@ -604,33 +551,43 @@
 
 error_exit:
-	{
-		int eo = errno;
-		
-		if (bs)
-			free(bs);
-		if (mb)
-			free(mb);
-		if (vol) {
-			if (vol->fd)
-				close(vol->fd);
-			if (vol->dev_name)
-				free(vol->dev_name);
-			if (vol->vol_name)
-				free(vol->vol_name);
-			if (vol->lcn_bitmap)
-				free(vol->lcn_bitmap);
-			if (vol->mft_bitmap)
-				free(vol->mft_bitmap);
-			if (vol->mft_runlist)
-				free(vol->mft_runlist);
-			if (vol->upcase)
-				free(vol->upcase);
-			free(vol);
-		}
-		errno = eo;
-	}
+	eo = errno;
+	if (bs)
+		free(bs);
+	if (ctx)
+		put_attr_search_ctx(ctx);
+	if (mb)
+		free(mb);
+	if (vol)
+		__release_ntfs_volume(vol);
+	errno = eo;
 	return NULL;
 }
 
+/**
+ * ntfs_umount - close ntfs volume
+ * @vol: address of ntfs_volume structure of volume to close
+ * @force: if true force close the volume even if it is busy
+ * 
+ * Deallocate all structures (including @vol itself) associated with the ntfs
+ * volume @vol.
+ *
+ * Return true on success. On error return false with errno set appropriately
+ * (most likely to one of EAGAIN, EBUSY or EINVAL). The EAGAIN error means that
+ * an operation is in progress and if you try the close later the operation
+ * might be completed and the close succeed.
+ *  
+ * If @force is true (i.e. not zero) this function will close the volume even
+ * if this means that data might be lost. In this case the function always
+ * returns true.
+ *
+ * @vol must have previously been returned by a call to ntfs_mount().
+ *
+ * @vol itself is deallocated and should no longer be dereferenced after this
+ * function returns success. If it returns an error then nothing has been done
+ * so it is safe to continue using @vol.
+ *
+ * FIXME: Should document all error codes that can be returned and what each
+ * means.
+ */
 BOOL ntfs_umount(ntfs_volume *vol, const int force)
 {
@@ -639,20 +596,5 @@
 		return FALSE;
 	}
-	/* FIXME: Do the cleanup. */
-	if (vol->fd)
-		close(vol->fd);
-	if (vol->dev_name)
-		free(vol->dev_name);
-	if (vol->vol_name)
-		free(vol->vol_name);
-	if (vol->lcn_bitmap)
-		free(vol->lcn_bitmap);
-	if (vol->mft_bitmap)
-		free(vol->mft_bitmap);
-	if (vol->mft_runlist)
-		free(vol->mft_runlist);
-	if (vol->upcase)
-		free(vol->upcase);
-	free(vol);
+	__release_ntfs_volume(vol);
 	return TRUE;
 }

--- bitmap.c DELETED ---

[Linux-NTFS-cvs] CVS: linux-ntfs/include inode.h,NONE,1.1 Makefile.in,1.13,1.14

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv17568

Modified Files:
	Makefile.in 
Added Files:
	inode.h 
Log Message:
Tidyup last cleanups


--- NEW FILE ---
/*
 * inode.h - Defines for NTFS inode structures. Part of the Linux-NTFS project.
 *
 * Copyright (c) 2001,2002 Anton Altaparmakov.
 * Copyright (c) 2002 Richard Russon.
 *
 * This program/include file is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
 * by the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program/include file is distributed in the hope that it will be 
 * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program (in the main directory of the Linux-NTFS 
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef _LINUX_NTFS_INODE_H
#define _LINUX_NTFS_INODE_H

#include "volume.h"

// FIXME: This is probably all going straight to /dev/null but just need it atm
// for the compilation of attrib.[hc] to work.

typedef int atomic_t;

typedef struct _ntfs_inode ntfs_inode;

/*
 * The NTFS in-memory inode structure. It is just used as an extension to the
 * fields already provided in the VFS inode.
 */
struct _ntfs_inode {
	__s64 initialized_size;	/* Copy from $DATA/$INDEX_ALLOCATION. */
	__s64 allocated_size;	/* Copy from $DATA/$INDEX_ALLOCATION. */
	unsigned long state;	/* NTFS specific flags describing this inode.
				   See fs/ntfs/ntfs.h:ntfs_inode_state_bits. */
	__u64 mft_no;		/* Mft record number (inode number). */
	__u16 seq_no;		/* Sequence number of the mft record. */
	atomic_t count;		/* Inode reference count for book keeping. */
	ntfs_volume *vol;	/* Pointer to the ntfs volume of this inode. */
	run_list run_list;	/* If state has the NI_NonResident bit set,
				   the run list of the unnamed data attribute
				   (if a file) or of the index allocation
				   attribute (directory). If run_list.rl is
				   NULL, the run list has not been read in or
				   has been unmapped. If NI_NonResident is
				   clear, the unnamed data attribute is
				   resident (file) or there is no $I30 index
				   allocation attribute (directory). In that
				   case run_list.rl is always NULL.*/
	atomic_t mft_count;	/* Mapping reference count for book keeping. */
	/*struct page *page;	* The page containing the mft record of the
				   inode. This should only be touched by the
				   (un)map_mft_record*() functions. */
	int page_ofs;		/* Offset into the page at which the mft record
				   begins. This should only be touched by the
				   (un)map_mft_record*() functions. */
	/*
	 * Attribute list support (only for use by the attribute lookup
	 * functions). Setup during read_inode for all inodes with attribute
	 * lists. Only valid if NI_AttrList is set in state, and attr_list_rl is
	 * further only valid if NI_AttrListNonResident is set.
	 */
	__u32 attr_list_size;	/* Length of attribute list value in bytes. */
	__u8 *attr_list;	/* Attribute list value itself. */
	run_list attr_list_rl;	/* Run list for the attribute list value. */
	union {
		struct { /* It is a directory or $MFT. */
			__u32 index_block_size;	/* Size of an index block. */
			__u8 index_block_size_bits; /* Log2 of the above. */
			__u32 index_vcn_size;	/* Size of a vcn in this
						   directory index. */
			__u8 index_vcn_size_bits;	/* Log2 of the above. */
			__s64 bmp_size;		/* Size of the $I30 bitmap. */
			__s64 bmp_initialized_size; /* Copy from $I30 bitmap. */
			__s64 bmp_allocated_size; /* Copy from $I30 bitmap. */
			run_list bmp_rl;	/* Run list for the $I30 bitmap
						   if it is non-resident. */
		};
		struct { /* It is a compressed file. */
			__u32 compression_block_size;  /* Size of a compression
							  block (cb). */
			__u8 compression_block_size_bits; /* Log2 of the size
							     of a cb. */
			__u8 compression_block_clusters;  /* Number of clusters
							     per compression
							     block. */
			__s64 compressed_size;		  /* Copy from $DATA. */
		};
	};
	__s32 nr_extents;/* For a base mft record, the number of attached extent
			   inodes (0 if none), for extent records this is -1. */
	union {		/* This union is only used if nr_extents != 0. */
		ntfs_inode **extent_ntfs_inos;	/* For nr_extents > 0, array of
						   the ntfs inodes of the extent
						   mft records belonging to
						   this base inode which have
						   been loaded. */
		ntfs_inode *base_ntfs_ino;	/* For nr_extents == -1, the
						   vfs inode of the base mft
						   record. */
	};
};

#endif /* _LINUX_NTFS_FS_INODE_H */


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- Makefile.in	14 Apr 2002 13:56:45 -0000	1.13
+++ Makefile.in	14 Apr 2002 13:58:54 -0000	1.14
@@ -101,9 +101,8 @@
 	logfile.h \
 	mft.h \
-	ntfs_rec.h \
+	mst.h \
 	volume.h \
 	unistr.h \
 	support.h \
-	ntfsd.h \
 	layout.h \
 	types.h \

[Linux-NTFS-cvs] CVS: linux-ntfs/include Makefile.am,1.8,1.9 Makefile.in,1.12,1.13 attrib.h,1.26,1.27 bitmap.h,1.7,1.8 bootsect.h,1.7,1.8 debug.h,1.1,1.2 disk_io.h,1.9,1.10 layout.h,1.16,1.17 list.h,1.3,1.4 mft.h,1.25,1.26 mst.h,1.1,1.2 support.h,1.4,1.5 types.h,1.6,1.7 unistr.h,1.7,1.8 volume.h,1.15,1.16 mft_old.h,1.2,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv17030

Modified Files:
	Makefile.am Makefile.in attrib.h bitmap.h bootsect.h debug.h 
	disk_io.h layout.h list.h mft.h mst.h support.h types.h 
	unistr.h volume.h 
Removed Files:
	mft_old.h 
Log Message:
cleanup header files.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- Makefile.am	12 Apr 2002 15:23:47 -0000	1.8
+++ Makefile.am	14 Apr 2002 13:56:44 -0000	1.9
@@ -16,13 +16,13 @@
 	logfile.h \
 	mft.h \
-	ntfs_rec.h \
+	mst.h \
 	volume.h \
 	unistr.h \
 	support.h \
-	ntfsd.h \
 	layout.h \
 	types.h \
 	list.h \
-	debug.h
+	debug.h \
+	inode.h
 
 # Don't need these distributed.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- Makefile.in	12 Apr 2002 15:23:47 -0000	1.12
+++ Makefile.in	14 Apr 2002 13:56:45 -0000	1.13
@@ -109,5 +109,6 @@
 	types.h \
 	list.h \
-	debug.h
+	debug.h \
+	inode.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- attrib.h	15 Dec 2001 05:13:08 -0000	1.26
+++ attrib.h	14 Apr 2002 13:56:45 -0000	1.27
@@ -4,5 +4,5 @@
  * attrib.h - Exports for attribute handling. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -28,80 +28,47 @@
 #include "support.h"
 #include "unistr.h"
+#include "inode.h"
 
-/* Attr flag bit values */
-#define AT_mapped		0
-#define AT_dirty		1
-#define AT_error		2
-#define AT_nonresident		3
-#define AT_in_attr_list		4
-#define AT_in_ext_record	5
-				/* bits 6-31 reserved for future use */
-
-#define AttrMapped(a)		test_bit(AT_mapped, (a)->a_flags)
-#define SetAttrMapped(a)	((a)->a_flags |= 1 << AT_mapped)
-#define ClearAttrMapped(a)	clear_bit(AT_mapped, (a)->a_flags)
-
-#define AttrDirty(a)		test_bit(AT_dirty, (a)->a_flags)
-#define SetAttrDirty(a)		set_bit(AT_dirty, (a)->a_flags)
-#define ClearAttrDirty(a)	clear_bit(AT_dirty, (a)->a_flags)
-
-#define AttrError(a)		test_bit(AT_error, (a)->a_flags)
-#define SetAttrError(a)		set_bit(AT_error, (a)->a_flags)
-#define ClearAttrError(a)	clear_bit(AT_error, (a)->a_flags)
-
-#define AttrNonResident(a)	test_bit(AT_nonresident, (a)->a_flags)
-#define SetAttrNonResident(a)	set_bit(AT_nonresident, (a)->a_flags)
-#define ClearAttrNonResident(a)	clear_bit(AT_nonresident, (a)->a_flags)
-
-#define AttrInAttrList(a)	test_bit(AT_in_attr_list, (a)->a_flags)
-#define SetAttrInAttrList(a)	set_bit(AT_in_attr_list, (a)->a_flags)
-#define ClearAttrInAttrList(a)	clear_bit(AT_in_attr_list, (a)->a_flags)
-
-#define AttrInExtRecord(a)	test_bit(AT_in_ext_record, (a)->a_flags)
-#define SetAttrInExtRecord(a)	set_bit(AT_in_ext_record, (a)->a_flags)
-#define ClearAttrInExtRecord(a)	clear_bit(AT_in_ext_record, (a)->a_flags)
-
-int write_non_resident_attr(attr *a);
-
-int flush_attr(attr *a);
-
-BOOL __set_attr_dirty(attr *a);
-
-static __inline__ BOOL set_attr_dirty(attr *a)
-{
-	if (test_and_set_bit(AT_dirty, a->a_flags) || __set_attr_dirty(a))
-		return TRUE;
-	return flush_attr(a) == 0;
-}
-
-extern __inline__ attr *__allocate_attr(void);
-
-extern __inline__ int __free_attr(attr *a);
-
-int __map_attr_value(attr *me);
-
-static __inline__ int map_attr_value(attr *a)
-{
-	a->a_count++;
-	if (AttrMapped(a))
-		return 0;
-	return __map_attr_val(a);
-}
-
-static __inline__ void unmap_attr_value(attr *a)
-{
-	if (AttrMapped(a) && a->a_count > 0)
-		a->a_count--;
-}
-
-int __unmap_attr_value(attr *a);
+typedef enum {
+	LCN_HOLE		= -1,	/* Keep this as highest value or die! */
+	LCN_RL_NOT_MAPPED	= -2,
+	LCN_ENOENT		= -3,
+	LCN_EINVAL		= -4,
+} LCN_SPECIAL_VALUES;
 
 /**
+ * attr_search_context - used in attribute search functions
+ * @mrec:	buffer containing mft record to search
+ * @attr:	attribute record in @mrec where to begin/continue search
+ * @is_first:	if true lookup_attr() begins search with @attr, else after @attr
  *
- * Into mft_entry.
+ * Structure must be initialized to zero before the first call to one of the
+ * attribute search functions. Initialize @mrec to point to the mft record to
+ * search, and @attr to point to the first attribute within @mrec (not necessary
+ * if calling the _first() functions), and set @is_first to TRUE (not necessary
+ * if calling the _first() functions).
+ *
+ * If @is_first is TRUE, the search begins with @attr. If @is_first is FALSE,
+ * the search begins after @attr. This is so that, after the first call to one
+ * of the search attribute functions, we can call the function again, without
+ * any modification of the search context, to automagically get the next
+ * matching attribute.
  */
-int insert_attr_in_mft_entry(mft_entry *me, attr **a, const BOOL dirty);
+typedef struct {
+	MFT_RECORD *mrec;
+	ATTR_RECORD *attr;
+	BOOL is_first;
+	ntfs_inode *ntfs_ino;
+	ATTR_LIST_ENTRY *al_entry;
+	ntfs_inode *base_ntfs_ino;
+	MFT_RECORD *base_mrec;
+	ATTR_RECORD *base_attr;
+} attr_search_context;
+
+extern void reinit_attr_search_ctx(attr_search_context *ctx);
+extern attr_search_context *get_attr_search_ctx(ntfs_inode *ni,
+		MFT_RECORD *mrec);
+extern void put_attr_search_ctx(attr_search_context *ctx);
 
-int remove_attr(attr *a);
 
 /**
@@ -150,38 +117,8 @@
 int set_ntfs_volume_flags(ntfs_volume *v, MFT_RECORD *b, const __u16 flags);
 
-/**
- * attr_search_context - used in attribute search functions
- * @mrec:	buffer containing mft record to search
- * @attr:	attribute record in @mrec where to begin/continue search
- * @is_first:	if true lookup_attr() begins search with @attr, else after @attr
- *
- * Structure must be initialized to zero before the first call to one of the
- * attribute search functions. If the mft record in which to search has already
- * been loaded into memory, then initialize @mrec to point to it, @attr to
- * point to the first attribute within @mrec, and set @is_first to TRUE.
- *
- * @is_first is only honoured when @mrec is not NULL. Then, if @is_first is
- * TRUE, the search begins with @attr. If @is_first is FALSE, the search begins
- * after @attr. This is so that, after the first call to one of the search
- * attribute functions, we can call the function again, without any
- * modification of the search context, to automagically get the next matching
- * attribute.
- */
-typedef struct {
-	MFT_RECORD *mrec;
-	ATTR_RECORD *attr;
-	BOOL is_first;
-} attr_search_context;
-
 /*
  * See attrib.c for descriptions of the below functions.
  */
 
-extern __inline__ BOOL find_first_attr(const ATTR_TYPES type,
-		const uchar_t *name, const __u32 name_len,
-		const IGNORE_CASE_BOOL ic, const uchar_t *upcase,
-		const __u32 upcase_len, const __u8 *val, const __u32 val_len,
-		attr_search_context *ctx);
-
 BOOL find_attr(const ATTR_TYPES type, const uchar_t *name, const __u32 name_len,
 		const IGNORE_CASE_BOOL ic, const uchar_t *upcase,
@@ -217,5 +154,5 @@
  */
 __s64 get_attribute_value(const ntfs_volume *vol, const MFT_RECORD *m,
-			  const ATTR_RECORD *a, __u8 *b);
+		const ATTR_RECORD *a, __u8 *b);
 
 /**
@@ -238,5 +175,5 @@
  */
 int set_attribute_value(ntfs_volume *vol, ATTR_RECORD *a,
-			const __u8 *b, __s64 l);
+		const __u8 *b, __s64 l);
 
 #endif /* defined ATTRIB_H */

Index: bitmap.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bitmap.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- bitmap.h	1 Jun 2001 02:07:24 -0000	1.7
+++ bitmap.h	14 Apr 2002 13:56:45 -0000	1.8
@@ -4,5 +4,5 @@
  * bitmap.h - Exports for bitmap handling. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -45,6 +45,15 @@
  * Set the bit @bit in the @bitmap to @new_value. Ignore all errors.
  */
-__inline__ void ntfs_set_bit(__u8 *bitmap, const __u64 bit,
-				const __u8 new_value);
+static __inline__ void ntfs_set_bit(__u8 *bitmap, const __u64 bit,
+		const __u8 new_value);
+{
+//	Dprintf("bitmap %p, bit 0x%Lx, new_value %i\n", bitmap, bit, new_value);
+	if (!bitmap || new_value > 1)
+		return;
+	if (!new_value)
+		bitmap[bit >> 3] &= ~(1 << (bit & 7));
+	else
+		bitmap[bit >> 3] |= (1 << (bit & 7));
+}
 
 /**
@@ -56,7 +65,17 @@
  * Return -1 on error.
  */
-extern __inline__ char ntfs_get_bit(const __u8 *bitmap, const __u64 bit);
-
-extern __inline__ void ntfs_change_bit(__u8 *bitmap, const __u64 bit);
+static __inline__ char ntfs_get_bit(const __u8 *bitmap, const __u64 bit)
+{
+	if (!bitmap)
+		return -1;
+	return (bitmap[bit >> 3] >> (bit & 7)) & 1;
+}
+
+static __inline__ void ntfs_change_bit(__u8 *bitmap, const __u64 bit)
+{
+	if (!bitmap)
+		return;
+	bitmap[bit >> 3] ^= 1 << (bit & 7);
+}
 
 /**
@@ -69,6 +88,17 @@
  * Return -1 on error.
  */
-extern __inline__ char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
-				   const __u8 new_value);
+static __inline__ char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
+		const __u8 new_value)
+{
+	register __u8 old_bit, shift;
+	
+	if (!bitmap || new_value > 1)
+		return -1;
+	shift = bit & 7;
+	old_bit = (bitmap[bit >> 3] >> shift) & 1;
+	if (new_value != old_bit)
+		bitmap[bit >> 3] ^= 1 << shift; 
+	return old_bit;
+}
 
 #endif /* defined BITMAP_H */

Index: bootsect.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bootsect.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- bootsect.h	1 Jun 2001 02:07:24 -0000	1.7
+++ bootsect.h	14 Apr 2002 13:56:45 -0000	1.8
@@ -5,5 +5,5 @@
  *		project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -106,5 +106,5 @@
  * disregarding the value of silent.
  */
-int is_boot_sector_ntfs(const NTFS_BOOT_SECTOR *b, const int silent);
+extern int is_boot_sector_ntfs(const NTFS_BOOT_SECTOR *b, const int silent);
 
 #endif /* defined BOOTSECT_H */

Index: debug.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/debug.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- debug.h	12 Apr 2002 15:24:30 -0000	1.1
+++ debug.h	14 Apr 2002 13:56:45 -0000	1.2
@@ -36,28 +36,44 @@
 #endif
 
-/* Verbose output. Currently just same as debug output. */
+/* Debug output to stderr. To get it run ./configure --enable-debug. */
 
-static inline void Vprintf(const char *fmt, ...)
+static __inline__ void Dprintf(const char *fmt, ...)
 {
+	int eo = errno;
 	va_list ap;
 
 	va_start(ap, fmt);
-	vprintf(fmt, ap);
+	vfprintf(stderr, fmt, ap);
 	va_end(ap);
+	errno = eo;
 }
 
-static inline void Vputs(const char *s)
+static __inline__ void Dputs(const char *s)
 {
-	puts(s);
+	int eo = errno;
+	fprintf(stderr, "%s\n", s);
+	errno = eo;
+}
+
+static __inline__ void Dperror(const char *s)
+{
+	int eo = errno;
+	perror(s);
+	errno = eo;
 }
 
 #else
 
-static inline void Vprintf(const char *fmt, ...)
+static __inline__ void Dprintf(const char *fmt, ...)
+{
+	return;
+}
+
+static __inline__ void Dputs(const char *s)
 {
 	return;
 }
 
-static inline void Vputs(const char *s)
+static __inline__ void Dperror(const char *s)
 {
 	return;

Index: disk_io.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- disk_io.h	1 Jun 2001 02:07:24 -0000	1.9
+++ disk_io.h	14 Apr 2002 13:56:45 -0000	1.10
@@ -4,5 +4,5 @@
  * disk_io.h - Exports for disk io. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or

Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- layout.h	15 Dec 2001 05:13:08 -0000	1.16
+++ layout.h	14 Apr 2002 13:56:45 -0000	1.17
@@ -4,5 +4,5 @@
  * layout.h - Ntfs on-disk layout structures. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -34,4 +34,5 @@
 /* 2-byte Unicode character type. */
 typedef __u16 uchar_t;
+#define UCHAR_T_SIZE_BITS 1
 
 /*

Index: list.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/list.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- list.h	1 Jun 2001 02:07:24 -0000	1.3
+++ list.h	14 Apr 2002 13:56:45 -0000	1.4
@@ -29,10 +29,9 @@
  * Insert a new entry between two known consecutive entries. 
  *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
+ * This is only for internal list manipulation where we know the prev/next
+ * entries already!
  */
 static __inline__ void __list_add(struct list_head * new,
-	struct list_head * prev,
-	struct list_head * next)
+		struct list_head * prev, struct list_head * next)
 {
 	next->prev = new;
@@ -44,6 +43,6 @@
 /**
  * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
+ * @new:	new entry to be added
+ * @head:	list head to add it after
  *
  * Insert a new entry after the specified head.
@@ -57,6 +56,6 @@
 /**
  * list_add_tail - add a new entry
- * @new: new entry to be added
- * @head: list head to add it before
+ * @new:	new entry to be added
+ * @head:	list head to add it before
  *
  * Insert a new entry before the specified head.
@@ -69,12 +68,11 @@
 
 /*
- * Delete a list entry by making the prev/next entries
- * point to each other.
+ * Delete a list entry by making the prev/next entries point to each other.
  *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
+ * This is only for internal list manipulation where we know the prev/next
+ * entries already!
  */
 static __inline__ void __list_del(struct list_head * prev,
-				  struct list_head * next)
+		struct list_head * next)
 {
 	next->prev = prev;
@@ -84,6 +82,8 @@
 /**
  * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty on entry does not return true after this, the entry is in an undefined state.
+ * @entry:	the element to delete from the list.
+ *
+ * Note: list_empty on entry does not return true after this, the entry is in
+ * an undefined state.
  */
 static __inline__ void list_del(struct list_head *entry)
@@ -94,5 +94,5 @@
 /**
  * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.
+ * @entry:	the element to delete from the list.
  */
 static __inline__ void list_del_init(struct list_head *entry)
@@ -104,5 +104,5 @@
 /**
  * list_empty - tests whether a list is empty
- * @head: the list to test.
+ * @head:	the list to test.
  */
 static __inline__ int list_empty(struct list_head *head)
@@ -113,8 +113,9 @@
 /**
  * list_splice - join two lists
- * @list: the new list to add.
- * @head: the place to add it in the first list.
+ * @list:	the new list to add.
+ * @head:	the place to add it in the first list.
  */
-static __inline__ void list_splice(struct list_head *list, struct list_head *head)
+static __inline__ void list_splice(struct list_head *list,
+		struct list_head *head)
 {
 	struct list_head *first = list->next;
@@ -142,5 +143,5 @@
 
 /**
- * list_for_each	-	iterate over a list
+ * list_for_each - iterate over a list
  * @pos:	the &struct list_head to use as a loop counter.
  * @head:	the head for your list.
@@ -148,5 +149,6 @@
 #define list_for_each(pos, head) \
 	for (pos = (head)->next, pos->next; pos != (head); \
-        	pos = pos->next, pos->next)
+			pos = pos->next, pos->next)
         	
 #endif
+

Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -U2 -r1.25 -r1.26
--- mft.h	14 Apr 2002 13:34:50 -0000	1.25
+++ mft.h	14 Apr 2002 13:56:45 -0000	1.26
@@ -4,5 +4,5 @@
  * mft.h - Exports for MFT record handling. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or

Index: mst.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mst.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- mst.h	14 Apr 2002 13:29:42 -0000	1.1
+++ mst.h	14 Apr 2002 13:56:45 -0000	1.2
@@ -2,8 +2,8 @@
  * $Id$
  *
- * ntfs_rec.h - Exports for NTFS record handling. Part of the Linux-NTFS
- * 		project.
+ * mst.h - Exports for multi sector transfer fixup functions. Part of the
+ * 	   Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -23,6 +23,6 @@
  */
 
-#ifndef NTFS_REC_H
-#define NTFS_REC_H
+#ifndef MST_H
+#define MST_H
 
 #include "types.h"
@@ -30,9 +30,7 @@
 
 extern int post_read_mst_fixup(NTFS_RECORD *b, const __u32 size);
-
 extern int pre_write_mst_fixup(NTFS_RECORD *b, const __u32 size);
-
 extern void post_write_mst_fixup(NTFS_RECORD *b);
 
-#endif /* defined NTFS_REC_H */
+#endif /* defined MST_H */
 

Index: support.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/support.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- support.h	15 Dec 2001 05:13:08 -0000	1.4
+++ support.h	14 Apr 2002 13:56:45 -0000	1.5
@@ -4,5 +4,5 @@
  * support.h - Useful definitions and macros. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -26,16 +26,4 @@
 
 #include <stddef.h>
-
-/*
- * These are just to make the code more readable...
- */
-typedef enum {
-	FALSE = 0,
-	NO = 0,
-	ZERO = 0,
-	TRUE = 1,
-	YES = 1,
-	ONE = 1,
-} BOOL;
 
 /*

Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/types.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- types.h	15 Dec 2001 05:13:08 -0000	1.6
+++ types.h	14 Apr 2002 13:56:45 -0000	1.7
@@ -5,5 +5,5 @@
  *	     the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -26,11 +26,12 @@
 #define NTFS_TYPES_H
 
-#include "layout.h"
 #include "list.h"
-#include "unistr.h"
+#include "layout.h"
 
-/*
- * run_list
- * ========
+/**
+ * run_list_element - in memory vcn to lcn mapping array element
+ * @vcn:	starting vcn of the current array element
+ * @lcn:	starting lcn of the current array element
+ * @length:	length in clusters of the current array element
  * 
  * The last vcn (in fact the last vcn + 1) is reached when length == 0.
@@ -38,13 +39,9 @@
  * When lcn == -1 this means that the count vcns starting at vcn are not 
  * physically allocated (i.e. this is a hole / data is sparse).
- *
- * For attribute extents which have the previous_extents flag set, the first
- * entry is a sparse entry (lcn == -1). It is used to get the vcn count up to
- * lowest_vcn for that extent.
  */
 typedef struct {	/* In memory vcn to lcn mapping structure element. */
 	VCN vcn;	/* vcn = Starting virtual cluster number. */
 	LCN lcn;	/* lcn = Starting logical cluster number. */
-	__u64 length;	/* Run length in clusters. */
+	__s64 length;	/* Run length in clusters. */
 } run_list_element;
 
@@ -52,4 +49,21 @@
 
 /*
+ * These are just to make the code more readable...
+ */
+typedef enum {
+	FALSE = 0,
+	NO = 0,
+	ZERO = 0,
+	TRUE = 1,
+	YES = 1,
+	ONE = 1,
+} BOOL;
+
+typedef enum {
+	CASE_SENSITIVE = 0,
+	IGNORE_CASE = 1,
+} IGNORE_CASE_BOOL;
+
+/*
  * Union of all known attribute values. For convenience. Used in the attr
  * structure.
@@ -78,338 +92,10 @@
  
 /*
- * Necessary forward definitions and typedefs.
- */ 
-struct _ntfs_attr;
-typedef struct _ntfs_attr attr;
-
-struct _mft_entry;
-typedef struct _mft_entry mft_entry;
-
-struct _ntfs_file;
-typedef struct _ntfs_file ntfs_file;
-
-struct _ntfs_volume;
-typedef struct _ntfs_volume ntfs_volume;
-
-/**
- * attr - structure describing a mapped attribute
- * @a_rec:		attribute record of the attribute
- * @a_flags:		flags describing the attribute
- * @a_val:		attribute value
- * @a_run_list:		run list of the attribute value
- * @a_count:		usage count of the attribute
- * @a_dirty_list:	anchor for the @a_vol->dirty_attrs linked list
- * @a_vol:		volume the attribute belongs to
- * @a_m_entry:		mft entry @a_rec is contained in
- * @a_base_m_entry:	base mft entry holding the attribute list attribute
- * @a_attr_list_entry:	attribute list entry of this attribute
- *
- * @a_rec is the attribute record (ATTR_REC *) of the attribute (and is always
- * valid).
- * 
- * The following flags are defined for @a_flags:
- * 	dirty		- Attribute value is dirty. Needs to be written to disk.
- * 			  Only for non_resident attributes. For resident ones
- * 			  the mft entry is set dirty. Note: when the meta data
- * 			  part of the attribute is dirtied the mft record is
- * 			  marked dirty directly. No flag reflects this in the
- * 			  attr structure as it is unnecessary.
- *	val_mapped	- Attribute value is mapped. If not mapped @a_val and
- *		  	  @a_dirty_list are not defined.
- *	error		- There was some kind of error on I/O so it is possible
- *			  that one or more of the other fields are corrupt.
- *	non_resident	- Attribute is not resident. If resident, @a_run_list
- *			  and @a_dirty_list are not defined.
- *	in_attr_list	- Attribute is described by the attribute list attribute
- *			  @a_base_m_entry->m_attr_list, the entry in this is
- *			  @a_attr_list_entry.
- *	in_ext_record	- Attribute is described by the attribute list
- *			  attribute and it is stored in an extension record
- *			  (pointed to by @a_m_entry) rather than in the base mft
- *			  record (pointed to by @a_base_m_entry). This only
- *			  makes sense if in_attr_list is set.
- *	previous_extents - Attribute is not the first extent. Only makes sense
- *			  if in_attr_list is set. Also, if previous_extents is
- *			  set, this implies in_ext_record is also set.
- *	last_extent	- Attribute is the last extent. So if there are no
- *			  previous_extents and this is the last_extent, we know
- *			  there are no extents at all. Only make sense if
- *			  in_attr_list is set. Note, we don't keep pointers to
- *			  the prev/next extents as their attributes are not
- *			  necessarily mapped.
- *
- * @a_val points to the attribute value of the attribute and will either point
- * into @a_rec (resident attribute) or it will point to a especially for it
- * allocated memory which has to be free()d when the attribute is unmapped.
- * @a_val is only valid when the val_mapped flag is set in @a_flags.
- *
- * It is important to note that @a_val contains only the mapped portion of this
- * extent of the attribute value which is indicated by a lcn >= 0 in the run
- * list.
- *
- * If lcn is -1, @a_val does contain this portion of the value, but it is all
- * zero, and there is no storage allocated for it (it is a sparse run). When
- * writing it to disk, it is checked for being zero again and if it is, the
- * (zero) data is not written to disk, but a sparse entry is saved in the
- * mapping pairs array. If it is not zero, storage is allocated on disk and the
- * data is written. The run list and mapping pairs array is then updated to
- * reflect this and lcn is no longer -1.
- *
- * @a_run_list is only valid if the non_resident flag is set. It will only hold
- * the part of the run list belonging to this extent. If previous_extents is
- * zero and last_extent is set, this is the full run_list as there are no more
- * extents. Should the vcn being looked for not be present in @a_run_list, it
- * should be checked for other extents before returning out of bounds error
- * (check previous_extents/last_extent flags first).
- *
- * Note: If previous_extents is set then the first entry of @a_run_list has a
- * vcn equal to lowest_vcn of this extent. We do NOT have a virtual sparse
- * entry (vcn = 0, lcn = -1, and length = lowest_vcn) at the beginning, unlike
- * the WinNT/2k NTFS drivers. IMO this only makes things more complex instead
- * of easier. If you are familiar with Win NTFS driver this is something to
- * watch out for... (AIA)
- *
- * Note, that @a_run_list may be NULL which means that the run list has not
- * been extracted from @a_rec (yet). This can only happen when the attribute
- * value is not mapped. If val_mapped is set, @a_run_list must be valid.
- *
- * @a_count is the number of times the attribute value has been mapped. When it
- * reaches zero the value may be safely unmapped (after being synced if dirty
- * and hence also non_resident). This can be done at any point in time. Remember
- * we only free() the memory if the attribute is non resident! Once the value is
- * unmapped, it is also safe to free() @a_run_list AND set it to NULL.
- *
- * @a_dirty_list anchors the attribute entry into the dirty_attrs list of
- * @a_vol. Used when syncing the volume to be able to quickly walk all dirty
- * attributes and sync them as well. Only applies to non_resident attributes
- * as resident ones are covered by virtue of being contained inside their
- * mft entries (@a_m_entry) which are dirty and synced to disk, already.
- *
- * @a_vol is the volume the attribute belongs to. This is just so lookups are
- * quicker. Otherwise it could be obtained from @m_entry->m_vol.
- * 
- * @a_m_entry points to the mft entry in which the attribute is held. If the
- * attribute is in the base mft record, @a_m_entry is also the base mft record
- * and @a_base_m_entry equals @m_entry (in_ext_record flag is zero). If the
- * attribute is located in an extension mft record, @a_base_m_entry points to
- * the mft entry of the base mft record and the in_ext_record flag is set in
- * @a_flags (implies in_attr_list flag is also set).
- *
- * If in_attr_list is set, @a_base_m_entry points to the mft entry containing
- * the attribute list attribute describing this attribute. The attribute list is
- * obtained from @a_base_m_entry->m_attr_list.
- *
- * If in_attr_list is set, @a_attr_list_entry points to the attribute list entry
- * within the attribute list attribute which describes this attribute.
- *
- * Note, we don't store the file this attribute belongs to, as this information
- * is irrelevant for all intents and purposes and can be obtained from
- * @m_entry->m_file should it be needed at some point.
- */
-struct _ntfs_attr {
-	ATTR_RECORD *a_rec;
-	unsigned long a_flags;
-	attr_val *a_val;
-	run_list *a_run_list;
-	unsigned int a_count;
-	struct list_head a_dirty_list;
-	ntfs_volume *a_vol;
-	mft_entry *a_m_entry;
-	mft_entry *a_base_m_entry;
-	ATTR_LIST_ENTRY *a_attr_list_entry;
-};
-
-/**
- * mft_entry - structure describing a loaded mft record
- * @m_rec:		mft record of this mft entry
- * @m_flags:		flags describing the mft entry
- * @m_ref:		mft reference of this mft entry (includes sequence no.)
- * @m_count:		usage count of the mft entry
- * @m_mapped_attrs:	array of all mapped attributes of this mft entry
- * @nr_mapped_attrs:	number of mapped attributes in the @m_mapped_attrs array
- * @m_file:		file this mft entry belongs to (or NULL if none)
- * @m_list:		anchor for the @m_vol->mft_entries linked list
- * @m_dirty_list:	anchor for the @m_vol->dirty_mft_entries linked list
- * @m_vol:		volume the mft entry belongs to
- * @m_attr_list:	the attribute list value of this (base) mft entry
- *
- * Each loaded mft record is represented by a mft_entry structure.
- * 
- * @m_rec is a pointer to the actual MFT_RECORD. Only valid if mapped flag is
- * set.
- * 
- * @m_flags is a set of flags describing the mft entry / record. The
- * following flags are defined:
- *	mapped		- Is the MFT_RECORD actually in memory? (i.e. Is @m_rec
- *			  valid?)
- *	dirty		- Does the record need to be written to disk? If not,
- *			  it is safe to discard @m_rec, but only if @m_count is
- *			  zero.
- * 	error		- When reading the entry from disk it was detected that
- * 			  it is	corrupt. For example, it could be that a multi
- * 			  sector transfer error was detected.
- *	is_base_record	- Is this mft record a base record?
- *	attr_list_present	- Set if an attribute list is present in this
- *				  mft record. This implies that is_base_record
- *				  is set.
- *	attr_list_mapped	- Set if the attribute list is mapped. Implies
- *				  that is_base_record and attr_list_present are
- *				  set.
- *
- * @m_ref is the mft reference of the mft record described by this entry. This
- * includes the sequence number for consistency checking purposes.
- *
- * @m_count is the usage count. When zero this record is not referenced anywhere
- * and can be thrown away safely (writing it to disk first if the dirty flag is
- * set).
- * 
- * @m_mapped_attrs is an array of pointers to all mapped attributes of this mft
- * entry.
- * 
- * @nr_mapped_attrs is the number of mapped attributes and hence the number of
- * elements in @m_mapped_attrs.
- * 
- * @m_file is the ntfs_file this mft entry belongs to. If this is NULL, the mft
- * entry does not have a file associated with it. This can happen when a file is
- * closed but the associated mft entries are left in the cache or when mft
- * entries are directly accessed at low level for whatever reason.
- *
- * @m_list is an anchor for the @m_vol->mft_entries linked list.
- *
- * @m_dirty_list is an anchor for the @m_vol->dirty_mft_enties linked list.
- * Only valid if the dirty flag is set.
- * 
- * @m_vol is the ntfs_volume this entry belongs to.
- *
- * @m_attr_list is a pointer to the attribute list attribute value. Only if
- * @m_flags has the attr_list_mapped flag set (which implies that is_base_record
- * and attr_list_present flags are set, too). This will effectively just contain
- * the same memory reference as the @a_val field of the mapped attribute list
- * attribute.
- */
-struct _mft_entry {
-	MFT_RECORD *m_rec;
-	unsigned long m_flags;
-	MFT_REF m_ref;
-	unsigned int m_count;
-	attr **m_mapped_attrs;
-	unsigned int nr_mapped_attrs;
-	ntfs_file *m_file;
-	struct list_head m_list;
-	struct list_head m_dirty_list;
-	ntfs_volume *m_vol;
-	ATTR_LIST_ENTRY *m_attr_list;
-};
-
-/*
- * NOTE: I have completely ignored the existence of things like directories
- * and directory references for the moment! These will just be added later on.
- * The directories themselves are of course covered by being base mft records
- * and hence follow the same semantics like every other mft record.
- */
-
-/**
- * ntfs_file - structure describing an open file
- * @f_m_refs:		array of mft references belonging to this file
- * @f_m_entries:	array mft entries belonging to the @f_m_refs
- * @nr_m_refs:		number of entries in above two arrays
- * @f_count:		usage count of the file
- * @f_vol:		volume the file belongs to
- * @f_list:		anchor for the @f_vol->open_files list
- *
- * Each open file is described by an ntfs_file structure.
- *
- * @f_m_refs is the mft references of the file (i.e. the on disk inode numbers).
- * This is an array of MFT_REFs. The first reference is the base mft record and
- * if any others exist they are the associated loaded extension mft records.
- * Used for attribute list purposes.
- *
- * @f_m_entries is the loaded mft records for the file. This is an array of
- * pointers to mft_entries, corresponding to the f_m_refs. This is not strictly
- * necessary but results in a big speed up as we don't need to search the
- * @f_vol->mft_entries list every time.
- *
- * When an entry is referenced in the above lists the usage count for the
- * corresponding entry is increased by one.
- * 
- * @nr_m_refs is the number of records in the @m_refs and @m_entries arrays. If
- * it is greater 1, we know there must be an attribute list attribute (but if
- * equals 1, we	cannot assume there isn't one). This is of course the same as a
- * possible nr_m_entries, but refs is shorter to write. (-8
- *
- * @f_count it the usage count. When zero, this file is no longer open by anyone
- * and is thrown away. No need to concern oneself with dirty state as this is
- * done on a mft_entry level, i.e. a level below the idea of files.
- *
- * @f_vol is the volume the file belongs to.
- *
- * @f_list is an anchor into @f_vol->files list. When @f_count reaches 0, the
- * file is unlinked from the list and disposed off.
- */
-struct _ntfs_file {
-	MFT_REF *f_m_refs;
-	mft_entry **f_m_entries;
-	unsigned int nr_m_refs;
-	unsigned int f_count;
-	ntfs_volume *f_vol;
-	struct list_head f_list;
-};
-
-/*
- * FIXME: For RAID stuff will need the fd and dev_name variables to be arrays
- * or lists or something... Also will need to know the number of sectors (and
- * sector size if not 512) of each device making up the RAID array. Obviously,
- * will need RAID information as well like which RAID is used together with
- * state information, etc. But that is the far future.
- */
-
-/*
  * ntfs_volume - structure describing an open volume in memory
- * FIXME: put in the remaining fields...
- * @open_files:			linked list of all opened files
- * @nr_open_files:		number of @open_files
- * @max_open_files:		maximum number of @open_files
- * @mft_entries:		linked list of all mft entries cached in memory
- * @nr_mft_entries:		number of @mft_entries
- * @dirty_mft_entries:		linked list of all dirty mft entries
- * @nr_dirty_mft_entries:	number of @dirty_mft_entries
- * @dirty_attrs:		linked list of all dirty, mapped attributes
- * @nr_dirty_attrs:		number of @dirty_attrs
- * @v_list:			anchor for list of mounted volumes
- * 
- * @open_files is a linked list of ntfs_file struct pointers, keeping track of
- * of all open files. When a file is opened it is added to the back of this list
- * as we do not expect to be closing the file again that soon.
- *
- * @nr_open_files is the number of @open_files.
- *
- * @max_open_files is the maximum number of @open_files allowed.
- * 
- * @mft_entries is a linked list of all loaded mft records (disk inodes) in
- * order of ascending mft record number (disk inode number, i.e. disregarding
- * the sequence number). Note, the list members are not the actual MFT_RECORDS,
- * but in memory mft_entry structs.
- *
- * @nr_mft_entries is the number of @mft_entries.
- *
- * @dirty_mft_entries is a linked list of all loaded mft records which are
- * dirty. Used for flushing the dirty mft entries - when one is marked dirty,
- * the entry is added to the end of this list. When it is flushed to disk, it is
- * marked clean and removed from this list. Effectively a FIFO.
- *
- * @nr_dirty_mft_entries is the number of @dirty_mft_entries.
- *
- * @dirty_attrs is a linked list of all dirty, non-resident, mapped attributes.
- * 
- * @nr_dirty_attrs is the number of @dirty_attrs.
- * 
- * @v_list is an anchor for the linked list of mounted volume.
  */
-struct _ntfs_volume {
+typedef struct {
 	int fd;			/* File descriptor associated with volume. */
 	char *dev_name;		/* Name of the device/file the volume is in. */
-	char *vol_name;		/* Name of the volume from the volume name
-				   attribute. */
-	/* Version nos. and flags are from the volume information attribute. */
+	char *vol_name;		/* Name of the volume. */
         __u8 major_ver;		/* Ntfs major version of volume. */
         __u8 minor_ver;		/* Ntfs minor version of volume. */
@@ -443,15 +129,5 @@
 	__u32 upcase_len;		/* Length in Unicode characters of the
 					   upcase table. */
- 	struct list_head open_files;
- 	int nr_open_files;
-	int max_open_files;
- 	struct list_head mft_entries;
-	int nr_mft_entries;
- 	struct list_head dirty_mft_entries;
- 	int nr_dirty_mft_entries;
-	struct list_head dirty_attrs;
-	int nr_dirty_attrs;
-	struct list_head v_list;
-};
+} ntfs_volume;
 
 #endif /* defined NTFS_TYPES_H */

Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/unistr.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- unistr.h	9 Jun 2001 00:25:55 -0000	1.7
+++ unistr.h	14 Apr 2002 13:56:45 -0000	1.8
@@ -5,5 +5,5 @@
  *	      project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -31,12 +31,4 @@
 
 extern const __u8 legal_ansi_char_array[0x40];
-
-/*
- * These are just to make the code more readable...
- */
-typedef enum {
-	CASE_SENSITIVE = 0,
-	IGNORE_CASE = 1,
-} IGNORE_CASE_BOOL;
 
 BOOL ntfs_are_names_equal(const uchar_t *s1, size_t s1_len,

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- volume.h	6 Dec 2001 01:14:52 -0000	1.15
+++ volume.h	14 Apr 2002 13:56:45 -0000	1.16
@@ -4,5 +4,5 @@
  * volume.h - Exports for NTFS volume handling. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000,2001 Anton Altaparmakov.
+ * Copyright (c) 2000-2002 Anton Altaparmakov.
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -25,70 +25,11 @@
 #define VOLUME_H
 
-#include <stdio.h>
 #include <sys/mount.h>
 
-#include "list.h"
-#include "support.h"
 #include "types.h"
 
-int ntfs_sync_volume(ntfs_volume *vol);
+extern ntfs_volume *ntfs_mount(const char *name, unsigned long rwflag);
 
-/**
- * ntfs_mount - open ntfs volume
- * @name:	name of device/file to open
- * @rwflag:	optional mount flags
- *
- * This function mounts an ntfs volume. @name should contain the name of the
- * device/file to mount as the ntfs volume.
- *
- * @rwflags is an optional second parameter. The same flags are used as for
- * the mount system call (man 2 mount). Currently only the following flags
- * are implemented:
- *	MS_RDONLY	- mount volume read-only
- * 
- * The function opens the device or file @name and verifies that it contains a
- * valid bootsector. Then, it allocates an ntfs_volume structure and initializes
- * some of the values inside the structure from the information stored in the
- * bootsector. It proceeds to load the necessary system files and completes
- * setting up the structure. 
- *
- * ntfs_mount() returns a pointer to the allocated ntfs_volume structure.
- * On error, the return value is NULL and errno is set appropriately.
- *
- * Note, that a copy is made of @name, and hence it can be discarded as
- * soon as the function returns.
- *
- * FIXME: Should document all error codes that can be returned and what each
- * means.
- */
-ntfs_volume *ntfs_mount(const char *name, unsigned long rwflag);
-
-/**
- * ntfs_umount - close ntfs volume
- * @vol: address of ntfs_volume structure of volume to close
- * @force: if true force close the volume even if it is busy
- * 
- * Flush buffers, close all files and deallocate all structures (including @vol
- * itself) associated with the ntfs volume @vol.
- *
- * Return true on success. On error return false with errno set appropriately
- * (most likely to one of EAGAIN, EBUSY or EINVAL). The EAGAIN error means that
- * an operation is in progress and if you try the close later the operation
- * might be completed and the close succeed.
- *  
- * If @force is true (i.e. not zero) this function will close the volume even
- * if this means that data might be lost. In this case the function always
- * returns 1.
- *
- * @vol must have previously been returned by a call to ntfs_mount().
- *
- * @vol itself is deallocated and should no longer be referenced after this
- * function returns success. If it returns an error then nothing has been done
- * so it is safe to continue using @vol.
- *
- * FIXME: Should document all error codes that can be returned and what each
- * means.
- */
-BOOL ntfs_umount(ntfs_volume *vol, const int force);
+extern BOOL ntfs_umount(ntfs_volume *vol, const int force);
 
 #endif /* defined VOLUME_H */

--- mft_old.h DELETED ---

[Linux-NTFS-cvs] CVS: linux-ntfs/include mft.h,1.24,1.25

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv9019/include

Modified Files:
	mft.h 
Log Message:
Throw away all unnecessary crap.


Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- mft.h	15 Dec 2001 05:13:08 -0000	1.24
+++ mft.h	14 Apr 2002 13:34:50 -0000	1.25
@@ -26,6 +26,5 @@
 
 #include "types.h"
-#include "list.h"
-#include "support.h"
+#include "endians.h"
 
 /**
@@ -45,127 +44,11 @@
  * wouldn't view this as corruption in itself though!).
  */
-extern __inline__ __u32 get_mft_record_data_size(const MFT_RECORD *b);
-
-/* Mft entry flag bit values */
-#define ME_mapped		0
-#define ME_dirty		1
-#define ME_error		2
-#define ME_is_base_record	3
-#define ME_attr_list_present	4
-#define ME_attr_list_mapped	5
-				/* bits 6-31 reserved for future use */
-
-#define MftEntryMapped(me)		test_bit(ME_mapped, (me)->m_flags)
-#define SetMftEntryMapped(me)		set_bit(ME_mapped, (me)->m_flags)
-#define ClearMftEntryMapped(me)		clear_bit(ME_mapped, (me)->m_flags)
-
-#define MftEntryDirty(me)		test_bit(ME_dirty, (me)->m_flags)
-#define SetMftEntryDirty(me)		set_bit(ME_dirty, (me)->m_flags)
-#define ClearMftEntryDirty(me)		clear_bit(ME_dirty, (me)->m_flags)
-
-#define MftEntryError(me)		test_bit(ME_error, (me)->m_flags)
-#define SetMftEntryError(me)		set_bit(ME_error, (me)->m_flags)
-#define ClearMftEntryError(me)		clear_bit(ME_error, (me)->m_flags)
-
-#define MftEntryIsBaseRecord(me)	test_bit(ME_is_base_record, \
-								(me)->m_flags)
-#define SetMftEntryIsBaseRecord(me)	set_bit(ME_is_base_record, \
-								(me)->m_flags)
-#define ClearMftEntryIsBaseRecord(me)	clear_bit(ME_is_base_record, \
-								(me)->m_flags)
-
-#define MftEntryAttrListPresent(me)	test_bit(ME_attr_list_present, \
-								(me)->m_flags)
-#define SetMftEntryAttrListPresent(me)	set_bit(ME_attr_list_present, \
-								(me)->m_flags)
-#define ClearMftEntryAttrListPresent(me) clear_bit(ME_attr_list_present, \
-								(me)->m_flags)
-
-#define MftEntryAttrListMapped(me)	test_bit(ME_attr_list_mapped, \
-								(me)->m_flags)
-#define SetMftEntryAttrListMapped(me)	set_bit(ME_attr_list_mapped, \
-								(me)->m_flags)
-#define ClearMftEntryAttrListMapped(me)	clear_bit(ME_attr_list_mapped, \
-								(me)->m_flags)
-
-extern int ntfs_flush_mft_entry(mft_entry *m);
-
-/* Internal use only. Use ntfs_set_mft_entry_dirty() instead. */
-extern void __ntfs_set_mft_entry_dirty(mft_entry *m);
-
-/**
- * ntfs_set_mft_entry_dirty - set an mft entry dirty
- * @m:		mft entry to set dirty
- *
- * If the mft entry @m is not dirty it is added to the dirty_mft_entries list
- * of the volume to which @m belongs and the dirty flag of the entry is set.
- */
-static __inline__ void ntfs_set_mft_entry_dirty(mft_entry *m)
-{
-	if (!test_and_set_bit(ME_dirty, m->m_flags))
-		__ntfs_set_mft_entry_dirty(m);
-}
-
-/* Internal use only. Use ntfs_map_mft_entry() instead. */
-extern int __ntfs_map_mft_entry(mft_entry *m);
-
-/**
- * ntfs_map_mft_entry - map an mft entry into memory
- * @m:		mft entry to map
- *
- * Increase the use count of the entry @m and map it into memory (if it is not
- * mapped). This function operates on an already existing mft_entry which has
- * been inserted in a volume already. It doesn't need to be associated with a
- * file though. Note that no setting up of the mft_entry is performed or stuff
- * like that. If you need this kind of stuff chances are you should be using
- * ntfs_map_file_entry() instead and your probably don't have the mft_entry
- * yet.
- *
- * Return 0 on success and -ERRNO on error. See __map_mft_entry() for more
- * details on the returned error codes.
- */
-static __inline__ int ntfs_map_mft_entry(mft_entry *m)
+static __inline__ __u32 get_mft_record_data_size(const MFT_RECORD *b)
 {
-	int err;
-	
-	m->m_count++;
-	if (MftEntryMapped(m))
+	if (!b || !is_mft_recordp(b))
 		return 0;
-	if ((err = __ntfs_map_mft_entry(m)) < 0)
-		m->m_count--;
-	return err;
-}
-
-extern mft_entry *ntfs_map_file_entry(ntfs_volume *v, const MFT_REF mref);
-
-/**
- * ntfs_unmap_mft_entry - unmap an mft entry
- * @m:		mft entry to unmap
- *
- * Decrease the use count of the mft entry (only if it is above 1). Do not
- * actually unmap it. We always keep it cached in memory. However, when we
- * have unmapped it and the count has reached zero, the entry can be safely
- * unmapped if it is necessary, but that happens elsewhere.
- */
-static __inline__ void ntfs_unmap_mft_entry(mft_entry *m)
-{
-	if (MftEntryMapped(m) && m->m_count > 1)
-		m->m_count--;
+	/* Get the number of used bytes and return it. */
+	return le32_to_cpu(b->bytes_in_use);
 }
-
-/**
- * ntfs_unmap_file_entry - unmap a file mft entry
- * @m:		file mft entry to unmap
- *
- * Same as ntfs_unmap_mft_entry(), so we just wrap it.
- */
-static __inline__ void ntfs_unmap_file_entry(mft_entry *m)
-{
-	ntfs_unmap_mft_entry(m);
-}
-
-extern ntfs_file *ntfs_open_by_mref(ntfs_volume *vol, const MFT_REF mref);
-
-extern int ntfs_close(ntfs_file *f);
 
 #endif /* defined MFT_H */

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs mft.c,1.11,1.12

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv9019/libntfs

Modified Files:
	mft.c 
Log Message:
Throw away all unnecessary crap.


Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- mft.c	15 Dec 2001 05:13:08 -0000	1.11
+++ mft.c	14 Apr 2002 13:34:49 -0000	1.12
@@ -22,1021 +22,4 @@
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include "types.h"
-#include "list.h"
 #include "mft.h"
-#include "endians.h"
-#include "disk_io.h"
[...990 lines suppressed...]
-/**
- * ntfs_close - close an open ntfs_file
- * @f:		ntfs_file to close
- *
- * Close a previously opened ntfs file. Return 0 on success or -1 if file is
- * busy.
- */
-int ntfs_close(ntfs_file *f)
-{
-	ntfs_volume *v;
-
-	if (--f->f_count > 1)
-		return 0;
-	/* Remove all mft_refs/_entries from @f and, if no errors, remove @f
-	 * from its volume and kill the file. */
-	if (!__remove_all_mft_entries_from_file(f))
-		return __free_ntfs_file(f);
-	return -1;
-}
 

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs ntfsd.c,1.7,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv8177/libntfs

Removed Files:
	ntfsd.c 
Log Message:
Throw away the ntfsd stuff.


--- ntfsd.c DELETED ---

[Linux-NTFS-cvs] CVS: linux-ntfs/include ntfsd.h,1.10,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv8177/include

Removed Files:
	ntfsd.h 
Log Message:
Throw away the ntfsd stuff.


--- ntfsd.h DELETED ---

[Linux-NTFS-cvs] CVS: linux-ntfs/include mst.h,NONE,1.1 ntfs_rec.h,1.7,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv7801

Added Files:
	mst.h 
Removed Files:
	ntfs_rec.h 
Log Message:
rename ntfs_rec to mst


--- NEW FILE ---
/*
 * $Id: mst.h,v 1.1 2002/04/14 13:29:42 antona Exp $
 *
 * ntfs_rec.h - Exports for NTFS record handling. Part of the Linux-NTFS
 * 		project.
 *
 * Copyright (c) 2000,2001 Anton Altaparmakov.
 *
 * This program/include file is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
 * by the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program/include file is distributed in the hope that it will be 
 * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program (in the main directory of the Linux-NTFS 
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef NTFS_REC_H
#define NTFS_REC_H

#include "types.h"
#include "endians.h"

extern int post_read_mst_fixup(NTFS_RECORD *b, const __u32 size);

extern int pre_write_mst_fixup(NTFS_RECORD *b, const __u32 size);

extern void post_write_mst_fixup(NTFS_RECORD *b);

#endif /* defined NTFS_REC_H */


--- ntfs_rec.h DELETED ---

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs mst.c,NONE,1.1 ntfs_rec.c,1.9,NONE

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv7447

Added Files:
	mst.c 
Removed Files:
	ntfs_rec.c 
Log Message:
Cleanup mst fixup handling bringing it inline with kernel driver and rename the file to mst rather than ntfs_rec.


--- NEW FILE ---
/*
 * $Id: mst.c,v 1.1 2002/04/14 13:28:19 antona Exp $
 *
 * ntfs_rec.c - NTFS record handling code. Part of the Linux-NTFS project.
 *
 * Copyright (c) 2000,2001 Anton Altaparmakov.
 *
 * This program/include file is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
 * by the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program/include file is distributed in the hope that it will be 
 * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program (in the main directory of the Linux-NTFS 
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include "mst.h"

/**
 * post_read_mst_fixup - deprotect multi sector transfer protected data
 * @b:          pointer to the data to deprotect
 * @size:       size in bytes of @b
 * 
 * Perform the necessary post read multi sector transfer fixup and detect the
 * presence of incomplete multi sector transfers. - In that case, overwrite the
 * magic of the ntfs record header being processed with "BAAD" (in memory only!) * and abort processing.
 *
 * Return 0 on success and -EINVAL on error ("BAAD" magic will be present).
 *
 * NOTE: We consider the absence / invalidity of an update sequence array to
 * mean that the structure is not protected at all and hence doesn't need to
 * be fixed up. Thus, we return success and not failure in this case. This is
 * in contrast to pre_write_mst_fixup(), see below.
 */
int post_read_mst_fixup(NTFS_RECORD *b, const __u32 size)
{
	__u16 usa_ofs, usa_count, usn;
	__u16 *usa_pos, *data_pos;

	/* Setup the variables. */
	usa_ofs = le16_to_cpu(b->usa_ofs);
	/* Decrement usa_count to get number of fixups. */
	usa_count = le16_to_cpu(b->usa_count) - 1;
	/* Size and alignement checks. */
	if ( size & (NTFS_SECTOR_SIZE - 1)	||
	     usa_ofs & 1			||
	     usa_ofs + (usa_count * 2) > size	||
	     (size >> NTFS_SECTOR_SIZE_BITS) != usa_count)
		return 1;
	/* Position of usn in update sequence array. */  
	usa_pos = (__u16*)b + usa_ofs/sizeof(__u16);
	/* 
	 * The update sequence number which has to be equal to each of the
	 * __u16 values before they are fixed up. Note no need to care for
	 * endianness since we are comparing and moving data for on disk
	 * structures which means the data is consistent. - If it is 
	 * consistenty the wrong endianness it doesn't make any difference.
	 */
	usn = *usa_pos;
	/*
	 * Position in protected data of first __u16 that needs fixing up.
	 */
	data_pos = (__u16*)b + NTFS_SECTOR_SIZE/sizeof(__u16) - 1;
        /*
	 * Check for incomplete multi sector transfer(s).
	 */
	while (usa_count--) {
                if (*data_pos != usn) {
			/*
			 * Incomplete multi sector transfer detected! )-:
			 * Set the magic to "BAAD" and return failure.
			 * Note that magic_BAAD is already converted to le32.
			 */
			b->magic = magic_BAAD;
	                return 0;
		}
		data_pos += NTFS_SECTOR_SIZE/sizeof(__u16);
	}
	/* Re-setup the variables. */
	usa_count = le16_to_cpu(b->usa_count) - 1;
	data_pos = (__u16*)b + NTFS_SECTOR_SIZE/sizeof(__u16) - 1;
	/* Fixup all sectors. */
	while (usa_count--) {
		/*
		 * Increment position in usa and restore original data from
		 * the usa into the data buffer.
		 */
		*data_pos = *(++usa_pos);
                /* Increment position in data as well. */
		data_pos += NTFS_SECTOR_SIZE/sizeof(__u16);
        }
	return 1;
}

/**
 * pre_write_mst_fixup - apply multi sector transfer protection
 * @b:          pointer to the data to protect
 * @size:       size in bytes of @b
 * 
 * Perform the necessary pre write multi sector transfer fixup on the data
 * pointer to by @b of @size.
 *
 * Return 0 if fixup applied (success) or -EINVAL if no fixup was performed
 * (assumed not needed). This is in contrast to post_read_mst_fixup() above.
 *
 * NOTE: We consider the absence / invalidity of an update sequence array to
 * mean that the structure is not subject to protection and hence doesn't need
 * to be fixed up. This means that you have to create a valid update sequence
 * array header in the ntfs record before calling this function, otherwise it
 * will fail (the header needs to contain the position of the update seqeuence
 * array together with the number of elements in the array). You also need to
 * initialise the update sequence number before calling this function
 * otherwise a random word will be used (whatever was in the record at that
 * position at that time).
 */
int pre_write_mst_fixup(NTFS_RECORD *b, const __u32 size)
{
	__u16 usa_ofs, usa_count, usn;
	__u16 *usa_pos, *data_pos;

	/* Sanity check + only fixup if it makes sense. */
	if (!b || is_baad_record(b->magic) || is_hole_record(b->magic))
		return 0;
	/* Setup the variables. */
	usa_ofs = le16_to_cpu(b->usa_ofs);
	/* Decrement usa_count to get number of fixups. */
	usa_count = le16_to_cpu(b->usa_count) - 1;
	/* Size and alignement checks. */
	if ( size & (NTFS_SECTOR_SIZE - 1)	||
	     usa_ofs & 1			||
	     usa_ofs + (usa_count * 2) > size	||
	     (size >> NTFS_SECTOR_SIZE_BITS) != usa_count)
		return 0;
	/* Position of usn in update sequence array. */  
	usa_pos = (__u16*)((__u8*)b + usa_ofs);
	/*
	 * Cyclically increment the update sequence number 
	 * (skipping 0 and -1, i.e. 0xffff).
	 */
	usn = le16_to_cpup(usa_pos) + 1;
	if (usn == 0xffff || !usn)
		usn = 1;
	usn = cpu_to_le16(usn);
	*usa_pos = usn;
	/* Position in data of first __u16 that needs fixing up. */
	data_pos = (__u16*)b + NTFS_SECTOR_SIZE/sizeof(__u16) - 1;
        /* Fixup all sectors. */
        while (usa_count--) {
		/*
		 * Increment the position in the usa and save the 
		 * original data from the data buffer into the usa.
		 */
		*(++usa_pos) = *data_pos;
		/* Apply fixup to data. */
		*data_pos = usn;
		/* Increment position in data as well. */
		data_pos += NTFS_SECTOR_SIZE/sizeof(__u16);
        }
	return 1;
}

/**
 * post_write_mst_fixup - fast deprotect multi sector transfer protected data
 * @b:          pointer to the data to deprotect
 * 
 * Perform the necessary post write multi sector transfer fixup, not checking
 * for any errors, because we assume we have just used pre_write_mst_fixup(),
 * thus the data will be fine or we would never have gotten here.
 */
void post_write_mst_fixup(NTFS_RECORD *b)
{
	__u16 *usa_pos, *data_pos;

	__u16 usa_ofs = le16_to_cpu(b->usa_ofs);
	__u16 usa_count = le16_to_cpu(b->usa_count) - 1;

	/* Position of usn in update sequence array. */  
	usa_pos = (__u16*)b + usa_ofs/sizeof(__u16);

	/* Position in protected data of first __u16 that needs fixing up. */
	data_pos = (__u16*)b + NTFS_SECTOR_SIZE/sizeof(__u16) - 1;

        /* Fixup all sectors. */
	while (usa_count--) {
		/*
		 * Increment position in usa and restore original data from
		 * the usa into the data buffer.
		 */
		*data_pos = *(++usa_pos);

                /* Increment position in data as well. */
		data_pos += NTFS_SECTOR_SIZE/sizeof(__u16);
        }
}


--- ntfs_rec.c DELETED ---

[Linux-NTFS-cvs] CVS: linux-ntfs TODO.ntfslabel,NONE,1.1

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv10642

Added Files:
	TODO.ntfslabel 
Log Message:
Add a todo for ntfslabel


--- NEW FILE ---
- Implement changing the label.

- Support ioctls for ntfs tng driver 2.0.2 for reading/changing the label.

[Linux-NTFS-cvs] CVS: linux-ntfs ChangeLog,1.30,1.31

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv22467

Modified Files:
	ChangeLog 
Log Message:
Fix hopefully last typo. (-:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -U2 -r1.30 -r1.31
--- ChangeLog	12 Apr 2002 15:23:47 -0000	1.30
+++ ChangeLog	12 Apr 2002 15:35:27 -0000	1.31
@@ -1,3 +1,3 @@
-12/04/2002 - 1.7.0-WIP - New tool ntfslabel.
+12/04/2002 - 1.7.0.WIP - New tool ntfslabel.
 	New tool ntfslabel written by Matthew Fanto with a few cleanups from
 	me to make it fit in with e2label better.

[Linux-NTFS-cvs] CVS: linux-ntfs linux-ntfs.spec.in,1.39,1.40

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv20100

Modified Files:
	linux-ntfs.spec.in 
Log Message:
Fix typo.


Index: linux-ntfs.spec.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/linux-ntfs.spec.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -U2 -r1.39 -r1.40
--- linux-ntfs.spec.in	12 Apr 2002 15:23:47 -0000	1.39
+++ linux-ntfs.spec.in	12 Apr 2002 15:28:09 -0000	1.40
@@ -76,5 +76,5 @@
 
 %changelog
-* Tue Mar 12 2002 Anton Altaparmakov <ai...@ca...>
+* Tue Apr 12 2002 Anton Altaparmakov <ai...@ca...>
 - update %description text for ntfslabel
 

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfslabel.8.in,NONE,1.1

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv19354/ntfstools

Added Files:
	ntfslabel.8.in 
Log Message:
Add the manpage.


--- NEW FILE ---
.\" -*- nroff -*-
.\" Copyright (c) 2002 Anton Altaparmakov. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\" Adapted from e2fsprogs-1.26/misc/e2label.8.in by Theodore Ts'o.
.\" 
.TH NTFSLABEL 8 "April 2002" "Linux-NTFS version @VERSION@"
.SH NAME
ntfslabel \- display/change the label on an ntfs file system
.SH SYNOPSIS
.B ntfslabel
.I device
[
.I new-label
]
.SH DESCRIPTION
.B ntfslabel
will display or change the file system label on the ntfs file system located on
.IR device .
.PP
If the optional argument
.I new-label
is not present,
.B ntfslabel
will simply display the current file system label.
.PP
If the optional argument
.I new-label
is present, then
.B ntfslabel
will set the file system label to be
.IR new-label .
NTFS file system labels can be at most 128 Unicode characters long; if
.I new-label
is longer than 128 Unicode characters,
.B ntfslabel
will truncate it and print a warning message.
.PP
It is also possible to set the file system label using the
.B \-L
option of
.BR mkntfs (8)
during creation of the file system.
.PP
.SH AUTHOR
.B ntfslabel 
was written by Matthew J. Fanto (fan...@cm...). This man page was written
by Anton Altaparmakov (ai...@ca...).
.SH BUGS
Changing the label is currently not implemented yet.
.SH AVAILABILITY
.B ntfslabel
is part of the linux-ntfs package and is available from 
http://linux-ntfs.sourceforge.net/.
.SH SEE ALSO
.BR mkntfs (8)

[Linux-NTFS-cvs] CVS: linux-ntfs/include debug.h,NONE,1.1

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv19174/include

Added Files:
	debug.h 
Log Message:
Forgot to add the debug header file!


--- NEW FILE ---
/*
 * $Id: debug.h,v 1.1 2002/04/12 15:24:30 antona Exp $
 *
 * debug.h - Debugging output functions. Part of the Linux-NTFS project.
 *
 * Copyright (c) 2002 Anton Altaparmakov.
 *
 * This program/include file is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
 * by the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program/include file is distributed in the hope that it will be 
 * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program (in the main directory of the Linux-NTFS 
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef DEBUG_H
#define DEBUG_H

#ifdef DEBUG

#include "config.h"

#ifdef HAVE_STDIO_H
#	include <stdio.h>
#endif
#ifdef HAVE_STDARG_H
#	include <stdarg.h>
#endif

/* Verbose output. Currently just same as debug output. */

static inline void Vprintf(const char *fmt, ...)
{
	va_list ap;

	va_start(ap, fmt);
	vprintf(fmt, ap);
	va_end(ap);
}

static inline void Vputs(const char *s)
{
	puts(s);
}

#else

static inline void Vprintf(const char *fmt, ...)
{
	return;
}

static inline void Vputs(const char *s)
{
	return;
}

#endif

#endif /* defined DEBUG_H */

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools Makefile.am,1.14,1.15 Makefile.in,1.18,1.19 ntfslabel.c,1.1,1.2

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv18456/ntfstools

Modified Files:
	Makefile.am Makefile.in ntfslabel.c 
Log Message:
Cleanup ntfslabel, write a man page for it, integrate it all in the distribution properly, silence output from ntfs_mount() (conditional on running configure with --enable-debug), update all docs accordingly. Add Rich and Matt to AUTHORS.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- Makefile.am	2 Aug 2001 01:44:57 -0000	1.14
+++ Makefile.am	12 Apr 2002 15:23:48 -0000	1.15
@@ -7,6 +7,6 @@
 
 bin_PROGRAMS		= ntfsfix #ntfsdump_logfile dumplog
-sbin_PROGRAMS		= mkntfs
-man_MANS		= mkntfs.8 ntfsfix.8
+sbin_PROGRAMS		= mkntfs ntfslabel
+man_MANS		= mkntfs.8 ntfsfix.8 ntfslabel.8
 
 linux_ntfsincludedir	= -I$(top_srcdir)/include
@@ -22,4 +22,8 @@
 mkntfs_LDADD		= $(top_srcdir)/libntfs/libntfs.la
 mkntfs_LDFLAGS		= $(all_libraries)
+
+ntfslabel_SOURCES	= ntfslabel.c
+ntfslabel_LDADD		= $(top_srcdir)/libntfs/libntfs.la
+ntfslabel_LDFLAGS	= $(all_libraries)
 
 # We don't distribute these as they are not really of any use to anyone except

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- Makefile.in	26 Jan 2002 04:32:35 -0000	1.18
+++ Makefile.in	12 Apr 2002 15:23:48 -0000	1.19
@@ -93,6 +93,6 @@
 
 bin_PROGRAMS = ntfsfix #ntfsdump_logfile dumplog
-sbin_PROGRAMS = mkntfs
-man_MANS = mkntfs.8 ntfsfix.8
+sbin_PROGRAMS = mkntfs ntfslabel
+man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8
 
 linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -108,9 +108,13 @@
 mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
 mkntfs_LDFLAGS = $(all_libraries)
+
+ntfslabel_SOURCES = ntfslabel.c
+ntfslabel_LDADD = $(top_srcdir)/libntfs/libntfs.la
+ntfslabel_LDFLAGS = $(all_libraries)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =  mkntfs.8 ntfsfix.8
+CONFIG_CLEAN_FILES =  mkntfs.8 ntfsfix.8 ntfslabel.8
 bin_PROGRAMS =  ntfsfix$(EXEEXT)
-sbin_PROGRAMS =  mkntfs$(EXEEXT)
+sbin_PROGRAMS =  mkntfs$(EXEEXT) ntfslabel$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
@@ -123,4 +127,6 @@
 sd.$(OBJEXT) mkntfs.$(OBJEXT)
 mkntfs_DEPENDENCIES =  $(top_srcdir)/libntfs/libntfs.la
+ntfslabel_OBJECTS =  ntfslabel.$(OBJEXT)
+ntfslabel_DEPENDENCIES =  $(top_srcdir)/libntfs/libntfs.la
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -131,5 +137,6 @@
 
 NROFF = nroff
-DIST_COMMON =  Makefile.am Makefile.in mkntfs.8.in ntfsfix.8.in
+DIST_COMMON =  Makefile.am Makefile.in mkntfs.8.in ntfsfix.8.in \
+ntfslabel.8.in
 
 
@@ -139,7 +146,7 @@
 GZIP_ENV = --best
 DEP_FILES =  .deps/attrdef.P .deps/boot.P .deps/mkntfs.P .deps/ntfsfix.P \
-.deps/sd.P .deps/upcase.P
-SOURCES = $(ntfsfix_SOURCES) $(mkntfs_SOURCES)
-OBJECTS = $(ntfsfix_OBJECTS) $(mkntfs_OBJECTS)
+.deps/ntfslabel.P .deps/sd.P .deps/upcase.P
+SOURCES = $(ntfsfix_SOURCES) $(mkntfs_SOURCES) $(ntfslabel_SOURCES)
+OBJECTS = $(ntfsfix_OBJECTS) $(mkntfs_OBJECTS) $(ntfslabel_OBJECTS)
 
 all: all-redirect
@@ -157,4 +164,6 @@
 ntfsfix.8: $(top_builddir)/config.status ntfsfix.8.in
 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ntfslabel.8: $(top_builddir)/config.status ntfslabel.8.in
+	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 mostlyclean-binPROGRAMS:
@@ -253,4 +262,8 @@
 	@rm -f mkntfs$(EXEEXT)
 	$(LINK) $(mkntfs_LDFLAGS) $(mkntfs_OBJECTS) $(mkntfs_LDADD) $(LIBS)
+
+ntfslabel$(EXEEXT): $(ntfslabel_OBJECTS) $(ntfslabel_DEPENDENCIES)
+	@rm -f ntfslabel$(EXEEXT)
+	$(LINK) $(ntfslabel_LDFLAGS) $(ntfslabel_OBJECTS) $(ntfslabel_LDADD) $(LIBS)
 
 install-man8:

Index: ntfslabel.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfslabel.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- ntfslabel.c	11 Apr 2002 23:11:00 -0000	1.1
+++ ntfslabel.c	12 Apr 2002 15:23:48 -0000	1.2
@@ -1,16 +1,20 @@
 /*
- * ntfslabel.c - Change the label on an NTFS partition
+ * $Id$
+ *
+ * ntfslabel - Part of the Linux-NTFS project.
  * 
- * Copyright (c) 2002 Matthew J. Fanto <fan...@cm...>
- *                    
+ * Copyright (c) 2002 Matthew J. Fanto
+ * Copyright (c) 2002 Anton Altaparmakov
+ *
+ * This utility will display/change the label on an NTFS partition.
  *
- * This program/include file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ -21,4 +25,5 @@
  */
 
+#include "config.h"
 
 #include <stdio.h>
@@ -32,86 +37,49 @@
 #include "volume.h"
 
+#define NTFS_MF_MOUNTED		1
 
-#define NTFS_MF_MOUNTED         1
-
-
-const char *EXEC_NAME = "ntfslabel";
-const char *AUTHOR    = "Matthew Fanto";
-const char *VERSION   = "1.0";
+const char *EXEC_NAME	= "ntfslabel";
+const char *AUTHOR	= "Matthew Fanto";
 
 ntfs_volume *vol;
 
-void parse_options(int argc, char *argv[]);
-void change_label(const char *device);
-int check_mntent(const char *file);
-void display_syntax();
-void display_label(const char *device);
-
-int main(int argc, char **argv)
-{
-  if(argc && *argv)
-    fprintf(stderr, "%s v%s - %s\n",EXEC_NAME,VERSION,AUTHOR);
-
-  parse_options(argc, argv);
-}
-
- 
-void parse_options(int argc, char *argv[])
-{
-  int c;
-   
- if(argc < 2)
-   display_syntax();
-  
-
- while((c = getopt(argc, argv, "p:c:h")) != EOF)
-   switch(c){
-   case 'p':
-      display_label(optarg);
-     break;
-   case 'c':
-      change_label(optarg);
-     break;
-   case 'h':
-     display_syntax();
-   }
-}
-
+void change_label(const char *dev, const char *label);
 
-
-void display_syntax()
+void print_label(const char *dev)
 {
-    printf("Syntax: ntfslabel [options] device\n\n "
-	  " -p, print the current label\n "
-	  " -c, change the current label\n");
+	vol = ntfs_mount(dev, MS_RDONLY);
+	if (!vol) {
+		perror("ntfs_mount() failed");
+		exit(1);
+	}
+	printf("%s\n", vol->vol_name);
+	ntfs_umount(vol, 0);
 }
 
-
-
-
-void display_label(const char *device)
+int main(int argc, char **argv)
 {
-   vol = ntfs_mount(device,0);
-  if(!vol)
-    {
-      printf("Error: ntfs_mount() failed!");
-      exit(1);
-    }
-    printf("Volume Label: %s\n",vol->vol_name);
+	if (argc && *argv)
+		EXEC_NAME = *argv;
+	if (argc == 2)
+		print_label(argv[1]);
+	else if (argc == 3)
+		change_label(argv[1], argv[2]);
+	else {
+		fprintf(stderr, "%s v%s - %s\n", EXEC_NAME, VERSION, AUTHOR);
+		fprintf(stderr, "Usage: ntfslabel device [newlabel]\n");
+		exit(1);
+	}
+	return 0;
 }
+ 
+int check_mount(const char *file);
 
-
-void change_label(const char *device)
+void change_label(const char *dev, const char *label)
 {
-  printf("now changing label\n");
-  /*First we need to make sure the device is not mounted*/
-  check_mount(device);
-
+	printf("now changing label - FIXME: Not implemented yet!\n");
+	/*First we need to make sure the device is not mounted*/
+	check_mount(dev);
 }
 
-
-
-
-
 /* Only check if the mount is readonly when it's the root filesystem. */
 int check_mntent(const char *file)
@@ -121,34 +89,34 @@
         int m_fd;
 
-        if ((m_f = setmntent(MOUNTED, "r")) == NULL)
-                return -errno;
-        while ((mnt = getmntent(m_f)) != NULL)
-                if (strcmp(file, mnt->mnt_fsname) == 0)
-                        break;
-        endmntent(m_f);
-        if (mnt == 0)
-                return 0;
-	
-	else 
-	  return NTFS_MF_MOUNTED;
-        
- }
+	if (!(m_f = setmntent(MOUNTED, "r")))
+		return -errno;
+	while ((mnt = getmntent(m_f)))
+		if (!strcmp(file, mnt->mnt_fsname))
+			break;
+	endmntent(m_f);
+	if (!mnt)
+		return 0;
+	else
+		return NTFS_MF_MOUNTED;
+
+}
 
-int check_mount(const char *device)
+int check_mount(const char *dev)
 {
-        int r;
+	int r;
 	struct stat sbuf;
-	/*First verify we are dealing with a valid block device.*/
-	if(stat(device,&sbuf)==-1)
-	{
-	  fprintf(stderr,"Error: device %s is not a valid block device.\n",device);
-	  exit(1);
-	} 
-
-        if(r = check_mntent(device))
-	  {
-	     printf("Error: device %s is currently mounted.\n",device);
-             exit(1);
-	  }
-        
+
+	/* First verify we are dealing with a valid block device. */
+	if (stat(dev, &sbuf) == -1) {
+		fprintf(stderr, "Error: device %s is not a valid block "
+				"device.\n", dev);
+		exit(1);
+	}
+
+	if (r = check_mntent(dev)) {
+		printf("Error: device %s is currently mounted.\n", dev);
+		exit(1);
+	}
+
 }
+

[Linux-NTFS-cvs] CVS: linux-ntfs AUTHORS,1.1,1.2 CREDITS,1.4,1.5 ChangeLog,1.29,1.30 NEWS,1.18,1.19 README,1.27,1.28 configure,1.24,1.25 configure.in,1.22,1.23 linux-ntfs.spec.in,1.38,1.39

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv18456

Modified Files:
	AUTHORS CREDITS ChangeLog NEWS README configure configure.in 
	linux-ntfs.spec.in 
Log Message:
Cleanup ntfslabel, write a man page for it, integrate it all in the distribution properly, silence output from ntfs_mount() (conditional on running configure with --enable-debug), update all docs accordingly. Add Rich and Matt to AUTHORS.


Index: AUTHORS
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- AUTHORS	30 Jan 2001 12:29:03 -0000	1.1
+++ AUTHORS	12 Apr 2002 15:23:47 -0000	1.2
@@ -1,4 +1,9 @@
 
-Linux-NTFS is written by Anton Altparmakov <ai...@ca...>.
+Linux-NTFS is written and maintained by Anton Altparmakov <ai...@ca...>.
 
+Current active developers on the project are (in alphabetical order):
+
+	Anton Altparmakov <ai...@ca...>
+	Matthew J. Fanto <fan...@cm...>
+	Richard Russon <nt...@fl...>
 

Index: CREDITS
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/CREDITS,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- CREDITS	2 Aug 2001 01:44:56 -0000	1.4
+++ CREDITS	12 Apr 2002 15:23:47 -0000	1.5
@@ -9,4 +9,5 @@
 
 Albert D. Cahalan <aca...@cs...>
+Matthew J. Fanto <fan...@cm...>
 David Martínez Moreno <dav...@re...>
 Yuri Per <yu...@ac...>

Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -U2 -r1.29 -r1.30
--- ChangeLog	12 Mar 2002 21:55:30 -0000	1.29
+++ ChangeLog	12 Apr 2002 15:23:47 -0000	1.30
@@ -1,2 +1,10 @@
+12/04/2002 - 1.7.0-WIP - New tool ntfslabel.
+	New tool ntfslabel written by Matthew Fanto with a few cleanups from
+	me to make it fit in with e2label better.
+	Extend ntfs_mount() to also read in the volume label.
+	Added man page for ntfslabel.
+	Silence verbosity of output from ntfs_mount(). It is now only output if
+	./configure was run with --enable-debug.
+
 12/03/2002 - 1.6.0 - More mkntfs options and cleanups.
 	Fix typo in usage information of mkntfs. Thanks to Richard Russon for

Index: NEWS
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/NEWS,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- NEWS	12 Mar 2002 21:55:30 -0000	1.18
+++ NEWS	12 Apr 2002 15:23:47 -0000	1.19
@@ -2,4 +2,10 @@
 ============
 
+Added new utility ntfslabel by Matthew Fanto. See man 8 ntfslabel for details.
+
+
+Older news
+==========
+
 linux-ntfs should now compile and work on all architectures.
 
@@ -8,7 +14,4 @@
 
 Changed version numbers of mkntfs and ntfsfix to match linux-ntfs release.
-
-Older news
-==========
 
 ntfsfix had two minor bugs fixed. This also should remove the compilation

Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/README,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- README	12 Mar 2002 21:55:30 -0000	1.27
+++ README	12 Apr 2002 15:23:47 -0000	1.28
@@ -63,2 +63,5 @@
 command line options.
 
+ntfslabel - Display/change the label of an NTFS partition. See man 8 ntfslabel
+for details.
+

Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- configure	12 Mar 2002 22:02:29 -0000	1.24
+++ configure	12 Apr 2002 15:23:47 -0000	1.25
@@ -964,5 +964,5 @@
 PACKAGE=linux-ntfs
 
-VERSION=1.6.0
+VERSION=1.7.0.WIP
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
@@ -6114,4 +6114,5 @@
 	ntfstools/mkntfs.8
 	ntfstools/ntfsfix.8
+	ntfstools/ntfslabel.8
 	linux-ntfs.spec
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
@@ -6241,4 +6242,5 @@
 	ntfstools/mkntfs.8
 	ntfstools/ntfsfix.8
+	ntfstools/ntfslabel.8
 	linux-ntfs.spec
 "}

Index: configure.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- configure.in	12 Mar 2002 22:02:29 -0000	1.22
+++ configure.in	12 Apr 2002 15:23:47 -0000	1.23
@@ -13,5 +13,5 @@
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(linux-ntfs,1.6.0)
+AM_INIT_AUTOMAKE(linux-ntfs,1.7.0.WIP)
 
 AM_MAINTAINER_MODE
@@ -127,4 +127,5 @@
 	ntfstools/mkntfs.8
 	ntfstools/ntfsfix.8
+	ntfstools/ntfslabel.8
 	linux-ntfs.spec
 ])

Index: linux-ntfs.spec.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/linux-ntfs.spec.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -U2 -r1.38 -r1.39
--- linux-ntfs.spec.in	12 Mar 2002 21:55:30 -0000	1.38
+++ linux-ntfs.spec.in	12 Apr 2002 15:23:47 -0000	1.39
@@ -30,4 +30,6 @@
 	mkntfs - Format a partition with the NTFS filesystem. See man 8 mkntfs
 for command line options.
+	ntfslabel - Display/change the label of an NTFS partition. See man 8
+ntfslabel for details.
 
 %package devel
@@ -74,4 +76,7 @@
 
 %changelog
+* Tue Mar 12 2002 Anton Altaparmakov <ai...@ca...>
+- update %description text for ntfslabel
+
 * Tue Mar 12 2002 Anton Altaparmakov <ai...@ca...>
 - update %description text

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs volume.c,1.19,1.20

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv18456/libntfs

Modified Files:
	volume.c 
Log Message:
Cleanup ntfslabel, write a man page for it, integrate it all in the distribution properly, silence output from ntfs_mount() (conditional on running configure with --enable-debug), update all docs accordingly. Add Rich and Matt to AUTHORS.


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- volume.c	11 Apr 2002 23:10:59 -0000	1.19
+++ volume.c	12 Apr 2002 15:23:47 -0000	1.20
@@ -38,4 +38,5 @@
 #include "attrib.h"
 #include "mft.h"
+#include "debug.h"
 
 /**
@@ -167,13 +168,13 @@
 	/* Allocate the boot sector structure. */
 	if (!(bs = (NTFS_BOOT_SECTOR *)malloc(sizeof(NTFS_BOOT_SECTOR)))) {
-		puts(FAILED);
+		Vputs(FAILED);
 		perror("Error allocating memory for bootsector");
 		errno = ENOMEM;
 		goto error_exit;
 	}
-	printf("Reading bootsector... ");
+	Vprintf("Reading bootsector... ");
 	if ((vol->fd = open(name, ro ? O_RDONLY: O_RDWR)) == -1) {
 		int eo = errno;
-		puts(FAILED);
+		Vputs(FAILED);
 		perror("Error opening partition file");
 		errno = eo;
@@ -184,5 +185,5 @@
 	if (br != 1) {
 		int eo = errno;
-		puts(FAILED);
+		Vputs(FAILED);
 #define ESTR "Error reading bootsector"
 		if (br == -1) {
@@ -200,5 +201,5 @@
 		goto error_exit;
 	}
-	puts(OK);
+	Vputs(OK);
 #ifdef DEBUG
 	if (!is_boot_sector_ntfs(bs, 0)) {
@@ -287,7 +288,7 @@
 #endif
 	/* Start with $Mft. */
-	printf("Loading $Mft... ");
+	Vprintf("Loading $Mft... ");
 	if (!(mb = (MFT_RECORD *)malloc(vol->mft_record_size))) {
-		puts(FAILED);
+		Vputs(FAILED);
 		perror("Error allocating memory for $Mft");
 		errno = ENOMEM;
@@ -298,5 +299,5 @@
 					vol->mft_lcn << vol->cluster_size_bits);
 	if (br != 1) {
-		puts(FAILED);
+		Vputs(FAILED);
 #define ESTR "Error reading $Mft"
 		if (br == -1)
@@ -312,5 +313,5 @@
 	}
 	if (is_baad_record(mb)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "Error: Incomplete multi sector "
 		                "transfer detected in $Mft.\nCannot "
@@ -320,5 +321,5 @@
 	}
 	if (!is_mft_recordp(mb)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "Error: Invalid mft record for $Mft.\n"
 				"Cannot handle this yet. )-:\n");
@@ -332,5 +333,5 @@
 	if (p2n(ctx.attr) < p2n(mb) ||
 	    (char*)ctx.attr > (char*)mb + vol->mft_record_size) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "Error: corrupt mft record for $Mft.\n"
 				"Cannot handle this yet. )-:\n");
@@ -340,5 +341,5 @@
 	ctx.is_first = TRUE;
 	if (!find_attr($BITMAP, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "$bitmap attribute not found in $Mft?!?\n");
 		errno = EIO;
@@ -349,5 +350,5 @@
 	l = get_attribute_value_length(a);
 	if (!l) {
-		puts(OK);
+		Vputs(OK);
 		puts("Error: $bitmap in $Mft has zero length! T'is weird!");
 		errno = EIO;
@@ -356,5 +357,5 @@
 	vol->mft_bitmap = (__u8*)malloc(l);
 	if (!vol->mft_bitmap) {
-		puts(FAILED);
+		Vputs(FAILED);
 		puts("Not enough memory to load bitmap attribute from $Mft.");
 		errno = ENOMEM;
@@ -363,5 +364,5 @@
 	/* Read in the bitmap attribute value into the buffer. */
 	if (l != get_attribute_value(vol, mb, a, vol->mft_bitmap)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		puts("Amount of data read does not correspond to expected "
 		     "length!");
@@ -384,5 +385,5 @@
 	ctx.is_first = TRUE;
 	if (!find_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "$DATA attribute not found in $Mft?!?\n");
 		errno = EIO;
@@ -394,5 +395,5 @@
 	/* The $DATA attribute of the $Mft has to be non-resident. */
 	if (!a->non_resident) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "$Mft $DATA attribute is resident!?!\n");
 		errno = EINVAL;
@@ -402,5 +403,5 @@
 	vol->mft_runlist = decompress_run_list(a);
 	if (!vol->mft_runlist) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "Error decompressing run list from $Mft $DATA"
 			        " attribute.\n");
@@ -408,13 +409,13 @@
 		goto error_exit;
 	}
-	puts(OK);
+	Vputs(OK);
 	/* Done with the $Mft mft record. */
 	free(mb);
 	mb = NULL;
 	/* Now load the bitmap from $Bitmap. */
-	printf("Loading $Bitmap... ");
+	Vprintf("Loading $Bitmap... ");
 	mref = (MFT_REF)FILE_$Bitmap;
 	if (err = __read_file_record(vol, &mref, &mb, NULL)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		errno = -err;
 		goto error_exit;
@@ -424,5 +425,5 @@
 	/* Find the bitmap (it is in the $DATA attribute). */
 	if (!find_first_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "bitmap attribute not found in $Bitmap?!?\n");
 		errno = EIO;
@@ -433,5 +434,5 @@
 	l = get_attribute_value_length(a);
 	if (!l) {
-		puts(OK);
+		Vputs(OK);
 		puts("Error: bitmap in $Bitmap has zero length! T'is weird!");
 		errno = EIO;
@@ -440,5 +441,5 @@
 	vol->lcn_bitmap = (__u8*)malloc(l);
 	if (!vol->lcn_bitmap) {
-		puts(FAILED);
+		Vputs(FAILED);
 		puts("Not enough memory to load $Bitmap.");
 		errno = ENOMEM;
@@ -447,5 +448,5 @@
 	/* Read in the bitmap attribute value into the buffer. */
 	if (l != get_attribute_value(vol, mb, a, vol->lcn_bitmap)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		puts("Amount of data read does not correspond to expected "
 		     "length!");
@@ -454,12 +455,12 @@
 	}
 	/* Done with the $BitMap mft record. */
-	puts(OK);
+	Vputs(OK);
 	free(mb);
 	mb = NULL;
 	/* Now load the upcase table from $UpCase. */
-	printf("Loading $UpCase... ");
+	Vprintf("Loading $UpCase... ");
 	mref = (MFT_REF)FILE_$UpCase;
 	if (err = __read_file_record(vol, &mref, &mb, NULL)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		errno = -err;
 		goto error_exit;
@@ -469,5 +470,5 @@
 	/* Find the bitmap (it is in the $DATA attribute). */
 	if (!find_first_attr($DATA, NULL, 0, 0, NULL, 0, NULL, 0, &ctx)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "$DATA attribute not found in $UpCase?!?\n");
 		errno = EIO;
@@ -478,5 +479,5 @@
 	l = get_attribute_value_length(a);
 	if (!l) {
-		puts(FAILED);
+		Vputs(FAILED);
 		puts("Error: $DATA in $UpCase has zero length! T'is weird!");
 		errno = EIO;
@@ -488,5 +489,5 @@
 	 * characters. */
 	if (l & ~0x1ffffffffULL) {
-		puts(FAILED);
+		Vputs(FAILED);
 		puts("Error: Upcase table is too big (max 32-bit allowed).");
 		errno = EINVAL;
@@ -496,5 +497,5 @@
 	vol->upcase = (uchar_t*)malloc(l);
 	if (!vol->upcase) {
-		puts(FAILED);
+		Vputs(FAILED);
 		puts("Not enough memory to load $UpCase.");
 		errno = ENOMEM;
@@ -503,5 +504,5 @@
 	/* Read in the $DATA attribute value into the buffer. */
 	if (l != get_attribute_value(vol, mb, a, (__u8*)vol->upcase)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		puts("Amount of data read does not correspond to expected "
 		     "length!");
@@ -510,13 +511,13 @@
 	}
 	/* Done with the $UpCase mft record. */
-	puts(OK);
+	Vputs(OK);
 	free(mb);
 	mb = NULL;
 	/* Now load $Volume and set the version information and flags in the
 	 * vol structure accordingly. */
-	printf("Loading $Volume... ");
+	Vprintf("Loading $Volume... ");
 	mref = (MFT_REF)FILE_$Volume;
 	if (err = __read_file_record(vol, &mref, &mb, NULL)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		errno = -err;
 		goto error_exit;
@@ -527,5 +528,5 @@
 	if (!find_first_attr($VOLUME_INFORMATION, NULL, 0, 0, NULL, 0, NULL, 0,
 				&ctx)) {
-		puts(FAILED);
+		Vputs(FAILED);
 		fprintf(stderr, "$VOLUME_INFORMATION attribute not found in "
 				"$Volume?!?\n");
@@ -560,13 +561,10 @@
 	   defined using cpu_to_le16() macro and hence are consistent. */
 	vol->flags = vinf->flags;
-	/* Phew! Done. */
-
-	/* FIXME: Need to initialise vol->vol_name as well. */
+	/* Find the $VOLUME_NAME attribute. */
 	memset(&ctx, 0, sizeof(attr_search_context));
 	ctx.mrec = mb;
-	/* Find the $VOLUME_NAME attribute. */
 	if (!find_first_attr($VOLUME_NAME, NULL, 0, 0, NULL, 0, NULL, 0,
-				&ctx)) {
-		puts(FAILED);
+			&ctx)) {
+		Vputs(FAILED);
 		fprintf(stderr, "$VOLUME_NAME attribute not found in "
 				"$Volume?!?\n");
@@ -583,15 +581,19 @@
 	}
 	/* Get a pointer to the value of the attribute. */
-        vol->vol_name = malloc ((a->value_length/2)+1);
-	if(!vol->vol_name)
-	  {
-	    printf("Unable to allocate memory!\n");
-	    exit(1);
-	  }
-	vname = (uchar_t *)(VOLUME_NAME*)(le16_to_cpu(a->value_offset) + (char*)a);
-	for (j = 0; j < (a->value_length/2); j++) { vol->vol_name[j] = vname[j]; }
-	vol->vol_name[a->value_length/2] = 0;
+        vol->vol_name = malloc(le32_to_cpu(a->value_length) / 2 + 1);
+	if (!vol->vol_name) {
+		fprintf(stderr, "Error: Unable to allocate memory for volume "
+				"name!\n");
+		errno = ENOMEM;
+		goto error_exit;
+	}
+	vname = (uchar_t*)(le16_to_cpu(a->value_offset) + (char*)a);
+	u = le32_to_cpu(a->value_length) / 2;
+	for (j = 0; j < u; j++) {
+		vol->vol_name[j] = le16_to_cpu(vname[j]);
+	}
+	vol->vol_name[u] = '\0';
 
-	puts(OK);
+	Vputs(OK);
 	free(mb);
 	mb = NULL;

[Linux-NTFS-cvs] CVS: linux-ntfs/include Makefile.am,1.7,1.8 Makefile.in,1.11,1.12

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv18456/include

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Cleanup ntfslabel, write a man page for it, integrate it all in the distribution properly, silence output from ntfs_mount() (conditional on running configure with --enable-debug), update all docs accordingly. Add Rich and Matt to AUTHORS.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- Makefile.am	24 Jul 2001 17:41:01 -0000	1.7
+++ Makefile.am	12 Apr 2002 15:23:47 -0000	1.8
@@ -23,5 +23,6 @@
 	layout.h \
 	types.h \
-	list.h
+	list.h \
+	debug.h
 
 # Don't need these distributed.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- Makefile.in	26 Jan 2002 04:32:35 -0000	1.11
+++ Makefile.in	12 Apr 2002 15:23:47 -0000	1.12
@@ -108,5 +108,6 @@
 	layout.h \
 	types.h \
-	list.h
+	list.h \
+	debug.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

[Linux-NTFS-cvs] CVS: dynamic-disk ChangeLog,1.14,1.15

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk
In directory usw-pr-cvs1:/tmp/cvs-serv11137

Modified Files:
	ChangeLog 
Log Message:
updated


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- ChangeLog	9 Mar 2002 02:11:39 -0000	1.14
+++ ChangeLog	11 Apr 2002 23:55:49 -0000	1.15
@@ -1,2 +1,9 @@
+2002-04-12 Richard Russon <ld...@fl...>
+
+	* Lots of renaming.  The VBLK types have become a name-version hybrid.
+	* More range checking.  The disk size is used to verify the privhead,
+	  the privhead for the tocblock and the tocblocks for the vmdb.
+	* Added a version number to ldminfo.
+
 2002-03-09 Richard Russon <ld...@fl...>
 

[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs volume.c,1.18,1.19

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv29422/libntfs

Modified Files:
	volume.c 
Log Message:
Matt Fanto's changes to retrieve the volume name and a utility to print it


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- volume.c	6 Dec 2001 01:14:52 -0000	1.18
+++ volume.c	11 Apr 2002 23:10:59 -0000	1.19
@@ -137,4 +137,6 @@
 	ATTR_RECORD *a;
 	VOLUME_INFORMATION *vinf;
+	uchar_t *vname;
+	int j;
 	__u32 u;
 	__s64 l;
@@ -561,4 +563,33 @@
 
 	/* FIXME: Need to initialise vol->vol_name as well. */
+	memset(&ctx, 0, sizeof(attr_search_context));
+	ctx.mrec = mb;
+	/* Find the $VOLUME_NAME attribute. */
+	if (!find_first_attr($VOLUME_NAME, NULL, 0, 0, NULL, 0, NULL, 0,
+				&ctx)) {
+		puts(FAILED);
+		fprintf(stderr, "$VOLUME_NAME attribute not found in "
+				"$Volume?!?\n");
+		errno = EIO;
+		goto error_exit;
+	}
+	a = ctx.attr;
+	/* Has to be resident. */
+	if (a->non_resident) {
+		fprintf(stderr, "Error: Attribute $VOLUME_NAME must " \
+				"be resident (and it isn't)!\n");
+		errno = EIO;
+		goto error_exit;
+	}
+	/* Get a pointer to the value of the attribute. */
+        vol->vol_name = malloc ((a->value_length/2)+1);
+	if(!vol->vol_name)
+	  {
+	    printf("Unable to allocate memory!\n");
+	    exit(1);
+	  }
+	vname = (uchar_t *)(VOLUME_NAME*)(le16_to_cpu(a->value_offset) + (char*)a);
+	for (j = 0; j < (a->value_length/2); j++) { vol->vol_name[j] = vname[j]; }
+	vol->vol_name[a->value_length/2] = 0;
 
 	puts(OK);

[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfslabel.c,NONE,1.1

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv29422/ntfstools

Added Files:
	ntfslabel.c 
Log Message:
Matt Fanto's changes to retrieve the volume name and a utility to print it


--- NEW FILE ---
/*
 * ntfslabel.c - Change the label on an NTFS partition
 * 
 * Copyright (c) 2002 Matthew J. Fanto <fan...@cm...>
 *                    
 *
 * This program/include file is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
 * by the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program/include file is distributed in the hope that it will be
 * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program (in the main directory of the Linux-NTFS
 * distribution in the file COPYING); if not, write to the Free Software
 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */


#include <stdio.h>
#include <errno.h>
#include <mntent.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>

#include "types.h"
#include "volume.h"


#define NTFS_MF_MOUNTED         1


const char *EXEC_NAME = "ntfslabel";
const char *AUTHOR    = "Matthew Fanto";
const char *VERSION   = "1.0";

ntfs_volume *vol;

void parse_options(int argc, char *argv[]);
void change_label(const char *device);
int check_mntent(const char *file);
void display_syntax();
void display_label(const char *device);

int main(int argc, char **argv)
{
  if(argc && *argv)
    fprintf(stderr, "%s v%s - %s\n",EXEC_NAME,VERSION,AUTHOR);

  parse_options(argc, argv);
}

 
void parse_options(int argc, char *argv[])
{
  int c;
   
 if(argc < 2)
   display_syntax();
  

 while((c = getopt(argc, argv, "p:c:h")) != EOF)
   switch(c){
   case 'p':
      display_label(optarg);
     break;
   case 'c':
      change_label(optarg);
     break;
   case 'h':
     display_syntax();
   }
}



void display_syntax()
{
    printf("Syntax: ntfslabel [options] device\n\n "
	  " -p, print the current label\n "
	  " -c, change the current label\n");
}




void display_label(const char *device)
{
   vol = ntfs_mount(device,0);
  if(!vol)
    {
      printf("Error: ntfs_mount() failed!");
      exit(1);
    }
    printf("Volume Label: %s\n",vol->vol_name);
}


void change_label(const char *device)
{
  printf("now changing label\n");
  /*First we need to make sure the device is not mounted*/
  check_mount(device);

}





/* Only check if the mount is readonly when it's the root filesystem. */
int check_mntent(const char *file)
{
        FILE *m_f;
        struct mntent *mnt;
        int m_fd;

        if ((m_f = setmntent(MOUNTED, "r")) == NULL)
                return -errno;
        while ((mnt = getmntent(m_f)) != NULL)
                if (strcmp(file, mnt->mnt_fsname) == 0)
                        break;
        endmntent(m_f);
        if (mnt == 0)
                return 0;
	
	else 
	  return NTFS_MF_MOUNTED;
        
 }

int check_mount(const char *device)
{
        int r;
	struct stat sbuf;
	/*First verify we are dealing with a valid block device.*/
	if(stat(device,&sbuf)==-1)
	{
	  fprintf(stderr,"Error: device %s is not a valid block device.\n",device);
	  exit(1);
	} 

        if(r = check_mntent(device))
	  {
	     printf("Error: device %s is currently mounted.\n",device);
             exit(1);
	  }
        
}

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.h,1.41,1.42

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv10728/linux/fs/partitions

Modified Files:
	ldm.h 
Log Message:



Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -U2 -r1.41 -r1.42
--- ldm.h	11 Apr 2002 14:27:39 -0000	1.41
+++ ldm.h	11 Apr 2002 14:29:47 -0000	1.42
@@ -125,6 +125,4 @@
 #define FRAG_SETBAD(f)		(f->map |= (1 << (FRAG_MAPBITS-1)))
 
-typedef struct list_head list_t;
-
 struct frags {
 	list_t	list;

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.c,1.68,1.69 ldm.h,1.40,1.41

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv9020/linux/fs/partitions

Modified Files:
	ldm.c ldm.h 
Log Message:
reinstate Jakob's parse guid, because I wasn't listening
more renames


Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -U2 -r1.68 -r1.69
--- ldm.c	10 Apr 2002 15:41:59 -0000	1.68
+++ ldm.c	11 Apr 2002 14:27:39 -0000	1.69
@@ -100,4 +100,29 @@
 }
 
+/**
+ * ldm_parse_hexbyte - Convert a ASCII hex number to a byte
+ * @src: Pointer to at least 2 characters to convert.
+ *
+ * Return: integer in the range [0,255] on success
+ *         -1 on error.
+ */
+static int ldm_parse_hexbyte (const u8 *src)
+{
+	unsigned int x;		/* For correct wrapping */
+	int h;
+
+	/* high part */
+	if      ((x = src[0] - '0') <= '9'-'0') h = x;
+	else if ((x = src[0] - 'a') <= 'f'-'a') h = x+10;
+	else if ((x = src[0] - 'A') <= 'F'-'A') h = x+10;
+	else return -1;
+	h <<= 4;
+
+	/* low part */
+	if ((x = src[1] - '0') <= '9'-'0') return h | x;
+	if ((x = src[1] - 'a') <= 'f'-'a') return h | (x+10);
+	if ((x = src[1] - 'A') <= 'F'-'A') return h | (x+10);
+	return -1;
+}
 
 /**
@@ -106,5 +131,5 @@
  * @dest:  memory block to hold binary GUID (16 bytes)
  *
- * NB not NULL terminated!
+ * N.B. The GUID need not be NULL terminated.
  *
  * Return: TRUE   @dest contains binary GUID
@@ -113,15 +138,19 @@
 static BOOL ldm_parse_guid (const u8 *src, u8 *dest)
 {
-	u16 *tmp = (u16*)dest;
-
-	DEBUG_ON (!src || !dest);
+	static const int size[] = { 4, 2, 2, 2, 6 };
+	int i, j, v;
 
-	if ((src[8]  != '-') || (src[13] != '-') ||	/* Check alignment */
-	    (src[18] != '-') || (src[23] != '-'))
+	if (src[8]  != '-' || src[13] != '-' ||
+	    src[18] != '-' || src[23] != '-')
 		return FALSE;
 
-	return (8 == sscanf (src, "%04hx%04hx-%04hx-%04hx-%04hx-%04hx%04hx%04hx",
-	                 tmp, tmp+1, tmp+2, tmp+3, tmp+4, tmp+5, tmp+6, tmp+7));
+	for (j = 0; j < 5; j++, src++)
+		for (i = 0; i < size[j]; i++, src+=2, *dest++ = v)
+			if ((v = ldm_parse_hexbyte(src)) < 0)
+				return FALSE;
+
+	return TRUE;
 }
+// FIXME: Why doesn't this work ??
 
 /**
@@ -841,15 +870,15 @@
 
 /**
- * ldm_parse_comp - Read a raw VBLK Component object into a vblk structure
+ * ldm_parse_cmp3 - Read a raw VBLK Component object into a vblk structure
  * @buffer:  The block of data being worked on
  * @buflen:  The size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
- * Read a raw VBLK Component object into a more usable vblk structure.
+ * Read a raw VBLK Component object (version 3) into a vblk structure.
  *
  * Return: TRUE   @vb contains a Component VBLK
  *         FALSE  @vb contents are not defined
  */
-static BOOL ldm_parse_comp (const u8 *buffer, int buflen, struct vblk *vb)
+static BOOL ldm_parse_cmp3 (const u8 *buffer, int buflen, struct vblk *vb)
 {
 	int r_objid, r_name, r_vstate, r_child, r_parent, r_stripe, r_cols, len;
@@ -876,5 +905,5 @@
 		return FALSE;
 
-	len += VBLK_SIZE_COMP;
+	len += VBLK_SIZE_CMP3;
 	if (len != BE32 (buffer + 0x14))
 		return FALSE;
@@ -895,15 +924,15 @@
 
 /**
- * ldm_parse_dgrp - Read a raw VBLK Disk Group object into a vblk structure
+ * ldm_parse_dgr3 - Read a raw VBLK Disk Group object into a vblk structure
  * @buffer:  The block of data being worked on
  * @buflen:  The size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
- * Read a raw VBLK Disk Group object into a more usable vblk structure.
+ * Read a raw VBLK Disk Group object (version 3) into a vblk structure.
  *
  * Return: TRUE   @vb contains a Disk Group VBLK
  *         FALSE  @vb contents are not defined
  */
-static int ldm_parse_dgrp (const u8 *buffer, int buflen, struct vblk *vb)
+static int ldm_parse_dgr3 (const u8 *buffer, int buflen, struct vblk *vb)
 {
 	int r_objid, r_name, r_diskid, r_id1, r_id2, len;
@@ -916,5 +945,5 @@
 	r_diskid = ldm_relative (buffer, buflen, 0x18, r_name);
 
-	if (buffer[0x12] & VBLK_FLAG_DGR1_IDS) {
+	if (buffer[0x12] & VBLK_FLAG_DGR3_IDS) {
 		r_id1 = ldm_relative (buffer, buflen, 0x24, r_diskid);
 		r_id2 = ldm_relative (buffer, buflen, 0x24, r_id1);
@@ -928,5 +957,5 @@
 		return FALSE;
 
-	len += VBLK_SIZE_DGR1;
+	len += VBLK_SIZE_DGR3;
 	if (len != BE32 (buffer + 0x14))
 		return FALSE;
@@ -939,15 +968,15 @@
 
 /**
- * ldm_parse_dgrp2 - Read a raw VBLK Disk Group object into a vblk structure
+ * ldm_parse_dgr4 - Read a raw VBLK Disk Group object into a vblk structure
  * @buffer:  The block of data being worked on
  * @buflen:  The size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
- * Read a raw VBLK Disk Group object into a more usable vblk structure.
+ * Read a raw VBLK Disk Group object (version 4) into a vblk structure.
  *
  * Return: TRUE   @vb contains a Disk Group VBLK
  *         FALSE  @vb contents are not defined
  */
-static BOOL ldm_parse_dgrp2 (const u8 *buffer, int buflen, struct vblk *vb)
+static BOOL ldm_parse_dgr4 (const u8 *buffer, int buflen, struct vblk *vb)
 {
 	char buf[64];
@@ -960,5 +989,5 @@
 	r_name   = ldm_relative (buffer, buflen, 0x18, r_objid);
 
-	if (buffer[0x12] & VBLK_FLAG_DGR2_IDS) {
+	if (buffer[0x12] & VBLK_FLAG_DGR4_IDS) {
 		r_id1 = ldm_relative (buffer, buflen, 0x44, r_name);
 		r_id2 = ldm_relative (buffer, buflen, 0x44, r_id1);
@@ -972,5 +1001,5 @@
 		return FALSE;
 
-	len += VBLK_SIZE_DGR2;
+	len += VBLK_SIZE_DGR4;
 	if (len != BE32 (buffer + 0x14))
 		return FALSE;
@@ -983,15 +1012,15 @@
 
 /**
- * ldm_parse_disk - Read a raw VBLK Disk object into a vblk structure
+ * ldm_parse_dsk3 - Read a raw VBLK Disk object into a vblk structure
  * @buffer:  The block of data being worked on
  * @buflen:  The size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
- * Read a raw VBLK Disk object into a more usable vblk structure.
+ * Read a raw VBLK Disk object (version 3) into a vblk structure.
  *
  * Return: TRUE   @vb contains a Disk VBLK
  *         FALSE  @vb contents are not defined
  */
-static BOOL ldm_parse_disk (const u8 *buffer, int buflen, struct vblk *vb)
+static BOOL ldm_parse_dsk3 (const u8 *buffer, int buflen, struct vblk *vb)
 {
 	int r_objid, r_name, r_diskid, r_altname, len;
@@ -1008,5 +1037,5 @@
 		return FALSE;
 
-	len += VBLK_SIZE_DSK1;
+	len += VBLK_SIZE_DSK3;
 	if (len != BE32 (buffer + 0x14))
 		return FALSE;
@@ -1024,15 +1053,15 @@
 
 /**
- * ldm_parse_disk2 - Read a raw VBLK Disk object into a vblk structure
+ * ldm_parse_dsk4 - Read a raw VBLK Disk object into a vblk structure
  * @buffer:  The block of data being worked on
  * @buflen:  The size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
- * Read a raw VBLK Disk object into a more usable vblk structure.
+ * Read a raw VBLK Disk object (versino 4) into a vblk structure.
  *
  * Return: TRUE   @vb contains a Disk VBLK
  *         FALSE  @vb contents are not defined
  */
-static BOOL ldm_parse_disk2 (const u8 *buffer, int buflen, struct vblk *vb)
+static BOOL ldm_parse_dsk4 (const u8 *buffer, int buflen, struct vblk *vb)
 {
 	int r_objid, r_name, len;
@@ -1047,5 +1076,5 @@
 		return FALSE;
 
-	len += VBLK_SIZE_DSK2;
+	len += VBLK_SIZE_DSK4;
 	if (len != BE32 (buffer + 0x14))
 		return FALSE;
@@ -1057,15 +1086,15 @@
 
 /**
- * ldm_parse_part - Read a raw VBLK Partition object into a vblk structure
+ * ldm_parse_prt3 - Read a raw VBLK Partition object into a vblk structure
  * @buffer:  The block of data being worked on
  * @buflen:  The size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
- * Read a raw VBLK Partition object into a more usable vblk structure.
+ * Read a raw VBLK Partition object (version 3) into a vblk structure.
  *
  * Return: TRUE   @vb contains a Partition VBLK
  *         FALSE  @vb contents are not defined
  */
-static BOOL ldm_parse_part (const u8 *buffer, int buflen, struct vblk *vb)
+static BOOL ldm_parse_prt3 (const u8 *buffer, int buflen, struct vblk *vb)
 {
 	int r_objid, r_name, r_size, r_parent, r_diskid, r_index, len;
@@ -1090,5 +1119,5 @@
 		return FALSE;
 
-	len += VBLK_SIZE_PART;
+	len += VBLK_SIZE_PRT3;
 	if (len != BE32 (buffer + 0x14))
 		return FALSE;
@@ -1109,15 +1138,15 @@
 
 /**
- * ldm_parse_volu - Read a raw VBLK Volume object into a vblk structure
+ * ldm_parse_vol5 - Read a raw VBLK Volume object into a vblk structure
  * @buffer:  The block of data being worked on
  * @buflen:  The size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
- * Read a raw VBLK Volume object into a more usable vblk structure.
+ * Read a raw VBLK Volume object (version 5) into a vblk structure.
  *
  * Return: TRUE   @vb contains a Volume VBLK
  *         FALSE  @vb contents are not defined
  */
-static BOOL ldm_parse_volu (const u8 *buffer, int buflen, struct vblk *vb)
+static BOOL ldm_parse_vol5 (const u8 *buffer, int buflen, struct vblk *vb)
 {
 	int r_objid, r_name, r_vtype, r_child, r_size, r_id1, r_id2, r_size2, r_drive, len;
@@ -1156,5 +1185,5 @@
 		return FALSE;
 
-	len += VBLK_SIZE_VOLU;
+	len += VBLK_SIZE_VOL5;
 	if (len != BE32 (buffer + 0x14))
 		return FALSE;
@@ -1207,7 +1236,7 @@
  * @vb:   In-memory vblk in which to return information
  *
- * Read a raw VBLK Component object into a more usable vblk structure.
- * This function just reads the information common to all VBLK types, then
- * delegates the rest of the work to help functions: parse_*.
+ * Read a raw VBLK object into a vblk structure.  This function just reads the
+ * information common to all VBLK types, then delegates the rest of the work to
+ * help functions: ldm_parse_*.
  *
  * Return: TRUE   @vb contains a VBLK
@@ -1235,18 +1264,11 @@
 
 	switch (vb->type) {
-	case VBLK_COMP:
-		result = ldm_parse_comp (buffer, buflen, vb); break;
-	case VBLK_DSK1:
-		result = ldm_parse_disk (buffer, buflen, vb); break;
-	case VBLK_DSK2:
-		result = ldm_parse_disk2(buffer, buflen, vb); break;
-	case VBLK_DGR1:
-		result = ldm_parse_dgrp (buffer, buflen, vb); break;
-	case VBLK_DGR2:
-		result = ldm_parse_dgrp2(buffer, buflen, vb); break;
-	case VBLK_PART:
-		result = ldm_parse_part (buffer, buflen, vb); break;
-	case VBLK_VOLU:
-		result = ldm_parse_volu (buffer, buflen, vb); break;
+	case VBLK_CMP3:  result = ldm_parse_cmp3 (buffer, buflen, vb); break;
+	case VBLK_DSK3:  result = ldm_parse_dsk3 (buffer, buflen, vb); break;
+	case VBLK_DSK4:  result = ldm_parse_dsk4 (buffer, buflen, vb); break;
+	case VBLK_DGR3:  result = ldm_parse_dgr3 (buffer, buflen, vb); break;
+	case VBLK_DGR4:  result = ldm_parse_dgr4 (buffer, buflen, vb); break;
+	case VBLK_PRT3:  result = ldm_parse_prt3 (buffer, buflen, vb); break;
+	case VBLK_VOL5:  result = ldm_parse_vol5 (buffer, buflen, vb); break;
 	}
 
@@ -1280,19 +1302,19 @@
 	/* Put vblk into the correct list. @vb is already sanity-checked. */
 	switch (vb->type) {
-	case VBLK_DGR1:
-	case VBLK_DGR2:
+	case VBLK_DGR3:
+	case VBLK_DGR4:
 		list_add(&vb->list, &ldb->v_dgrp);
 		return;
-	case VBLK_DSK1:
-	case VBLK_DSK2:
+	case VBLK_DSK3:
+	case VBLK_DSK4:
 		list_add(&vb->list, &ldb->v_disk);
 		return;
-	case VBLK_VOLU:
+	case VBLK_VOL5:
 		list_add(&vb->list, &ldb->v_volu);
 		return;
-	case VBLK_COMP:
+	case VBLK_CMP3:
 		list_add(&vb->list, &ldb->v_comp);
 		return;
-	case VBLK_PART:
+	case VBLK_PRT3:
 		/* Sort by partition's start sector */
 		list_for_each(item, &ldb->v_part) {

Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -U2 -r1.40 -r1.41
--- ldm.h	10 Apr 2002 15:42:00 -0000	1.40
+++ ldm.h	11 Apr 2002 14:27:39 -0000	1.41
@@ -48,11 +48,11 @@
 
 /* The defined vblk types. */
-#define VBLK_COMP		0x32		/* Component */
-#define VBLK_PART		0x33		/* Partition */
-#define VBLK_DSK1		0x34		/* Disk */
-#define VBLK_DSK2		0x44		/* Disk */
-#define VBLK_DGR1		0x35		/* Disk Group */
-#define VBLK_DGR2		0x45		/* Disk Group */
-#define VBLK_VOLU		0x51		/* Volume */
+#define VBLK_VOL5		0x51		/* Volume,     version 5 */
+#define VBLK_CMP3		0x32		/* Component,  version 3 */
+#define VBLK_PRT3		0x33		/* Partition,  version 3 */
+#define VBLK_DSK3		0x34		/* Disk,       version 3 */
+#define VBLK_DSK4		0x44		/* Disk,       version 4 */
+#define VBLK_DGR3		0x35		/* Disk Group, version 3 */
+#define VBLK_DGR4		0x45		/* Disk Group, version 4 */
 
 /* vblk flags. */
@@ -63,6 +63,6 @@
 #define	VBLK_FLAG_COMP_STRIPE	0x10
 #define	VBLK_FLAG_PART_INDEX	0x08
-#define	VBLK_FLAG_DGR1_IDS	0x08
-#define	VBLK_FLAG_DGR2_IDS	0x08
+#define	VBLK_FLAG_DGR3_IDS	0x08
+#define	VBLK_FLAG_DGR4_IDS	0x08
 #define	VBLK_FLAG_VOLU_ID1	0x08
 #define	VBLK_FLAG_VOLU_ID2	0x20
@@ -73,11 +73,11 @@
 #define VBLK_SIZE_HEAD		16
 
-#define VBLK_SIZE_COMP		22
-#define VBLK_SIZE_PART		28
-#define VBLK_SIZE_DSK1		12
-#define VBLK_SIZE_DSK2		45
-#define VBLK_SIZE_DGR1		12
-#define VBLK_SIZE_DGR2		44
-#define VBLK_SIZE_VOLU		59
+#define VBLK_SIZE_CMP3		22		/* Name and version */
+#define VBLK_SIZE_DGR3		12
+#define VBLK_SIZE_DGR4		44
+#define VBLK_SIZE_DSK3		12
+#define VBLK_SIZE_DSK4		45
+#define VBLK_SIZE_PRT3		28
+#define VBLK_SIZE_VOL5		59
 
 /* component types */
@@ -124,4 +124,6 @@
 #define FRAG_GETBAD(f)		(f->map &  (1 << (FRAG_MAPBITS-1)))
 #define FRAG_SETBAD(f)		(f->map |= (1 << (FRAG_MAPBITS-1)))
+
+typedef struct list_head list_t;
 
 struct frags {