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

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.279,1.280 NEWS,1.28,1.29

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

Changes by: cha0smaster

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

Modified Files:
	ChangeLog NEWS 
Log Message:
Update NEWS and ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- ChangeLog	24 Sep 2005 15:59:53 -0000	1.279
+++ ChangeLog	24 Sep 2005 17:00:26 -0000	1.280
@@ -45,6 +45,10 @@ xx/xx/2005 - 1.12.0-WIP
 	- Support journals which have been modified by chkdsk.  (Anton, Szaka)
 	- Support journals ($LogFile) with only one restart page as well as
           journals with two different restart pages.  (Anton, Szaka)
+	- Add @val parameter to ntfs_attr_add and @val and @size parameters to
+	  ntfs_resident_attr_record_add.  (Yura)
+	- Fix attribute list adding for always resident attributes.  (Yura)
+	- New API for hard link creating: dir.[ch]::ntfs_link.  (Yura)
 
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 

Index: NEWS
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/NEWS,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- NEWS	4 Aug 2005 09:59:40 -0000	1.28
+++ NEWS	24 Sep 2005 17:00:26 -0000	1.29
@@ -1,6 +1,10 @@
 Current news
 ============
 
+ntfsmount can create/delete/move files and directories! It's not full
+implementation, thus sometimes it will say 'Operation is not supported',
+nothing bad will happen to user data in this case.  (Yura Pakhuchiy)
+
 Add new utility: ntfsmount.  It is a FUSE module that uses on libntfs.  So,
 you need FUSE 2.3 to compile it.  This module supports file overwrite including
 changing the file size and can read/write/add/remove named data streams via

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.8.in,1.5,1.6 ntfsmount.c,1.31,1.32

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.8.in ntfsmount.c 
Log Message:
* ntfsmount: implement rename
* update man page for ntfsmount


Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ntfsmount.8.in	23 Aug 2005 12:38:37 -0000	1.5
+++ ntfsmount.8.in	24 Sep 2005 16:19:29 -0000	1.6
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2005 Yura Pakhuchiy. All Rights Reserved.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSMOUNT 8 "July 2005" "ntfsprogs version @VERSION@"
+.TH NTFSMOUNT 8 "September 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsmount \- NTFS module for FUSE.
 .SH SYNOPSIS
@@ -20,13 +20,20 @@ to compile it,
 is also highly recommended.
 .sp
 .TP
-.B NTFS FUSE features:
+.B Fully implemented ntfsmount features are:
 
-* Full read/only access to normal, sparse and compressed files.
+* Read-only access to normal, sparse and compressed files.
 
-* Can overwrite and change size of normal and sparse files.
+* Overwrite normal and sparse files *with* changes to size.
 
-* Can list/read/write/add/remove named data streams.
+* List/Read/Write/Add/Remove named data streams.
+
+.TP
+.B Partly implented features:
+
+* Create/Delete/Move files and directories.
+
+* Hard link files.
 
 .SH OPTIONS
 Below is a summary of all the options that
@@ -83,6 +90,7 @@ configuration option described in the pr
 
 .TP
 .B kernel_cache
+(NOTE: Work only with FUSE-2.3.0)
 This option disables flushing the cache of the file contents on
 every open().  This should only be enabled on filesystems, where the
 file data is never changed externally (not through the mounted FUSE
@@ -122,7 +130,8 @@ limited anyway to 32 pages (which is 128
 
 .TP
 .B force=
-Force mount even if errors occured. Use this option only if you know what are you doing and don't cry about data loss.
+Force mount even if errors occured. Use this option only if you know what
+are you doing and don't cry about data loss.
 
 .TP
 .B ro
@@ -130,7 +139,8 @@ Mount filesystem read-only.
 
 .TP
 .B no_def_opts
-By default ntfsmount acts as "default_permissions,kernel_cache,allow_other" was passed to it, this option cancel this behaviour.
+By default ntfsmount acts as "default_permissions,allow_other" was passed to it,
+this option cancel this behaviour.
 
 .TP
 .B succeed_chmod
@@ -141,11 +151,25 @@ Don't change any permissions and don't r
 Mount this device.
 
 .SH DATA STREAMS
-All data on NTFS is stored in streams, which can have names. A file can have more than one data streams, but exactly one must have no name. The size of a file is the size of its unnamed data stream. Usually when you don't specify stream name you are access to unnamed data stream. If you want access to named data stream you need to add ":stream_name" to the filename. For example: by opening "some.mp3:artist" you will open stream "artist" in "some.mp3". But windows usually prevent you from accessing to named data streams, so you need to use some program like FAR or utils from cygwin to access named data streams.
+All data on NTFS is stored in streams, which can have names.
+A file can have more than one data streams, but exactly one must have no name.
+The size of a file is the size of its unnamed data stream.
+Usually when you don't specify stream name you are access to the unnamed data
+stream.
+If you want access to named data stream you need to add ":stream_name" to the
+filename. For example: by opening "some.mp3:artist" you will open stream
+"artist" in "some.mp3".
+But windows usually prevent you from accessing to named data streams,
+so you need to use some program like FAR or utils from cygwin to access named
+data streams.
 .sp
-NTFS FUSE module don't prevent you from accessing to named data streams so you can use your preferred utils to access them. You can even delete them using
+NTFS FUSE module don't prevent you from accessing to named data streams so you
+can use your preferred utils to access them. You can even delete them using
 .B rm.
-You can list all named data streams by getting "ntfs.streams.list" extended attribute. NOTE: The last feauture is unique for NTFS FUSE module and maybe will be never supported by kernel driver.
+You can list all named data streams by getting "ntfs.streams.list" extended
+attribute. NOTE: The last feauture is unique for NTFS FUSE module and maybe
+will be never supported by kernel driver.
+
 .SH EXAMPLES
 Mount /dev/hda1 to /mnt/ntfs-fuse using NTFS FUSE module:
 .RS
@@ -153,40 +177,48 @@ Mount /dev/hda1 to /mnt/ntfs-fuse using 
 .B ntfsmount /mnt/ntfs-fuse -o dev=/dev/hda1
 .sp
 .RE
-Read-only mount /dev/hda5 to /home/user/tmp and make root to be owner of all files:
+
+Read-only mount /dev/hda5 to /home/user/tmp and make root to be owner of all
+files:
 .RS
 .sp
 .B ntfsmount /home/user/tmp -o dev=/dev/hda5,ro,uid=0
 .sp
 .RE
+
 Umount /mnt/ntfs-fuse:
 .RS
 .sp
 .B fusermount -u /mnt/ntfs-fuse
 .sp
 .RE
+
 Cat "artist" named data stream of "some.mp3":
 .RS
 .sp
 .B cat some.mp3:artist
 .sp
 .RE
+
 Write "Sympho Black Metal" to "genre" named data stream of "some.mp3":
 .RS
 .sp
 .B echo Sympho Black Metal > some.mp3:genre
 .sp
 .RE
+
 Remove "album" named data stream from "some.mp3":
 .RS
 .sp
 .B rm some.mp3:album
 .sp
 .RE
+
 List all named data streams for "some.mp3":
 .RS
 .sp
 .B getfattr -n ntfs.streams.list some.mp3
+
 .SH BUGS
 No bugs are known at present. If you find any bugs, please send an email to
 .nh

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ntfsmount.c	24 Sep 2005 15:20:49 -0000	1.31
+++ ntfsmount.c	24 Sep 2005 16:19:29 -0000	1.32
@@ -770,6 +770,19 @@ static int ntfs_fuse_unlink(const char *
 	return res;
 }
 
+static int ntfs_fuse_rename(const char *old_path, const char *new_path)
+{
+	int ret;
+	
+	if ((ret = ntfs_fuse_link(old_path, new_path)))
+		return ret;
+	if ((ret = ntfs_fuse_unlink(old_path))) {
+		ntfs_fuse_unlink(new_path);
+		return ret;
+	}
+	return 0;
+}
+
 static int ntfs_fuse_mkdir(const char *path,
 		mode_t mode __attribute__((unused)))
 {
@@ -1092,6 +1105,7 @@ static struct fuse_operations ntfs_fuse_
 	.mknod		= ntfs_fuse_mknod,
 	.link		= ntfs_fuse_link,
 	.unlink		= ntfs_fuse_unlink,
+	.rename		= ntfs_fuse_rename,
 	.mkdir		= ntfs_fuse_mkdir,
 	.rmdir		= ntfs_fuse_rmdir,
 	.utime		= ntfs_fuse_utime,

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs logfile.c,1.5,1.6 volume.c,1.50,1.51

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

Changes by: szaka

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

Modified Files:
	logfile.c volume.c 
Log Message:
- Support journals which have been modified by chkdsk.  (Anton, Szaka)
- Support journals ($LogFile) with only one restart page as well as
  journals with two different restart pages.  (Anton, Szaka)


Index: logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- logfile.c	6 Jul 2005 22:47:18 -0000	1.5
+++ logfile.c	24 Sep 2005 15:59:53 -0000	1.6
@@ -112,7 +112,7 @@ static BOOL ntfs_check_restart_page_head
 	 */
 	if (!ntfs_is_chkd_record(rp->magic) && sle64_to_cpu(rp->chkdsk_lsn)) {
 		ntfs_error(vi->i_sb, "$LogFile restart page is not modified "
-				"chkdsk but a chkdsk LSN is specified.");
+				"by chkdsk but a chkdsk LSN is specified.");
 		return FALSE;
 	}
 	ntfs_debug("Done.");
@@ -301,10 +301,12 @@ err_out:
  * @log_na:	opened ntfs attribute for journal $LogFile
  * @rp:		restart page to check
  * @pos:	position in @log_na at which the restart page resides
- * @wrp:	copy of the multi sector transfer deprotected restart page
+ * @wrp:       [OUT] copy of the multi sector transfer deprotected restart page
+ * @lsn:       [OUT] set to the current logfile lsn on success
  *
- * Check the restart page @rp for consistency and return TRUE if it is
- * consistent and FALSE otherwise.
+ * Check the restart page @rp for consistency and return 0 if it is consistent
+ * and errno otherwise.  The restart page may have been modified by chkdsk in
+ * which case its magic is CHKD instead of RSTR.
  *
  * This function only needs NTFS_BLOCK_SIZE bytes in @rp, i.e. it does not
  * require the full restart page.
@@ -312,24 +314,33 @@ err_out:
  * If @wrp is not NULL, on success, *@wrp will point to a buffer containing a
  * copy of the complete multi sector transfer deprotected page.  On failure,
  * *@wrp is undefined.
+ *
+ * Simillarly, if @lsn is not NULL, on succes *@lsn will be set to the current
+ * logfile lsn according to this restart page.  On failure, *@lsn is undefined.
+ *
+ * The following error codes are defined:
+ *     EINVAL - The restart page is inconsistent.
+ *     ENOMEM - Not enough memory to load the restart page.
+ *     EIO    - Failed to reading from $LogFile.
  */
-static BOOL ntfs_check_and_load_restart_page(ntfs_attr *log_na,
-		RESTART_PAGE_HEADER *rp, s64 pos, RESTART_PAGE_HEADER **wrp)
+static int ntfs_check_and_load_restart_page(ntfs_attr *log_na,
+		RESTART_PAGE_HEADER *rp, s64 pos, RESTART_PAGE_HEADER **wrp,
+		LSN *lsn)
 {
 	RESTART_AREA *ra;
 	RESTART_PAGE_HEADER *trp;
-	BOOL ret;
+	int err;
 
 	ntfs_debug("Entering.");
 	/* Check the restart page header for consistency. */
 	if (!ntfs_check_restart_page_header(rp, pos)) {
 		/* Error output already done inside the function. */
-		return FALSE;
+		return EINVAL;
 	}
 	/* Check the restart area for consistency. */
 	if (!ntfs_check_restart_area(rp)) {
 		/* Error output already done inside the function. */
-		return FALSE;
+		return EINVAL;
 	}
 	ra = (RESTART_AREA*)((u8*)rp + le16_to_cpu(rp->restart_area_offset));
 	/*
@@ -340,7 +351,7 @@ static BOOL ntfs_check_and_load_restart_
 	if (!trp) {
 		ntfs_error(vi->i_sb, "Failed to allocate memory for $LogFile "
 				"restart page buffer.");
-		return FALSE;
+		return ENOMEM;
 	}
 	/*
 	 * Read the whole of the restart page into the buffer.  If it fits
@@ -353,36 +364,67 @@ static BOOL ntfs_check_and_load_restart_
 		if (ntfs_attr_pread(log_na, pos, le32_to_cpu(
 					rp->system_page_size), trp) !=
 					le32_to_cpu(rp->system_page_size)) {
+			err = errno;
 			ntfs_error(, "Failed to read whole restart page into "
 					"the buffer.");
+			if (err != ENOMEM)
+				err = EIO;
 			goto err_out;
 		}
 	/* Perform the multi sector transfer deprotection on the buffer. */
 	if (ntfs_mst_post_read_fixup((NTFS_RECORD*)trp,
 			le32_to_cpu(rp->system_page_size))) {
-		ntfs_error(vi->i_sb, "Multi sector transfer error detected in "
-				"$LogFile restart page.");
-		goto err_out;
-	}
-	/* Check the log client records for consistency. */
-	ret = ntfs_check_log_client_array(trp);
-	if (ret && wrp)
-		*wrp = trp;
-	else
-		free(trp);
+		/*
+		 * A multi sector tranfer error was detected.  We only need to
+		 * abort if the restart page contents exceed the multi sector
+		 * transfer fixup of the first sector.
+		 */
+		if (le16_to_cpu(rp->restart_area_offset) +
+				le16_to_cpu(ra->restart_area_length) >
+				NTFS_BLOCK_SIZE - sizeof(u16)) {
+			ntfs_error(vi->i_sb, "Multi sector transfer error "
+				   "detected in $LogFile restart page.");
+			err = EINVAL;
+			goto err_out;
+	       }
+	}
+	/*
+	 * If the restart page is modified by chkdsk or there are no active
+	 * logfile clients, the logfile is consistent.  Otherwise, need to
+	 * check the log client records for consistency, too.
+	 */
+	err = 0;
+	if (ntfs_is_rstr_record(rp->magic) &&
+			ra->client_in_use_list != LOGFILE_NO_CLIENT) {
+		if (!ntfs_check_log_client_array(trp)) {
+			err = EINVAL;
+			goto err_out;
+		}
+	}
+	if (lsn) {
+		if (ntfs_is_rstr_record(rp->magic))
+			*lsn = sle64_to_cpu(ra->current_lsn);
+		else /* if (ntfs_is_chkd_record(rp->magic)) */
+			*lsn = sle64_to_cpu(rp->chkdsk_lsn);
+	}
 	ntfs_debug("Done.");
-	return ret;
+	if (wrp)
+		*wrp = trp;
+	else {
 err_out:
-	free(trp);
-	return FALSE;
+		free(trp);
+	}
+	return err;
 }
 
 /**
  * ntfs_check_logfile - check in the journal if the volume is consistent
  * @log_na:	ntfs attribute of loaded journal $LogFile to check
+ * @rp:         [OUT] on success this is a copy of the current restart page
  *
  * Check the $LogFile journal for consistency and return TRUE if it is
- * consistent and FALSE if not.
+ * consistent and FALSE if not.  On success, the current restart page is
+ * returned in *@rp.  Caller must call ntfs_free(*@rp) when finished with it.
  *
  * At present we only check the two restart pages and ignore the log record
  * pages.
@@ -392,17 +434,16 @@ err_out:
  * if the $LogFile was created on a system with a different page size to ours
  * yet and mst deprotection would fail if our page size is smaller.
  */
-BOOL ntfs_check_logfile(ntfs_attr *log_na)
+BOOL ntfs_check_logfile(ntfs_attr *log_na, RESTART_PAGE_HEADER **rp)
 {
-	s64 size, pos, rstr1_pos, rstr2_pos;
+	s64 size, pos;
+	LSN rstr1_lsn, rstr2_lsn;
 	ntfs_volume *vol = log_na->ni->vol;
-	u8 *buf = NULL;
+	u8 *kaddr = NULL;
 	RESTART_PAGE_HEADER *rstr1_ph = NULL;
 	RESTART_PAGE_HEADER *rstr2_ph = NULL;
-	int log_page_size, log_page_mask, ofs;
+	int log_page_size, log_page_mask, err;
 	BOOL logfile_is_empty = TRUE;
-	BOOL rstr1_found = FALSE;
-	BOOL rstr2_found = FALSE;
 	u8 log_page_bits;
 
 	ntfs_debug("Entering.");
@@ -432,8 +473,8 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n
 		return FALSE;
 	}
 	/* Allocate memory for restart page. */
-	buf = malloc(NTFS_BLOCK_SIZE);
-	if (!buf) {
+	kaddr = malloc(NTFS_BLOCK_SIZE);
+	if (!kaddr) {
 		ntfs_error(, "Not enough memory.");
 		return FALSE;
 	}
@@ -449,7 +490,7 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n
 		/*
 		 * Read first NTFS_BLOCK_SIZE bytes of potential restart page.
 		 */
-		if (ntfs_attr_pread(log_na, pos, NTFS_BLOCK_SIZE, buf) !=
+		if (ntfs_attr_pread(log_na, pos, NTFS_BLOCK_SIZE, kaddr) !=
 				NTFS_BLOCK_SIZE) {
 			ntfs_error(, "Failed to read first NTFS_BLOCK_SIZE "
 					"bytes of potential restart page.");
@@ -461,7 +502,7 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n
 		 * empty block after a non-empty block has been encountered
 		 * means we are done.
 		 */
-		if (!ntfs_is_empty_recordp((le32*)buf))
+		if (!ntfs_is_empty_recordp((le32*)kaddr))
 			logfile_is_empty = FALSE;
 		else if (!logfile_is_empty)
 			break;
@@ -469,59 +510,53 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n
 		 * A log record page means there cannot be a restart page after
 		 * this so no need to continue searching.
 		 */
-		if (ntfs_is_rcrd_recordp((le32*)buf))
+		if (ntfs_is_rcrd_recordp((le32*)kaddr))
 			break;
-		/*
-		 * A modified by chkdsk restart page means we cannot handle
-		 * this log file.
-		 */
-		if (ntfs_is_chkd_recordp((le32*)buf)) {
-			ntfs_error(vol->sb, "$LogFile has been modified by "
-					"chkdsk.  Mount this volume in "
-					"Windows.");
-			goto err_out;
-		}
-		/* If not a restart page, continue. */
-		if (!ntfs_is_rstr_recordp((le32*)buf)) {
-			/* Skip to the minimum page size for the next one. */
+		/* If not a (modified by chkdsk) restart page, continue. */
+		if (!ntfs_is_rstr_recordp((le32*)kaddr) &&
+				!ntfs_is_chkd_recordp((le32*)kaddr)) {
 			if (!pos)
 				pos = NTFS_BLOCK_SIZE >> 1;
 			continue;
 		}
-		/* We now know we have a restart page. */
-		if (!pos) {
-			rstr1_found = TRUE;
-			rstr1_pos = pos;
-		} else {
-			if (rstr2_found) {
-				ntfs_error(vol->sb, "Found more than two "
-						"restart pages in $LogFile.");
-				goto err_out;
-			}
-			rstr2_found = TRUE;
-			rstr2_pos = pos;
-		}
 		/*
-		 * Check the restart page for consistency and get a copy of the
-		 * complete multi sector transfer deprotected restart page.
+		 * Check the (modified by chkdsk) restart page for consistency
+		 * and get a copy of the complete multi sector transfer
+		 * deprotected restart page.
 		 */
-		if (!ntfs_check_and_load_restart_page(log_na,
-				(RESTART_PAGE_HEADER*)buf, pos,
-				!pos ? &rstr1_ph : &rstr2_ph)) {
-			/* Error output already done inside the function. */
-			goto err_out;
+		err = ntfs_check_and_load_restart_page(log_na,
+				(RESTART_PAGE_HEADER*)kaddr, pos,
+				!rstr1_ph ? &rstr1_ph : &rstr2_ph,
+				!rstr1_ph ? &rstr1_lsn : &rstr2_lsn);
+		if (!err) {
+			/*
+			 * If we have now found the first (modified by chkdsk)
+			 * restart page, continue looking for the second one.
+			 */
+			if (!pos) {
+				pos = NTFS_BLOCK_SIZE >> 1;
+				continue;
+			}
+			/*
+			 * We have now found the second (modified by chkdsk)
+			 * restart page, so we can stop looking.
+			 */
+			break;
 		}
 		/*
-		 * We have a valid restart page.  The next one must be after
-		 * a whole system page size as specified by the valid restart
-		 * page.
+		 * Error output already done inside the function.  Note, we do
+		 * not abort if the restart page was invalid as we might still
+		 * find a valid one further in the file.
 		 */
+		if (err != EINVAL)
+		      goto err_out;
+		/* Continue looking. */
 		if (!pos)
-			pos = le32_to_cpu(rstr1_ph->system_page_size) >> 1;
+			pos = NTFS_BLOCK_SIZE >> 1;
 	}
-	if (buf) {
-		free(buf);
-		buf = NULL;
+	if (kaddr) {
+		free(kaddr);
+		kaddr = NULL;
 	}
 	if (logfile_is_empty) {
 		NVolSetLogFileEmpty(vol);
@@ -529,31 +564,37 @@ is_empty:
 		ntfs_debug("Done.  ($LogFile is empty.)");
 		return TRUE;
 	}
-	if (!rstr1_found || !rstr2_found) {
-		ntfs_error(vol->sb, "Did not find two restart pages in "
-				"$LogFile.");
-		goto err_out;
-	}
-	/*
-	 * The two restart areas must be identical except for the update
-	 * sequence number.
-	 */
-	ofs = le16_to_cpu(rstr1_ph->usa_ofs);
-	if (memcmp(rstr1_ph, rstr2_ph, ofs) || (ofs += sizeof(u16),
-			memcmp((u8*)rstr1_ph + ofs, (u8*)rstr2_ph + ofs,
-			le32_to_cpu(rstr1_ph->system_page_size) - ofs))) {
-		ntfs_error(vol->sb, "The two restart pages in $LogFile do not "
-				"match.");
-		goto err_out;
+	if (!rstr1_ph) {
+		if (rstr2_ph)
+			ntfs_error(vol->sb, "BUG: rstr2_ph isn't NULL!");
+		ntfs_error(vol->sb, "Did not find any restart pages in "
+			   "$LogFile and it was not empty.");
+		return FALSE;
+	}
+	/* If both restart pages were found, use the more recent one. */
+	if (rstr2_ph) {
+		/*
+		 * If the second restart area is more recent, switch to it.
+		 * Otherwise just throw it away.
+		 */
+		if (rstr2_lsn > rstr1_lsn) {
+			free(rstr1_ph);
+			rstr1_ph = rstr2_ph;
+			/* rstr1_lsn = rstr2_lsn; */
+		} else  
+			free(rstr2_ph);
+		rstr2_ph = NULL;
 	}
-	free(rstr1_ph);
-	free(rstr2_ph);
 	/* All consistency checks passed. */
+	if (rp)
+		*rp = rstr1_ph;
+	else
+		free(rstr1_ph);
 	ntfs_debug("Done.");
 	return TRUE;
 err_out:
-	if (buf)
-		free(buf);
+	if (kaddr)
+		free(kaddr);
 	if (rstr1_ph)
 		free(rstr1_ph);
 	if (rstr2_ph)
@@ -564,6 +605,7 @@ err_out:
 /**
  * ntfs_is_logfile_clean - check in the journal if the volume is clean
  * @log_na:	ntfs attribute of loaded journal $LogFile to check
+ * @rp:         copy of the current restart page
  *
  * Analyze the $LogFile journal and return TRUE if it indicates the volume was
  * shutdown cleanly and FALSE if not.
@@ -580,9 +622,8 @@ err_out:
  * is empty this function requires that NVolLogFileEmpty() is true otherwise an
  * empty volume will be reported as dirty.
  */
-BOOL ntfs_is_logfile_clean(ntfs_attr *log_na)
+BOOL ntfs_is_logfile_clean(ntfs_attr *log_na, RESTART_PAGE_HEADER *rp)
 {
-	RESTART_PAGE_HEADER *rp;
 	RESTART_AREA *ra;
 
 	ntfs_debug("Entering.");
@@ -591,29 +632,19 @@ BOOL ntfs_is_logfile_clean(ntfs_attr *lo
 		ntfs_debug("Done.  ($LogFile is empty.)");
 		return TRUE;
 	}
-	/* Allocate memory. */
-	rp = malloc(NTFS_BLOCK_SIZE);
 	if (!rp) {
-		ntfs_error(, "Not enough memory.");
+		ntfs_error(, "Restart page header is NULL.");
 		return FALSE;
 	}
-	/*
-	 * Read the first restart page.  It will be possibly incomplete and
-	 * will not be multi sector transfer deprotected but we only need the
-	 * first NTFS_BLOCK_SIZE bytes so it does not matter.
-	 */
-	if (ntfs_attr_pread(log_na, 0, NTFS_BLOCK_SIZE, rp) !=
-			NTFS_BLOCK_SIZE) {
-		ntfs_error(, "Failed to read first restart page.");
-		goto err_out;
-	}
-	if (!ntfs_is_rstr_record(rp->magic)) {
-		ntfs_error(vol->sb, "No restart page found at offset zero in "
-				"$LogFile.  This is probably a bug in that "
-				"the $LogFile should have been consistency "
-				"checked before calling this function.");
-		goto err_out;
+	if (!ntfs_is_rstr_record(rp->magic) &&
+			!ntfs_is_chkd_record(rp->magic)) {
+		ntfs_error(vol->sb, "Restart page buffer is invalid.  This is "
+			   "probably a bug in that the $LogFile should "
+			   "have been consistency checked before calling "
+			   "this function.");
+		return FALSE;
 	}
+
 	ra = (RESTART_AREA*)((u8*)rp + le16_to_cpu(rp->restart_area_offset));
 	/*
 	 * If the $LogFile has active clients, i.e. it is open, and we do not
@@ -623,15 +654,11 @@ BOOL ntfs_is_logfile_clean(ntfs_attr *lo
 	if (ra->client_in_use_list != LOGFILE_NO_CLIENT &&
 			!(ra->flags & RESTART_VOLUME_IS_CLEAN)) {
 		ntfs_debug("Done.  $LogFile indicates a dirty shutdown.");
-		goto err_out;
+		return FALSE;
 	}
-	free(rp);
 	/* $LogFile indicates a clean shutdown. */
 	ntfs_debug("Done.  $LogFile indicates a clean shutdown.");
 	return TRUE;
-err_out:
-	free(rp);
-	return FALSE;
 }
 
 /**

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- volume.c	26 Aug 2005 11:44:12 -0000	1.50
+++ volume.c	24 Sep 2005 15:59:53 -0000	1.51
@@ -1,7 +1,7 @@
 /*
  * volume.c - NTFS volume handling code. Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000-2004 Anton Altaparmakov
+ * Copyright (c) 2000-2005 Anton Altaparmakov
  * Copyright (c) 2002-2005 Szabolcs Szakacsits
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -566,6 +566,7 @@ static int ntfs_volume_check_logfile(ntf
 {
 	ntfs_inode *ni;
 	ntfs_attr *na = NULL;
+	RESTART_PAGE_HEADER *rp = NULL;
 	int err = 0;
 
 	if ((ni = ntfs_inode_open(vol, FILE_LogFile)) == NULL) {
@@ -578,8 +579,10 @@ static int ntfs_volume_check_logfile(ntf
 		err = EIO;
 		goto exit;
 	}
-	if (!ntfs_check_logfile(na) || !ntfs_is_logfile_clean(na))
+	if (!ntfs_check_logfile(na, &rp) || !ntfs_is_logfile_clean(na, rp))
 		err = EOPNOTSUPP;
+	if (rp)
+		free(rp);
 exit:
 	if (na)
 		ntfs_attr_close(na);

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs logfile.h,1.12,1.13

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

Changes by: szaka

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

Modified Files:
	logfile.h 
Log Message:
- Support journals which have been modified by chkdsk.  (Anton, Szaka)
- Support journals ($LogFile) with only one restart page as well as
  journals with two different restart pages.  (Anton, Szaka)


Index: logfile.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/logfile.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- logfile.h	6 Jul 2005 22:47:03 -0000	1.12
+++ logfile.h	24 Sep 2005 15:59:53 -0000	1.13
@@ -1,7 +1,7 @@
 /*
  * logfile.h - Exports for $LogFile handling.  Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000-2004 Anton Altaparmakov
+ * Copyright (c) 2000-2005 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
@@ -376,8 +376,8 @@ typedef struct {
 	} __attribute__((__packed__)) lcn_list[0];
 } __attribute__ ((__packed__)) LOG_RECORD;
 
-extern BOOL ntfs_check_logfile(ntfs_attr *log_na);
-extern BOOL ntfs_is_logfile_clean(ntfs_attr *log_na);
+extern BOOL ntfs_check_logfile(ntfs_attr *log_na, RESTART_PAGE_HEADER **rp);
+extern BOOL ntfs_is_logfile_clean(ntfs_attr *log_na, RESTART_PAGE_HEADER *rp);
 extern int ntfs_empty_logfile(ntfs_attr *na);
 
 #endif /* defined _NTFS_LOGFILE_H */

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.278,1.279

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
- Support journals which have been modified by chkdsk.  (Anton, Szaka)
- Support journals ($LogFile) with only one restart page as well as
  journals with two different restart pages.  (Anton, Szaka)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- ChangeLog	31 Aug 2005 14:31:53 -0000	1.278
+++ ChangeLog	24 Sep 2005 15:59:53 -0000	1.279
@@ -42,6 +42,9 @@ xx/xx/2005 - 1.12.0-WIP
 	  libntfs/volume.c.  Needed to compile on DOS with djgpp.  (Christophe)
 	- Switch ntfsmount to use getopt_long.  (Yuval, minor fixes by Yura)
 	- ntfsmount: Fix 'df' output.  (Yuval)
+	- Support journals which have been modified by chkdsk.  (Anton, Szaka)
+	- Support journals ($LogFile) with only one restart page as well as
+          journals with two different restart pages.  (Anton, Szaka)
 
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs unistr.c,1.25,1.26

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

Changes by: szaka

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

Modified Files:
	unistr.c 
Log Message:
Fix ntfs_names_collate() input sanity check intrudoced in cleanups by 
reverting to the original one


Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- unistr.c	23 Aug 2005 12:17:39 -0000	1.25
+++ unistr.c	24 Sep 2005 15:29:54 -0000	1.26
@@ -115,7 +115,7 @@ int ntfs_names_collate(const ntfschar *n
 	ntfschar c1, c2;
 
 #ifdef DEBUG
-	if (!name1 || !name2 || (ic && (!upcase || !upcase_len))) {
+	if (!name1 || !name2 || (ic && !upcase && upcase_len)) {
 		Dputs("ntfs_names_collate received NULL pointer!");
 		exit(1);
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.23,1.24

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

Changes by: cha0smaster

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

Modified Files:
	dir.c 
Log Message:
add ntfs_link, update ntfsmount to use it


Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- dir.c	16 Sep 2005 14:28:18 -0000	1.23
+++ dir.c	24 Sep 2005 15:20:49 -0000	1.24
@@ -1406,3 +1406,96 @@ err_out:
 	err = errno;
 	goto out;
 }
+
+/**
+ * ntfs_link - create hard link for file or directory
+ * @ni:		ntfs inode for object to create hard link
+ * @dir_ni:	ntfs inode for directory in which new link should be placed
+ * @name:	unicode name of the new link
+ * @name_len:	length of the name in unicode characters
+ *
+ * Return 0 on success or -1 on error with errno set to the error code.
+ */
+int ntfs_link(ntfs_inode *ni, ntfs_inode *dir_ni, ntfschar *name, u8 name_len)
+{
+	FILE_NAME_ATTR *fn = NULL;
+	int fn_len, err;
+
+	ntfs_debug("Entering.");
+	if (!ni || !dir_ni || !name || !name_len) {
+		err = errno;
+		ntfs_error(, "Invalid arguments.");
+		goto err_out;
+	}
+	/* Create FILE_NAME attribute. */
+	fn_len = sizeof(FILE_NAME_ATTR) + name_len * sizeof(ntfschar);
+	fn = calloc(1, fn_len);
+	if (!fn) {
+		err = errno;
+		ntfs_error(, "Not enough memory.");
+		goto err_out;
+	}
+	fn->parent_directory = MK_LE_MREF(dir_ni->mft_no,
+			le16_to_cpu(dir_ni->mrec->sequence_number));
+	fn->file_name_length = name_len;
+	fn->file_name_type = FILE_NAME_POSIX;
+	if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY)
+		fn->file_attributes = FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT;
+	fn->creation_time = utc2ntfs(ni->creation_time);
+	fn->last_data_change_time = utc2ntfs(ni->last_data_change_time);
+	fn->last_mft_change_time = utc2ntfs(ni->last_mft_change_time);
+	fn->last_access_time = utc2ntfs(ni->last_access_time);
+	memcpy(fn->file_name, name, name_len * sizeof(ntfschar));
+	/* Add FILE_NAME attribute to index. */
+	if (ntfs_index_add_filename(dir_ni, fn, MK_MREF(ni->mft_no,
+			le16_to_cpu(ni->mrec->sequence_number)))) {
+		err = errno;
+		ntfs_error(, "Failed to add entry to the index.");
+		goto err_out;
+	}
+	/* Add FILE_NAME attribute to inode. */
+	if (ntfs_attr_add(ni, AT_FILE_NAME, AT_UNNAMED, 0, (u8*)fn, fn_len)) {
+		ntfs_index_context *ictx;
+
+		err = errno;
+		ntfs_error(, "Failed to add FILE_NAME attribute.");
+		/* Try to remove just added attribute from index. */
+		ictx = ntfs_index_ctx_get(dir_ni, I30, 4);
+		if (!ictx)
+			goto rollback_failed;
+		if (ntfs_index_lookup(fn, fn_len, ictx)) {
+			ntfs_index_ctx_put(ictx);
+			goto rollback_failed;
+		}
+		if (ntfs_index_rm(ictx)) {
+			ntfs_index_ctx_put(ictx);
+			goto rollback_failed;
+		}
+		goto err_out;
+	}
+	/* Increment hard links count. */
+	ni->mrec->link_count = cpu_to_le16(le16_to_cpu(
+			ni->mrec->link_count) + 1);
+	/*
+	 * Do not set attributes and file size, instead of this mark filenames
+	 * dirty to force attribute and size update during sync. 
+	 * NOTE: File size may will be not updated and not all attributes will
+	 * be set, but it is acceptable since windows driver does not update
+	 * all file names when one of the hard links changed.
+	 * FIXME: It will be nice to update them all.
+	 */
+	NInoFileNameSetDirty(ni);
+	/* Done! */
+	ntfs_inode_mark_dirty(ni);
+	free(fn);
+	ntfs_debug("Done.");
+	return 0;
+rollback_failed:
+	ntfs_error(, "Rollback failed. Leaving inconsist metadata.");
+err_out:
+	ntfs_error(, "Failed.");
+	if (fn)
+		free(fn);
+	errno = err;
+	return -1;
+}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.30,1.31

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
add ntfs_link, update ntfsmount to use it


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ntfsmount.c	24 Sep 2005 13:05:36 -0000	1.30
+++ ntfsmount.c	24 Sep 2005 15:20:49 -0000	1.31
@@ -628,6 +628,54 @@ static int ntfs_fuse_mknod(const char *o
 	return res;
 }
 
+static int ntfs_fuse_link(const char *old_path, const char *new_path)
+{
+	char *name;
+	ntfschar *uname = NULL;
+	ntfs_inode *dir_ni = NULL, *ni;
+	char *path;
+	int res = 0, uname_len;
+
+	path = strdup(new_path);
+	if (!path)
+		return -errno;
+	/* Open file for which create hard link. */
+	ni = ntfs_pathname_to_inode(ctx->vol, NULL, old_path);
+	if (!ni) {
+		res = -errno;
+		goto exit;
+	}
+	/* Generate unicode filename. */
+	name = strrchr(path, '/');
+	name++;
+	uname_len = ntfs_mbstoucs(name, &uname, 0);
+	if (uname_len < 0) {
+		res = -errno;
+		goto exit;
+	}
+	/* Open parent directory. */
+	*name = 0;
+	dir_ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
+	if (!dir_ni) {
+		res = -errno;
+		if (res == -ENOENT)
+			res = -EIO;
+		goto exit;
+	}
+	/* Create hard link. */
+	if (ntfs_link(ni, dir_ni, uname, uname_len))
+		res = -errno;
+exit:
+	if (ni)
+		ntfs_inode_close(ni);
+	if (uname)
+		free(uname);
+	if (dir_ni)
+		ntfs_inode_close(dir_ni);
+	free(path);
+	return res;
+}
+
 static int ntfs_fuse_rm(const char *org_path)
 {
 	char *name;
@@ -1042,6 +1090,7 @@ static struct fuse_operations ntfs_fuse_
 	.statfs		= ntfs_fuse_statfs,
 	.chmod		= ntfs_fuse_chmod,
 	.mknod		= ntfs_fuse_mknod,
+	.link		= ntfs_fuse_link,
 	.unlink		= ntfs_fuse_unlink,
 	.mkdir		= ntfs_fuse_mkdir,
 	.rmdir		= ntfs_fuse_rmdir,

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

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

Changes by: cha0smaster

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

Modified Files:
	dir.h 
Log Message:
add ntfs_link, update ntfsmount to use it


Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/dir.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dir.h	14 Aug 2005 15:44:47 -0000	1.5
+++ dir.h	24 Sep 2005 15:20:49 -0000	1.6
@@ -44,6 +44,8 @@ extern ntfs_inode *ntfs_create(ntfs_inod
 		const unsigned type);
 extern int ntfs_delete(ntfs_inode *ni, ntfs_inode *dir_ni, ntfschar *name,
 		u8 name_len);
+extern int ntfs_link(ntfs_inode *ni, ntfs_inode *dir_ni, ntfschar *name,
+		u8 name_len);
 
 /*
  * File types (adapted from include <linux/fs.h>)

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.174,1.175

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

Changes by: cha0smaster

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

Modified Files:
	attrib.c 
Log Message:
attrib.c: fix line to be <=80 characters long


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- attrib.c	16 Sep 2005 14:28:18 -0000	1.174
+++ attrib.c	24 Sep 2005 13:06:59 -0000	1.175
@@ -4373,8 +4373,8 @@ retry:
 			/* Remove unused attribute record. */
 			if (ntfs_attr_record_rm(ctx)) {
 				err = errno;
-				Dprintf("%s(): Couldn't remove unused attribute "
-					"record.\n", __FUNCTION__);
+				Dprintf("%s(): Couldn't remove unused attribute"
+					" record.\n", __FUNCTION__);
 				goto put_err_out;
 			}
 			ntfs_attr_reinit_search_ctx(ctx);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.29,1.30

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
Remove 'use_ino' because I'm afraid I can not use it with "file:stream" nammed data stream access interface. :-(


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ntfsmount.c	16 Sep 2005 14:30:08 -0000	1.29
+++ ntfsmount.c	24 Sep 2005 13:05:36 -0000	1.30
@@ -1401,9 +1401,9 @@ int main(int argc, char *argv[])
 	}
 	free(parsed_options);
 #ifndef DEBUG
-	fh = fuse_new(ffd, "use_ino", &ntfs_fuse_oper, sizeof(ntfs_fuse_oper));
+	fh = fuse_new(ffd, NULL, &ntfs_fuse_oper, sizeof(ntfs_fuse_oper));
 #else
-	fh = fuse_new(ffd, "debug,use_ino", &ntfs_fuse_oper,
+	fh = fuse_new(ffd, "debug", &ntfs_fuse_oper,
 			sizeof(ntfs_fuse_oper));
 #endif
 	if (!fh) {

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrlist.c,1.28,1.29

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

Changes by: cha0smaster

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

Modified Files:
	attrlist.c 
Log Message:
fix attribute list adding


Index: attrlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrlist.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- attrlist.c	22 Aug 2005 21:33:07 -0000	1.28
+++ attrlist.c	24 Sep 2005 13:03:07 -0000	1.29
@@ -99,6 +99,7 @@ int ntfs_attrlist_entry_add(ntfs_inode *
 	ATTR_LIST_ENTRY *ale;
 	MFT_REF mref;
 	ntfs_attr *na = NULL;
+	ntfs_attr_search_ctx *ctx;
 	u8 *new_al;
 	int entry_len, entry_offset, err;
 
@@ -133,41 +134,46 @@ int ntfs_attrlist_entry_add(ntfs_inode *
 		return -1;
 	}
 
-	/* Find offset at which insert new entry. */
-	ale = (ATTR_LIST_ENTRY *) ni->attr_list;
-	for(; (u8 *)ale < ni->attr_list + ni->attr_list_size;
-				ale = (ATTR_LIST_ENTRY *)((u8 *) ale +
-				le16_to_cpu(ale->length))) {
-		if (le32_to_cpu(ale->type) < le32_to_cpu(attr->type))
-			continue;
-		if (le32_to_cpu(ale->type) > le32_to_cpu(attr->type))
-			break;
-		err = ntfs_names_collate(ale->name, ale->name_length,
-			(ntfschar*)((u8*)attr + le16_to_cpu(attr->name_offset)),
-			attr->name_length, -2, CASE_SENSITIVE, NULL, 0);
-		if (err == -2) {
-			err = EIO;
-			Dprintf("%s(): Corrupt attribute name. Run chkdsk.\n",
-						__FUNCTION__);
+	/* Find place for the new entry. */
+	ctx = ntfs_attr_get_search_ctx(ni, NULL);
+	if (!ctx) {
+		err = errno;
+		Dprintf("%s(): Failed to obtain attribute search context.\n",
+				__FUNCTION__);
+		goto err_out;
+	}
+	if (!ntfs_attr_lookup(attr->type, (attr->name_length) ? (ntfschar*)
+			((u8*)attr + le16_to_cpu(attr->name_offset)) :
+			AT_UNNAMED, attr->name_length, CASE_SENSITIVE,
+			(attr->non_resident) ? le64_to_cpu(attr->lowest_vcn) :
+			0, (attr->non_resident) ? NULL : ((u8*)attr +
+			le16_to_cpu(attr->value_offset)), (attr->non_resident) ?
+			0 : le32_to_cpu(attr->value_length), ctx)) {
+		/* Found some extent, check it to be before new extent. */
+		if (ctx->al_entry->lowest_vcn == attr->lowest_vcn) {
+			err = EEXIST;
+			Dprintf("%s(): Such attribute already present in the "
+					"attribute list.\n", __FUNCTION__);
+			ntfs_attr_put_search_ctx(ctx);
 			goto err_out;
 		}
-		if (err < 0)
-			continue;
-		if (err > 0)
-			break;
-		if (sle64_to_cpu(ale->lowest_vcn) <
-				sle64_to_cpu(attr->lowest_vcn))
-			continue;
-		if (sle64_to_cpu(ale->lowest_vcn) ==
-				sle64_to_cpu(attr->lowest_vcn)) {
-			err = EEXIST;
-			Dprintf("%s(): Attribute with same type, name and "
-				"lowest vcn already present in attribute "
-				"list.\n", __FUNCTION__);
+		/* Add new entry after this extent. */
+		ale = (ATTR_LIST_ENTRY*)((u8*)ctx->al_entry +
+				le16_to_cpu(ctx->al_entry->length));
+	} else {
+		/* Check for real errors. */
+		if (errno != ENOENT) {
+			err = errno;
+			Dprintf("%s(): Attribute lookup failed.\n",
+					__FUNCTION__);
+			ntfs_attr_put_search_ctx(ctx);
 			goto err_out;
 		}
-		break;
+		/* No previous extents found. */
+		ale = ctx->al_entry;
 	}
+	/* Don't need it anymore, @ctx->al_entry points to @ni->attr_list. */
+	ntfs_attr_put_search_ctx(ctx);
 
 	/* Determine new entry offset. */
 	entry_offset = ((u8 *)ale - ni->attr_list);

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs version.c,NONE,1.1 Makefile.am,1.29,1.30

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

Changes by: flatcap

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

Modified Files:
	Makefile.am 
Added Files:
	version.c 
Log Message:
Christophe: add easily accessible version info to libntfs


--- NEW FILE ---
/**
 * version.c - Info about the NTFS library. Part of the Linux-NTFS project.
 *
 * Copyright (c) 2005 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
 */

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#include "version.h"

#ifndef VERSION
#define VERSION "unknown"
#endif

/**
 * ntfs_get_library_version - Version number of the library release
 *
 * Returns a text string representing the release of libntfs, e.g. "1.9.4".
 */
const char * ntfs_get_library_version (void)
{
	return VERSION;
}


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- Makefile.am	5 Aug 2005 23:51:26 -0000	1.29
+++ Makefile.am	22 Sep 2005 16:41:43 -0000	1.30
@@ -54,6 +54,7 @@ libntfs_la_SOURCES =	\
 	runlist.c	\
 	security.c	\
 	unistr.c	\
+	version.c	\
 	volume.c
 
 if ENABLE_GNOME_VFS

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs version.h,NONE,1.1 Makefile.am,1.8,1.9

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

Changes by: flatcap

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

Modified Files:
	Makefile.am 
Added Files:
	version.h 
Log Message:
Christophe: add easily accessible version info to libntfs


--- NEW FILE ---
/**
 * version.h - Info about the NTFS library. Part of the Linux-NTFS project.
 *
 * Copyright (c) 2005 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 _NTFS_VERSION_H_
#define _NTFS_VERSION_H_

extern const char * ntfs_get_library_version (void);

#endif /* _NTFS_VERSION_H_ */


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- Makefile.am	4 Aug 2005 09:59:41 -0000	1.8
+++ Makefile.am	22 Sep 2005 16:41:43 -0000	1.9
@@ -29,6 +29,7 @@ linux_ntfsinclude_HEADERS = \
 	ntfstime.h		\
 	types.h			\
 	unistr.h		\
+	version.h		\
 	volume.h
 
 MAINTAINERCLEANFILES = Makefile.in

[Linux-NTFS-cvs] CVS: ntfsprogs/test Makefile.am,1.1,1.2

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

Changes by: flatcap

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

Modified Files:
	Makefile.am 
Log Message:
minor improvements to test build

Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/test/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile.am	13 Sep 2005 14:30:54 -0000	1.1
+++ Makefile.am	20 Sep 2005 19:24:09 -0000	1.2
@@ -38,9 +38,6 @@ test:	$(TEST_RUNLIST) testz testp testf
 testz:	$(TEST_RUNLIST)
 	@$(TEST_VALGRIND) $(TEST_RUNLIST) zero > zero
 	@diff -qs {runlist-data/,}zero
-	@echo
-	@echo Success
-	@echo
 
 testp:	$(TEST_RUNLIST)
 	@for i in contig noncontig; do						\
@@ -49,19 +46,13 @@ testp:	$(TEST_RUNLIST)
 			L2=`echo $$j | cut -b1`;				\
 			FILE=pure-$$L1$$L2;					\
 			$(TEST_VALGRIND) $(TEST_RUNLIST) pure $$i $$j > $$FILE;	\
-			diff -qs {runlist-data/,}$$FILE;				\
+			diff -qs {runlist-data/,}$$FILE;			\
 		done;								\
 	done
-	@echo
-	@echo Success
-	@echo
 
 testf:	$(TEST_RUNLIST)
 	@for i in 123 132 213 231 312 321; do					\
 		$(TEST_VALGRIND) $(TEST_RUNLIST) frag $$i > frag$$i;		\
-		diff -qs {runlist-data/,}frag$$i;					\
+		diff -qs {runlist-data/,}frag$$i;				\
 	done
-	@echo
-	@echo Success
-	@echo
 

[Linux-NTFS-cvs] CVS: ntfsprogs Makefile.am,1.19,1.20

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

Changes by: flatcap

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

Modified Files:
	Makefile.am 
Log Message:
minor improvements to test build

Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- Makefile.am	14 Sep 2005 12:23:08 -0000	1.19
+++ Makefile.am	20 Sep 2005 19:24:09 -0000	1.20
@@ -1,5 +1,5 @@
 
-SUBDIRS = doc include libntfs ntfsprogs test
+SUBDIRS = doc include libntfs ntfsprogs
 
 EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.libntfs ChangeLog \
 		INSTALL NEWS README autogen.sh ntfsprogs.spec.in \
@@ -8,7 +8,7 @@ EXTRA_DIST = AUTHORS CREDITS COPYING TOD
 AUTOMAKE_OPTIONS = gnu
 
 MAINTAINERCLEANFILES = configure Makefile.in aclocal.m4 compile depcomp \
-	install-sh missing config.guess config.sub config.h.in INSTALL
+	install-sh ltmain.sh missing config.guess config.sub config.h.in INSTALL
 
 dist-hook: ntfsprogs.spec
 	cp ntfsprogs.spec $(distdir)
@@ -30,6 +30,7 @@ extras: libs
 if ENABLE_TEST
 test:	libs
 	(cd test && $(MAKE) all test) || exit 1;
+SUBDIRS += test
 else
 .PHONY: test
 test:

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.8.in,1.18,1.19

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

Changes by: szaka

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

Modified Files:
	ntfsclone.8.in 
Log Message:
ntfsclone manual: update --ignore-fs-check option description


Index: ntfsclone.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.8.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ntfsclone.8.in	28 Jun 2005 21:09:35 -0000	1.18
+++ ntfsclone.8.in	20 Sep 2005 16:24:26 -0000	1.19
@@ -5,7 +5,7 @@
 .\" All Rights Reserved.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFSCLONE 8 "Jun 2005" "ntfsprogs version @VERSION@"
+.TH NTFSCLONE 8 "Sep 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsclone \- Efficiently clone, image, restore or rescue an NTFS
 .SH SYNOPSIS
@@ -197,7 +197,8 @@ You can't metadata-only clone to a devic
 Ignore the result of the filesystem consistency check. This option is allowed
 to be used only with the 
 .BR --metadata 
-option, for the safety of user's data.
+option, for the safety of user's data. The clusters which cause the 
+inconsistency are saved too.
 .TP
 .B \-f, \-\-force
 Forces ntfsclone to proceed if the filesystem is marked 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsrm.c,1.59,1.60

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

Changes by: flatcap

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

Modified Files:
	ntfsrm.c 
Log Message:
more code juggling
try and sort out transfer

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- ntfsrm.c	17 Aug 2005 15:59:27 -0000	1.59
+++ ntfsrm.c	20 Sep 2005 00:05:49 -0000	1.60
@@ -43,7 +43,7 @@ GEN_PRINTF (Eprintf, stderr, NULL,      
 GEN_PRINTF (Vprintf, stdout, &opts.verbose, TRUE)
 GEN_PRINTF (Qprintf, stdout, &opts.quiet,   FALSE)
 
-#define RM_WRITE 1
+#define RM_WRITE 0
 
 /**
  * version - Print version information about the program
@@ -857,46 +857,6 @@ static int ntfs_inode_close2 (ntfs_inode
 	return ntfs_inode_close (ni);
 }
 
-/**
- * utils_index_init
- */
-static int utils_index_init (ntfs_volume *vol, u8 *buffer, int size)
-{
-	INDEX_ALLOCATION *alloc;
-	INDEX_ENTRY_HEADER *header;
-
-	if (!vol)
-		return 1;
-	if (!buffer)
-		return 1;
-	if (size < 512)
-		return 1;
-
-	memset (buffer, 0, size);
-
-	alloc = (INDEX_ALLOCATION*) buffer;
-
-	alloc->magic           = magic_INDX;
-	alloc->usa_ofs         = 0x28;
-	alloc->usa_count       = (size >> vol->sector_size_bits) + 1;
-	alloc->lsn             = 0;
-	alloc->index_block_vcn = 0;
-
-	alloc->index.entries_offset   = 0x40;
-	alloc->index.index_length     = 0x10;
-	alloc->index.allocated_size   = size - 0x18;
-	alloc->index.flags            = 0;
-
-	header = (INDEX_ENTRY_HEADER*) (buffer + 0x40);
-
-	header->indexed_file = 0;
-	header->length       = 0x10;
-	header->key_length   = 0;
-	header->flags        = INDEX_ENTRY_END;
-
-	return 0;
-}
-
 
 /**
  * ntfs_dt_free
@@ -1049,7 +1009,46 @@ static BOOL ntfs_dt_create_children2 (st
 	memset ((u8*)dt->sub_nodes + old, 0, (new - old) * sizeof (*dt->sub_nodes));
 	memset ((u8*)dt->inodes    + old, 0, (new - old) * sizeof (*dt->inodes));
 
-	return (dt->children && dt->sub_nodes && dt->inodes);
+	return TRUE;
+}
+
+/**
+ * ntfs_dt_resize_children3
+ */
+static BOOL ntfs_dt_resize_children3 (struct ntfs_dt *dt, int new)
+{
+	int old;
+
+	// XXX calculate for 2K and 4K indexes max and min filenames (inc/exc VCN)
+	// XXX assumption:  sizeof (*dt->children) == sizeof (*dt->sub_nodes) == sizeof (*dt->inodes)
+	// XXX put back blocking factor
+
+	if (!dt)
+		return FALSE;
+
+	old = dt->child_count;
+	if (old == new)
+		return TRUE;
+
+	dt->child_count = new;
+
+	old *= sizeof (*dt->children);
+	new *= sizeof (*dt->children);
+
+	dt->children  = realloc (dt->children,  new);
+	dt->sub_nodes = realloc (dt->sub_nodes, new);
+	dt->inodes    = realloc (dt->inodes,    new);
+
+	if (!dt->children || !dt->sub_nodes || !dt->inodes)
+		return FALSE;
+
+	if (new > old) {
+		memset ((u8*)dt->children  + old, 0, (new - old));
+		memset ((u8*)dt->sub_nodes + old, 0, (new - old));
+		memset ((u8*)dt->inodes    + old, 0, (new - old));
+	}
+
+	return TRUE;
 }
 
 /**
@@ -1087,8 +1086,7 @@ static int ntfs_dt_root_count (struct nt
 	while (ptr < (buffer + size)) {
 		entry = (INDEX_ENTRY*) ptr;
 
-		dt->child_count++;
-		ntfs_dt_create_children2 (dt, dt->child_count); // XXX retval
+		ntfs_dt_resize_children3 (dt, dt->child_count + 1); // XXX retval
 
 		if (entry->flags & INDEX_ENTRY_NODE) {
 			vcn = ntfs_ie_get_vcn ((INDEX_ENTRY*) ptr);
@@ -1142,11 +1140,11 @@ static int ntfs_dt_alloc_count (struct n
 
 	//printf ("block size %d\n", block->index.index_length);
 	dt->child_count = 0;
+	//printf ("start = 0x%02X, end = 0x%02X\n", 0x18 + block->index.entries_offset, 0x18 + block->index.index_length);
 	while (ptr < (buffer + 0x18 + block->index.index_length)) {
 		entry = (INDEX_ENTRY*) ptr;
 
-		dt->child_count++;
-		ntfs_dt_create_children2 (dt, dt->child_count); // XXX retval
+		ntfs_dt_resize_children3 (dt, dt->child_count + 1); // XXX retval
 
 		if (entry->flags & INDEX_ENTRY_NODE) {
 			vcn = ntfs_ie_get_vcn ((INDEX_ENTRY*) ptr);
@@ -1172,6 +1170,48 @@ static int ntfs_dt_alloc_count (struct n
 }
 
 /**
+ * ntfs_dt_initialise2
+ */
+static int ntfs_dt_initialise2 (ntfs_volume *vol, struct ntfs_dt *dt)
+{
+	INDEX_ALLOCATION *alloc;
+	INDEX_ENTRY *entry;
+
+	if (!vol)
+		return 1;
+	if (!dt)
+		return 1;
+
+	memset (dt->data, 0, dt->data_len);
+
+	alloc = (INDEX_ALLOCATION*) dt->data;
+
+	alloc->magic           = magic_INDX;
+	alloc->usa_ofs         = 0x28;
+	alloc->usa_count       = (dt->data_len >> vol->sector_size_bits) + 1;
+	alloc->lsn             = 0;
+	alloc->index_block_vcn = 0;
+
+	alloc->index.entries_offset   = 0x28;
+	alloc->index.index_length     = 0x10 + 0x28;
+	alloc->index.allocated_size   = dt->data_len - 0x18;
+	alloc->index.flags            = 0;
+
+	entry = (INDEX_ENTRY*) (dt->data + 0x40);
+
+	entry->indexed_file = 0;
+	entry->length       = 0x10;
+	entry->key_length   = 0;
+	entry->flags        = INDEX_ENTRY_END;
+
+	ntfs_dt_resize_children3 (dt, 1);		// XXX retval
+
+	dt->children[0] = entry;
+
+	return 0;
+}
+
+/**
  * ntfs_dt_create
  */
 static struct ntfs_dt * ntfs_dt_create (struct ntfs_dir *dir, struct ntfs_dt *parent, VCN vcn)
@@ -1209,7 +1249,7 @@ static struct ntfs_dt * ntfs_dt_create (
 			//printf ("%lld\n", ntfs_attr_mst_pread (dir->ialloc, vcn*512, 1, dt->data_len, dt->data));
 			ntfs_attr_mst_pread (dir->ialloc, vcn*512, 1, dt->data_len, dt->data);
 		} else {
-			utils_index_init (dir->vol, dt->data, dt->data_len);
+			ntfs_dt_initialise2 (dir->vol, dt);
 		}
 
 		//utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS);
@@ -1644,55 +1684,418 @@ static int ntfs_dt_alloc_freespace (stru
 }
 
 /**
- * ntfs_dt_initialise
+ * ntfs_dt_transfer
  */
-static int ntfs_dt_initialise (struct ntfs_dt *dt, VCN vcn)
+static int ntfs_dt_transfer (struct ntfs_dt *old, struct ntfs_dt *new, int start, int count)
 {
-	INDEX_BLOCK *block;
-	INDEX_ENTRY *ie;
+	int i;
+	int need;
+	int space;
+	INDEX_ENTRY *mov_ie;
+	u8 *src;
+	u8 *dst;
+	int len;
+	int insert;
+	//FILE_NAME_ATTR *file;
 
-	if (!dt || !dt->data)
+	//XXX check len > 0
+
+	if (!old || !new)
 		return -1;
 
-	memset (dt->data, 0, dt->data_len);
+	if ((start < 0) || ((start+count) >= old->child_count))
+		return -1;
 
-	// Ought to check these are empty
-	free (dt->children);
-	free (dt->sub_nodes);
+	printf ("\n");
+	printf (BOLD YELLOW "Transferring children\n" END);
+
+	need = 0;
+	for (i = start; i < (start+count+1); i++) {
+		mov_ie = old->children[i];
+		need += mov_ie->length;
+		//file = &mov_ie->key.file_name; printf ("\ttrn name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n");
+	}
+
+	if (ntfs_dt_isroot (new))
+		space = ntfs_dt_root_freespace (new);
+	else
+		space = ntfs_dt_alloc_freespace (new);
+
+	// XXX if this is an index root, it'll go badly wrong
+	// restrict to allocs only?
 
-	dt->children  = NULL;
-	dt->sub_nodes = NULL;
+	printf ("\tneed  = %d\n", need);
+	printf ("\tspace = %d\n", space);
 
-	if (!ntfs_dt_create_children2 (dt, 1))
+	if (space < need)
 		return -1;
 
-	block = (INDEX_BLOCK*) dt->data;
+	if (new->child_count == 1) {
+		i = -1;
+	} else {
+		ntfschar *n1, *n2;
+		int l1, l2;
+
+		n1 = new->children[0]->key.file_name.file_name;
+		l1 = new->children[0]->key.file_name.file_name_length;
+
+		n2 = old->children[start]->key.file_name.file_name;
+		l2 = old->children[start]->key.file_name.file_name_length;
+
+		i = ntfs_names_collate (n1, l1, n2, l2,
+					2, IGNORE_CASE,
+					old->dir->vol->upcase,
+					old->dir->vol->upcase_len);
+	}
+
+	if ((i == 0) || (i == 2))
+		return -1;
+
+	// determine the insertion point
+	if (i == 1)
+		insert = 0;
+	else
+		insert = new->child_count-1;
+
+	src = (u8*) new->children[insert];
+	dst = src + need;
+	len = (u8*) new->children[new->child_count-1] + new->children[new->child_count-1]->length - src;
+
+	//printf ("src = %d, dst = %d, len = %d\n", src - new->data, dst - new->data, len);
+	memmove (dst, src, len);
+
+	dst = src;
+	src = (u8*) old->children[start];
+	len = need;
+
+	memcpy (dst, src, len);
+
+	src = (u8*) old->children[start+count-1];
+	dst = (u8*) old->children[start];
+	len = (u8*) old->children[old->child_count-1] + old->children[old->child_count-1]->length - src;
+
+	//printf ("src = %d, dst = %d, len = %d\n", src - old->data, dst - old->data, len);
+	memmove (dst, src, len);
+
+	dst += len;
+	len = old->data + old->dir->index_size - dst;
+
+	//printf ("dst = %d, len = %d\n", dst - old->data, len);
+	memset (dst, 0, len);
+
+	if (!ntfs_dt_resize_children3 (new, new->child_count + count))
+		return -1;
+
+	src = (u8*) &old->sub_nodes[start+count-1];
+	dst = (u8*) &old->sub_nodes[start];
+	len = (old->child_count - start - count + 1) * sizeof (struct ntfs_dt*);
+
+	memmove (dst, src, len);
+
+	src = (u8*) &new->sub_nodes[insert];
+	dst = (u8*) &new->sub_nodes[insert+count-1];
+	len = (new->child_count - insert - count + 1) * sizeof (struct ntfs_dt*);
+
+	memmove (dst, src, len);
+
+	if (!ntfs_dt_resize_children3 (old, old->child_count - count))
+		return -1;
+
+	src = (u8*) new->children[0];
+	for (i = 0; i < new->child_count; i++) {
+		new->children[i] = (INDEX_ENTRY*) src;
+		src += new->children[i]->length;
+	}
 
-	block->magic                = magic_INDX;
-	block->usa_ofs              = 0x28;
-	block->usa_count            = (dt->data_len >> 9) + 1;
-	block->index_block_vcn      = vcn;
-	block->index.entries_offset = 0x28;
-	block->index.index_length   = 0x38;
-	block->index.allocated_size = dt->data_len - 0x18;
-
-	ie = (INDEX_ENTRY*) (dt->data + block->index.entries_offset + 0x18);
+	src = (u8*) old->children[0];
+	for (i = 0; i < old->child_count; i++) {
+		old->children[i] = (INDEX_ENTRY*) src;
+		src += old->children[i]->length;
+	}
 
-	ie->length = 0x10;
-	ie->flags  = INDEX_ENTRY_END;
+	old->header->index_length -= need;
+	new->header->index_length += need;
 
-	dt->children[0]  = ie;
-	dt->sub_nodes[0] = NULL;
+	// resize children and sub_nodes
+	// memmove keys in new
+	// memcpy old to new
+	// memmove keys in old
+	// rebuild old/new children/sub_nodes without destroying tree
+	// update old/new headers
+
+	old->changed = TRUE;
+	new->changed = TRUE;
 
-	//utils_dump_mem (dt->data, 0, block->index.index_length+0x18, DM_DEFAULTS);
+	printf (GREEN "Modified: inode %lld, $INDEX_ALLOCATION vcn %lld-%lld\n" END, old->dir->inode->mft_no, old->vcn, old->vcn + (old->dir->index_size>>9) - 1);
+	printf (GREEN "Modified: inode %lld, $INDEX_ALLOCATION vcn %lld-%lld\n" END, new->dir->inode->mft_no, new->vcn, new->vcn + (new->dir->index_size>>9) - 1);
 
 	return 0;
 }
 
+
 /**
- * ntfs_dt_transfer
+ * ntfs_dt_alloc_insert
  */
-static int ntfs_dt_transfer (struct ntfs_dt *old, struct ntfs_dt *new, int start, int count)
+static int ntfs_dt_alloc_insert (struct ntfs_dt *dt, INDEX_ENTRY *first, int count)
+{
+	// XXX don't bother measuring, just subtract the children pointers
+
+	int i;
+	int need;
+	INDEX_ENTRY *ie;
+	INDEX_ALLOCATION *alloc;
+	u8 *src;
+	u8 *dst;
+	int len;
+
+	if (!dt)
+		return 1;
+	if (!first)
+		return 1;
+
+	need = 0;
+	ie = first;
+	for (i = 0; i < count; i++) {
+		need += ie->length;
+		ie = (INDEX_ENTRY*) ((u8*)ie + ie->length);
+	}
+
+	printf ("alloc insert %d bytes\n", need);
+
+	alloc = (INDEX_ALLOCATION*) dt->data;
+	printf ("entries_offset = %d\n", alloc->index.entries_offset);
+	printf ("index_length   = %d\n", alloc->index.index_length);
+	printf ("allocated_size = %d\n", alloc->index.allocated_size);
+
+	printf ("insert has %d children\n", dt->child_count);
+	printf ("children = %p\n", dt->children);
+	//utils_dump_mem (dt->data, 0, 128, DM_DEFAULTS);
+
+	ie = dt->children[dt->child_count-1];
+
+	printf ("last child = %p (%ld)\n", ie, (long)ie - (long)dt->data);
+	printf ("size = %d\n", ie->length);
+
+	src = (u8*) ie;
+	dst = src + need;
+	len = ie->length;
+
+	memmove (dst, src, len);
+
+	src = (u8*) first;
+	dst = (u8*) ie;
+	len = need;
+
+	memcpy (dst, src, len);
+
+	// use create children
+	// measure need and update children list
+	// adjust headers
+
+	utils_dump_mem (dt->data, 0, 256, DM_DEFAULTS);
+	return 0;
+}
+
+/**
+ * ntfs_dt_alloc_insert2
+ */
+static INDEX_ENTRY * ntfs_dt_alloc_insert2 (struct ntfs_dt *dt, int before, int count, int bytes)
+{
+	int space;
+	u8 *src;
+	u8 *dst;
+	int len;
+
+	// XXX don't bother measuring, just subtract the children pointers
+
+	if (!dt)
+		return NULL;
+	if (before < 0)
+		return NULL;
+	if (count < 1)
+		return NULL;
+	if (bytes < 1)
+		return NULL;
+
+	// check alloc has enough space
+	space = ntfs_dt_alloc_freespace (dt);
+	if (bytes > space)
+		return NULL;
+
+	// move data
+	src = (u8*) dt->children[before];
+	dst = src + bytes;
+	len = dt->header->index_length - ((int)dt->children[before] - (int)dt->data) + 24;
+
+	//printf ("%d, %d, %d\n", (int)src - (int)dt->data, (int)dst - (int)dt->data, len);
+
+	memmove (dst, src, len);
+	memset (dst, 0, bytes);
+
+	// resize arrays
+	ntfs_dt_resize_children3 (dt, dt->child_count + count);
+
+	// move keys (children)
+	src = (u8*) (dt->children + before);
+	dst = src + (count * sizeof (u8*));
+	len = (dt->child_count - count - before) * sizeof (u8*);
+
+	memmove (dst, src, len);
+	memset (src, 0, count * sizeof (u8*));
+
+	// move keys (inodes)
+	src = (u8*) (dt->inodes + before);
+	dst = src + (count * sizeof (u8*));
+	len = (dt->child_count - count - before) * sizeof (u8*);
+
+	memmove (dst, src, len);
+	memset (src, 0, count * sizeof (u8*));
+
+	// move keys (sub_nodes)
+	src = (u8*) (dt->sub_nodes + before);
+	dst = src + (count * sizeof (u8*));
+	len = (dt->child_count - count - before) * sizeof (u8*);
+
+	memmove (dst, src, len);
+	memset (src, 0, count * sizeof (u8*));
+
+	return NULL;
+}
+
+/**
+ * ntfs_dt_root_insert
+ */
+static int ntfs_dt_root_insert (struct ntfs_dt *dt, INDEX_ENTRY *first, int count)
+{
+	if (!dt)
+		return 1;
+	if (!first)
+		return 1;
+
+	return count;
+}
+
+
+/**
+ * utils_array_insert
+ */
+static int utils_array_insert (void *ptr, int asize, int before, int count)
+{
+	static int esize = sizeof (u8*);
+	u8 *src;
+	u8 *dst;
+	int len;
+
+	if (!ptr)
+		return -1;
+
+	src = (u8*) ptr + (before * esize);
+ 	dst = src + (count * esize);
+	len = (asize - before) * esize;
+
+	// XXX what about realloc?
+	memmove (dst, src, len);
+
+	len = count * esize;
+
+	memset (src, 0, len);
+
+	return 0;
+}
+
+/**
+ * utils_array_remove
+ */
+static int utils_array_remove (void *ptr, int asize, int first, int count)
+{
+	static int esize = sizeof (u8*);
+	u8 *src;
+	u8 *dst;
+	int len;
+
+	if (!ptr)
+		return -1;
+
+	dst = (u8*) ptr + (first * esize);
+ 	src = dst + (count * esize);
+	len = (asize - first) * esize;
+
+	memmove (dst, src, len);
+
+	src = (u8*) ptr + ((asize - count) * esize);
+	len = count * esize;
+
+	memset (src, 0, len);
+	// XXX don't want to memset, want to realloc
+
+	return 0;
+}
+
+
+/**
+ * ntfs_dt_alloc_remove2
+ */
+static int ntfs_dt_alloc_remove2 (struct ntfs_dt *dt, int start, int count)
+{
+	int i;
+	int size;
+
+	if (!dt)
+		return 1;
+
+	size = 0;
+	for (i = start; i < (start+count); i++) {
+		size += dt->children[i]->length;
+	}
+
+	return start + count;
+}
+
+/**
+ * ntfs_dt_root_remove2
+ */
+static int ntfs_dt_root_remove2 (struct ntfs_dt *dt, int start, int count)
+{
+	int i;
+	int size;
+
+	if (!dt)
+		return -1;
+	if ((start < 0) || (start >= dt->child_count))
+		return -1;
+	if ((count < 1) || ((start + count - 1) >= dt->child_count))
+		return -1;
+
+	printf ("s c/t %d %d/%d\n", start, count, dt->child_count);
+
+	size = 0;
+	for (i = start; i < (start + count); i++)
+		size += dt->children[i]->length;
+	printf ("size1 = %d\n", size);
+
+	size = (int) dt->children[start+count] - (int) dt->children[start];
+	printf ("size2 = %d\n", size);
+
+	size = (int) dt->children[start+count-1] - (int) dt->children[start] + dt->children[start+count-1]->length;
+	printf ("size3 = %d\n", size);
+
+	// XXX what shall we do with the inodes?
+	// transfer them to the dir (commit them for now)
+	// are they _our_ responsibility?  probably not
+
+	// rearrange arrays
+	// shrink attribute
+
+	ntfs_dt_resize_children3 (dt, dt->child_count - count);
+
+	printf ("ntfs_dt_root_remove2\n");
+	return dt->child_count;
+}
+
+/**
+ * ntfs_dt_transfer2
+ */
+static int ntfs_dt_transfer2 (struct ntfs_dt *old, struct ntfs_dt *new, int start, int count)
 {
 	int i;
 	int need;
@@ -1704,19 +2107,20 @@ static int ntfs_dt_transfer (struct ntfs
 	int insert;
 	//FILE_NAME_ATTR *file;
 
-	//XXX check len > 0
-
 	if (!old || !new)
 		return -1;
 
-	if ((start < 0) || ((start+count) >= old->child_count))
+	if ((start < 0) || (count < 0))
+		return -1;
+
+	if ((start + count) >= old->child_count)
 		return -1;
 
 	printf ("\n");
 	printf (BOLD YELLOW "Transferring children\n" END);
 
 	need = 0;
-	for (i = start; i < (start+count+1); i++) {
+	for (i = start; i < (start+count); i++) {
 		mov_ie = old->children[i];
 		need += mov_ie->length;
 		//file = &mov_ie->key.file_name; printf ("\ttrn name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n");
@@ -1727,15 +2131,25 @@ static int ntfs_dt_transfer (struct ntfs
 	else
 		space = ntfs_dt_alloc_freespace (new);
 
-	// XXX if this is an index root, it'll go badly wrong
-	// restrict to allocs only?
-
 	printf ("\tneed  = %d\n", need);
 	printf ("\tspace = %d\n", space);
 
-	if (space < need)
+	if (need > space)
 		return -1;
 
+	if (ntfs_dt_isroot (new))
+		ntfs_dt_root_insert (new, old->children[0], count);
+	else
+		ntfs_dt_alloc_insert2 (new, 0, count, need);
+
+	if (ntfs_dt_isroot (old))
+		ntfs_dt_root_remove2 (old, 0, count);
+	else
+		ntfs_dt_alloc_remove2 (old, 0, count);
+
+	if (1) return -1;
+	if (0) ntfs_dt_alloc_insert (NULL, NULL, 0);
+
 	if (new->child_count == 1) {
 		i = -1;
 	} else {
@@ -1789,8 +2203,7 @@ static int ntfs_dt_transfer (struct ntfs
 	//printf ("dst = %d, len = %d\n", dst - old->data, len);
 	memset (dst, 0, len);
 
-	new->child_count += count;
-	if (!ntfs_dt_create_children2 (new, new->child_count))
+	if (!ntfs_dt_resize_children3 (new, new->child_count + count))
 		return -1;
 
 	src = (u8*) &old->sub_nodes[start+count-1];
@@ -1805,8 +2218,7 @@ static int ntfs_dt_transfer (struct ntfs
 
 	memmove (dst, src, len);
 
-	old->child_count -= count;
-	if (!ntfs_dt_create_children2 (old, old->child_count))
+	if (!ntfs_dt_resize_children3 (old, old->child_count - count))
 		return -1;
 
 	src = (u8*) new->children[0];
@@ -2183,13 +2595,12 @@ static int ntfs_mft_add_index (struct nt
 	// can't replace ie yet, there may not be room
 	ntfs_ie_free (ie);
 
-	//ntfs_dt_transfer (dir->index, dt, 0, 7);
+	ntfs_dt_transfer2 (dir->index, dt, 0, dir->index->child_count - 1);
 
 	printf ("root has %d children\n", dir->index->child_count);
 	printf ("node has %d children\n", dt->child_count);
 
 	ntfs_dt_free (dt);
-	//utils_index_init (vol, buffer, dir->index_size);
 
 	// create a new dt
 	// attach dt to dir
@@ -2523,7 +2934,6 @@ static BOOL ntfs_dt_root_remove (struct 
 	del->data = realloc (del->data, del->data_len);
 	del->header = (INDEX_HEADER*) (del->data + 0x10);
 
-
 	//utils_dump_mem (del->data, 0, del->data_len, DM_GREEN | DM_RED);
 
 	src = (u8*) (&del->children[del_num+1]);
@@ -2865,6 +3275,7 @@ static int ntfs_dt_root_add (struct ntfs
 	src = parent->data     + 0x18 + parent->header->entries_offset;
 	len = parent->data_len - 0x18 - parent->header->entries_offset;
 
+	// XXX can we rebase the children more simply? (in alloc_add too)
 	while (src < (parent->data + parent->data_len)) {
 		entry = (INDEX_ENTRY*) src;
 
@@ -2988,7 +3399,9 @@ ascend:
 	//printf ("\tnode has %d children\n", suc->child_count);
 
 	// initialise new node
-	ntfs_dt_initialise (new, vcn);
+	// XXX ntfs_dt_initialise (new, vcn);
+
+	goto done;
 
 	// find median key
 	median = (suc->child_count+1) / 2;
@@ -3506,6 +3919,7 @@ static int ntfs_volume_umount2 (ntfs_vol
 static ntfs_volume * ntfs_volume_mount2 (const char *device, unsigned long flags, BOOL force)
 {
 	// XXX can we replace these and search by mft number?  Hmm... NO.
+	// unless I have a recursive search for an MFT number
 	static ntfschar bmp[8] = {
 		const_cpu_to_le16('$'),
 		const_cpu_to_le16('B'),
@@ -3573,7 +3987,7 @@ static ntfs_volume * ntfs_volume_mount2 
 
 	//$Bitmap
 	num = -1;
-	found = ntfs_dt_find2 (root, bmp, 7, &num);
+	found = ntfs_dt_find2 (root, bmp, sizeof (bmp) - 1, &num);
 	if ((!found) || (num < 0)) {
 		printf ("can't find $Bitmap\n");
 		ntfs_volume_umount2 (vol, FALSE);
@@ -3586,7 +4000,7 @@ static ntfs_volume * ntfs_volume_mount2 
 
 	//$MFT
 	num = -1;
-	found = ntfs_dt_find2 (root, mft, 4, &num);
+	found = ntfs_dt_find2 (root, mft, sizeof (mft) - 1, &num);
 	if ((!found) || (num < 0)) {
 		printf ("can't find $MFT\n");
 		ntfs_volume_umount2 (vol, FALSE);
@@ -3599,7 +4013,7 @@ static ntfs_volume * ntfs_volume_mount2 
 
 	//$MFTMirr
 	num = -1;
-	found = ntfs_dt_find2 (root, mftmirr, 8, &num);
+	found = ntfs_dt_find2 (root, mftmirr, sizeof (mftmirr) - 1, &num);
 	if ((!found) || (num < 0)) {
 		printf ("can't find $MFTMirr\n");
 		ntfs_volume_umount2 (vol, FALSE);
@@ -3940,19 +4354,15 @@ static int ntfs_file_remove (ntfs_volume
 	printf (BOLD YELLOW "Find childless parent:\n" END);
 #if 0
 	for (par = del->parent, old = par; par; old = par, par = par->parent) {
-		printf (CYAN "marker 1\n" END);
 		if (par->child_count > 1)
 			break;
-		printf (CYAN "marker 2\n" END);
 		par_num = ntfs_dt_find_parent (par);
 	}
 #endif
 
-	printf (CYAN "marker 3\n" END); fflush (stdout);
 	printf ("del = %p, parent = %p\n", del, del->parent);
 	par = del->parent;
 	par_num = ntfs_dt_find_parent (del);
-	printf (CYAN "marker 4\n" END); fflush (stdout);
 
 	//utils_dump_mem (par->data, 0, par->data_len, DM_BLUE|DM_GREEN|DM_INDENT);
 
@@ -4365,6 +4775,9 @@ done:
 
 	if (0) utils_pathname_to_inode2 (NULL, NULL, NULL, NULL);
 	if (0) ntfs_ie_remove_name (NULL);
+	if (0) ntfs_dt_transfer2 (NULL, NULL, 0, 0);
+	if (0) utils_array_remove (NULL, 0, 0, 0);
+	if (0) utils_array_insert (NULL, 0, 0, 0);
 
 	return result;
 }

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs runlist.c,1.57,1.58

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

Changes by: flatcap

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

Modified Files:
	runlist.c 
Log Message:
*cough* remove some debug #ifdefs


Index: runlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- runlist.c	19 Sep 2005 20:50:01 -0000	1.57
+++ runlist.c	19 Sep 2005 20:58:54 -0000	1.58
@@ -1871,7 +1871,6 @@ static void test_rl_pure (char *contig, 
 	static runlist_element file4[] = {
 		{    0,   -3,   0 }	/* NOENT */
 	};
-#if 0
 	static runlist_element file5[] = {
 		{    0,   -2, 100 },	/* NOTMAP */
 		{  100, 1100, 100 },	/* DATA */
@@ -1885,7 +1884,6 @@ static void test_rl_pure (char *contig, 
 		{  100,   -2, 100 },	/* NOTMAP */
 		{  200,   -3,   0 }	/* NOENT */
 	};
-#endif
 	BOOL c, m;
 
 	if (strcmp (contig, "contig") == 0)
@@ -1925,7 +1923,6 @@ static void test_rl_pure (char *contig, 
 	test_rl_pure_test (18, c, m, 140,  40, file3, sizeof (file3));
 	test_rl_pure_test (19, c, m,   0,  40, file4, sizeof (file4));
 	test_rl_pure_test (20, c, m,  40,  40, file4, sizeof (file4));
-#if 0
 	test_rl_pure_test (21, c, m,   0,  40, file5, sizeof (file5));
 	test_rl_pure_test (22, c, m,  40,  40, file5, sizeof (file5));
 	test_rl_pure_test (23, c, m,  60,  40, file5, sizeof (file5));
@@ -1940,7 +1937,6 @@ static void test_rl_pure (char *contig, 
 	test_rl_pure_test (32, c, m, 400, 100, file5, sizeof (file5));
 	test_rl_pure_test (33, c, m, 160, 100, file6, sizeof (file6));
 	test_rl_pure_test (34, c, m, 100, 140, file6, sizeof (file6));
-#endif
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs runlist.c,1.56,1.57

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

Changes by: flatcap

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

Modified Files:
	runlist.c 
Log Message:
fix a couple of range bugs (insert,replace)
Anton: fix mergeable - use to merge non-adjacent holes
Anton: factor out "tail" in replace - simplifying code
comment and retest code

Index: runlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- runlist.c	15 Sep 2005 23:42:02 -0000	1.56
+++ runlist.c	19 Sep 2005 20:50:01 -0000	1.57
@@ -111,17 +111,21 @@ static __inline__ BOOL ntfs_rl_are_merge
 		return FALSE;
 	}
 
-	if ((dst->lcn < 0) || (src->lcn < 0)) {    /* Are we merging holes? */
-		if (dst->lcn == LCN_HOLE && src->lcn == LCN_HOLE)
-			return TRUE;
+	/* We can merge unmapped regions even if they are misaligned. */
+	if ((dst->lcn == LCN_RL_NOT_MAPPED) && (src->lcn == LCN_RL_NOT_MAPPED))
+		return TRUE;
+	/* If the runs are misaligned, we cannot merge them. */
+	if ((dst->vcn + dst->length) != src->vcn)
 		return FALSE;
-	}
-	if ((dst->lcn + dst->length) != src->lcn) /* Are the runs contiguous? */
-		return FALSE;
-	if ((dst->vcn + dst->length) != src->vcn) /* Are the runs misaligned? */
-		return FALSE;
-
-	return TRUE;
+	/* If both runs are non-sparse and contiguous, we can merge them. */
+	if ((dst->lcn >= 0) && (src->lcn >= 0) &&
+		((dst->lcn + dst->length) == src->lcn))
+		return TRUE;
+	/* If we are merging two holes, we can merge them. */
+	if ((dst->lcn == LCN_HOLE) && (src->lcn == LCN_HOLE))
+		return TRUE;
+	/* Cannot merge. */
+	return FALSE;
 }
 
 /**
@@ -166,7 +170,7 @@ static __inline__ void __ntfs_rl_merge(r
 static __inline__ runlist_element *ntfs_rl_append(runlist_element *dst,
 		int dsize, runlist_element *src, int ssize, int loc)
 {
-	BOOL right;		/* Right end of @src needs merging */
+	BOOL right = FALSE;	/* Right end of @src needs merging */
 	int marker;		/* End of the inserted runs */
 
 	if (!dst || !src) {
@@ -176,7 +180,8 @@ static __inline__ runlist_element *ntfs_
 	}
 
 	/* First, check if the right hand end needs merging. */
-	right = ntfs_rl_are_mergeable(src + ssize - 1, dst + loc + 1);
+	if ((loc + 1) < dsize)
+		right = ntfs_rl_are_mergeable(src + ssize - 1, dst + loc + 1);
 
 	/* Space required: @dst size + @src size, less one if we merged. */
 	dst = ntfs_rl_realloc(dst, dsize, dsize + ssize - right);
@@ -330,8 +335,9 @@ static __inline__ runlist_element *ntfs_
 static __inline__ runlist_element *ntfs_rl_replace(runlist_element *dst,
 		int dsize, runlist_element *src, int ssize, int loc)
 {
-	BOOL left = FALSE;	/* Left end of @src needs merging */
-	BOOL right;		/* Right end of @src needs merging */
+	BOOL left  = FALSE;	/* Left end of @src needs merging */
+	BOOL right = FALSE;	/* Right end of @src needs merging */
+	int tail;		/* Start of tail of @dst */
 	int marker;		/* End of the inserted runs */
 
 	if (!dst || !src) {
@@ -340,13 +346,14 @@ static __inline__ runlist_element *ntfs_
 		return NULL;
 	}
 
-	/* First, merge the left and right ends, if necessary. */
-	right = ntfs_rl_are_mergeable(src + ssize - 1, dst + loc + 1);
+	/* First, see if the left and right ends need merging. */
+	if ((loc + 1) < dsize)
+		right = ntfs_rl_are_mergeable(src + ssize - 1, dst + loc + 1);
 	if (loc > 0)
 		left = ntfs_rl_are_mergeable(dst + loc - 1, src);
 
 	/* Allocate some space. We'll need less if the left, right, or both
-	 * ends were merged.
+	 * ends get merged.
 	 */
 	dst = ntfs_rl_realloc(dst, dsize, dsize + ssize - left - right);
 	if (!dst)
@@ -355,24 +362,33 @@ static __inline__ runlist_element *ntfs_
 	 * We are guaranteed to succeed from here so can start modifying the
 	 * original runlists.
 	 */
+
+	/* First, merge the left and right ends, if necessary. */
 	if (right)
 		__ntfs_rl_merge(src + ssize - 1, dst + loc + 1);
 	if (left)
 		__ntfs_rl_merge(dst + loc - 1, src);
 
 	/*
+	 * tail - Offset of the tail of @dst
+	 * Nominally: @tail = @loc + 1 (location, skipping the replaced run)
+	 * If "right", then one of @dst's runs is already merged into @src.
+	 */
+	tail = loc + right + 1;
+
+	/*
 	 * marker - First run after the @src runs that have been inserted
-	 * Nominally: marker = @loc + @ssize (location + number of runs in @src)
+	 * Nominally: @marker = @loc + @ssize (location + number of runs in @src)
 	 * If "left", then the first run in @src has been merged with one in @dst.
 	 */
 	marker = loc + ssize - left;
 
 	/* Move the tail of @dst out of the way, then copy in @src. */
-	ntfs_rl_mm(dst, marker, loc + right + 1, dsize - loc - right - 1);
+	ntfs_rl_mm(dst, marker, tail, dsize - tail);
 	ntfs_rl_mc(dst, loc, src, left, ssize - left);
 
 	/* We may have changed the length of the file, so fix the end marker */
-	if (((dsize - loc - right - 1) > 0) && (dst[marker].lcn == LCN_ENOENT))
+	if (((dsize - tail) > 0) && (dst[marker].lcn == LCN_ENOENT))
 		dst[marker].vcn = dst[marker - 1].vcn + dst[marker - 1].length;
 
 	return dst;
@@ -1855,6 +1871,7 @@ static void test_rl_pure (char *contig, 
 	static runlist_element file4[] = {
 		{    0,   -3,   0 }	/* NOENT */
 	};
+#if 0
 	static runlist_element file5[] = {
 		{    0,   -2, 100 },	/* NOTMAP */
 		{  100, 1100, 100 },	/* DATA */
@@ -1868,6 +1885,7 @@ static void test_rl_pure (char *contig, 
 		{  100,   -2, 100 },	/* NOTMAP */
 		{  200,   -3,   0 }	/* NOENT */
 	};
+#endif
 	BOOL c, m;
 
 	if (strcmp (contig, "contig") == 0)
@@ -1907,6 +1925,7 @@ static void test_rl_pure (char *contig, 
 	test_rl_pure_test (18, c, m, 140,  40, file3, sizeof (file3));
 	test_rl_pure_test (19, c, m,   0,  40, file4, sizeof (file4));
 	test_rl_pure_test (20, c, m,  40,  40, file4, sizeof (file4));
+#if 0
 	test_rl_pure_test (21, c, m,   0,  40, file5, sizeof (file5));
 	test_rl_pure_test (22, c, m,  40,  40, file5, sizeof (file5));
 	test_rl_pure_test (23, c, m,  60,  40, file5, sizeof (file5));
@@ -1921,6 +1940,7 @@ static void test_rl_pure (char *contig, 
 	test_rl_pure_test (32, c, m, 400, 100, file5, sizeof (file5));
 	test_rl_pure_test (33, c, m, 160, 100, file6, sizeof (file6));
 	test_rl_pure_test (34, c, m, 100, 140, file6, sizeof (file6));
+#endif
 }
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.28,1.29

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
minor ntfsmount cleanup


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntfsmount.c	16 Sep 2005 14:28:18 -0000	1.28
+++ ntfsmount.c	16 Sep 2005 14:30:08 -0000	1.29
@@ -1150,16 +1150,16 @@ static char *parse_mount_options(char *o
 				Eprintf("'ro' option should not have value.\n");
 				goto err_exit;
 			}
-			ctx->ro =TRUE;
+			ctx->ro = TRUE;
 			strcat(ret, "ro,");
 #ifdef DEBUG
-		} else if (!strcmp(opt, "fake_ro")) {
+		} else if (!strcmp(opt, "fake_rw")) {
 			if (val) {
-				Eprintf("'fake_ro' option should not have "
+				Eprintf("'fake_rw' option should not have "
 						"value.\n");
 				goto err_exit;
 			}
-			ctx->ro =TRUE;
+			ctx->ro = TRUE;
 #endif
 		} else if (!strcmp(opt, "fsname")) { /* Filesystem name. */
 			/*
@@ -1274,7 +1274,7 @@ static void usage(void)
  * Return:  1 Success
  *	    0 Error, one or more problems
  */
-static int parse_options (int argc, char *argv[])
+static int parse_options(int argc, char *argv[])
 {
 	int err = 0, help = 0;
 	char c = -1;
@@ -1293,7 +1293,7 @@ static int parse_options (int argc, char
 	opts.mnt_point = NULL;
 	opts.options = NULL;
 
-	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.mnt_point)

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.173,1.174 dir.c,1.22,1.23 inode.c,1.65,1.66

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

Changes by: cha0smaster

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

Modified Files:
	attrib.c dir.c inode.c 
Log Message:
Fix resident attribute adding: Add @val to ntfs_attr_add and @val and @size to ntfs_resident_attr_record_add.

Still need to fix attribute lis entry adding. :-(


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- attrib.c	14 Aug 2005 15:44:47 -0000	1.173
+++ attrib.c	16 Sep 2005 14:28:18 -0000	1.174
@@ -2496,6 +2496,8 @@ int ntfs_make_room_for_attr(MFT_RECORD *
  * @type:	type of the new attribute
  * @name:	name of the new attribute
  * @name_len:	name length of the new attribute
+ * @val:	value of the new attribute
+ * @size:	size of new attribute (length of @val, if @val != NULL)
  * @flags:	flags of the new attribute
  *
  * Return offset to attribute from the beginning of the mft record on success
@@ -2506,7 +2508,8 @@ int ntfs_make_room_for_attr(MFT_RECORD *
  *	EIO	- I/O error occurred or damaged filesystem.
  */
 int ntfs_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type,
-			ntfschar *name, u8 name_len, ATTR_FLAGS flags)
+			ntfschar *name, u8 name_len, u8 *val, u32 size,
+			ATTR_FLAGS flags)
 {
 	ntfs_attr_search_ctx *ctx;
 	u32 length;
@@ -2541,7 +2544,7 @@ int ntfs_resident_attr_record_add(ntfs_i
 	if (!ctx)
 		return -1;
 	if (!ntfs_attr_lookup(type, name, name_len,
-				CASE_SENSITIVE, 0, NULL, 0, ctx)) {
+				CASE_SENSITIVE, 0, val, size, ctx)) {
 		err = EEXIST;
 		Dprintf("%s(): Attribute already present.\n", __FUNCTION__);
 		goto put_err_out;
@@ -2554,7 +2557,9 @@ int ntfs_resident_attr_record_add(ntfs_i
 	m = ctx->mrec;
 
 	/* Make room for attribute. */
-	length = (0x18 + sizeof(ntfschar) * name_len + 7) & ~7;
+	length = offsetof(ATTR_RECORD, resident_end) +
+				((name_len * sizeof(ntfschar) + 7) & ~7) +
+				((size + 7) & ~7);
 	if (ntfs_make_room_for_attr(ctx->mrec, (u8*) ctx->attr, length)) {
 		err = errno;
 		Dprintf("%s(): Failed to make room for attribute.\n",
@@ -2568,11 +2573,15 @@ int ntfs_resident_attr_record_add(ntfs_i
 	a->length = cpu_to_le32(length);
 	a->non_resident = 0;
 	a->name_length = name_len;
-	a->name_offset = cpu_to_le16(0x18);
+	a->name_offset = cpu_to_le16(offsetof(ATTR_RECORD, resident_end));
 	a->flags = flags;
 	a->instance = m->next_attr_instance;
-	a->value_length = 0;
-	a->value_offset = cpu_to_le16(length);
+	a->value_length = cpu_to_le32(size);
+	a->value_offset = cpu_to_le16(length - ((size + 7) & ~7));
+	if (val)
+		memcpy((u8*)a + le16_to_cpu(a->value_offset), val, size);
+	else
+		memset((u8*)a + le16_to_cpu(a->value_offset), 0, size);
 	if (type == AT_FILE_NAME)
 		a->resident_flags = RESIDENT_ATTR_IS_INDEXED;
 	else
@@ -2893,7 +2902,14 @@ int ntfs_attr_record_rm(ntfs_attr_search
  * @type:	type of the new attribute
  * @name:	name in unicode of the new attribute
  * @name_len:	name length in unicode characters of the new attribute
- * @size:	size of the new attribute
+ * @val:	value of new attribute
+ * @size:	size of the new attribute / length of @val (if specified)
+ *
+ * @val should always be specified for always resident attributes (eg. FILE_NAME
+ * attribute), for attributes that can become non-resident @val can be NULL
+ * (eg. DATA attribute). @size can be specified even if @val is NULL, in this
+ * case data size will be equal to @size and initialized size will be equal
+ * to 0.
  *
  * If inode haven't got enough space to add attribute, add attribute to one of
  * it extents, if no extents present or no one of them have enough space, than
@@ -2904,21 +2920,21 @@ int ntfs_attr_record_rm(ntfs_attr_search
  * @type == AT_ATTRIBUTE_LIST, if you really need to add attribute list call
  * ntfs_inode_add_attrlist instead.
  *
- * On success return opened new ntfs attribute. On error return NULL with errno
- * set to the error code.
+ * On success return 0. On error return -1 with errno set to the error code.
  */
-ntfs_attr *ntfs_attr_add(ntfs_inode *ni, ATTR_TYPES type,
-		ntfschar *name, u8 name_len, s64 size)
+int ntfs_attr_add(ntfs_inode *ni, ATTR_TYPES type,
+		ntfschar *name, u8 name_len, u8 *val, s64 size)
 {
 	u32 attr_rec_size;
 	int err, i, offset;
+	BOOL is_resident;
 	ntfs_inode *attr_ni;
 	ntfs_attr *na;
 
 	if (!ni || size < 0 || type == AT_ATTRIBUTE_LIST) {
 		Dprintf("%s(): Invalid arguments passed.\n", __FUNCTION__);
 		errno = EINVAL;
-		return NULL;
+		return -1;
 	}
 
 	Dprintf("%s(): Entering for inode 0x%llx, attr %x, size %lld.\n",
@@ -2927,19 +2943,40 @@ ntfs_attr *ntfs_attr_add(ntfs_inode *ni,
 	if (ni->nr_extents == -1)
 		ni = ni->base_ni;
 
-	/* Validate attribute type. */
-	if (!ntfs_attr_find_in_attrdef(ni->vol, type)) {
-		if (errno == ENOENT) {
-			Dprintf("%s(): Invalid attribute type.\n",
-					__FUNCTION__);
-			errno = EINVAL;
-			return NULL;
-		} else {
+	/* Check the attribute type and the size. */
+	if (ntfs_attr_size_bounds_check(ni->vol, type, size)) {
+		err = errno;
+		if (err == ERANGE) {
+			Dprintf("%s(): Size bounds check failed. "
+					"Aborting...\n", __FUNCTION__);
+		} else if (err == ENOENT) {
+			Dprintf("%s(): Invalid attribute type. "
+					"Aborting...\n", __FUNCTION__);
+			err = EIO;
+		}
+		errno = err;
+		return -1;
+	}
+
+	/* Sanity checks for always resident attributes. */
+	if (ntfs_attr_can_be_non_resident(ni->vol, type)) {
+		if (errno != EPERM) {
 			err = errno;
-			Dprintf("%s(): ntfs_attr_find_in_attrdef failed.\n",
+			Dprintf("%s(): ntfs_attr_can_be_non_resident failed.\n",
 					__FUNCTION__);
-			errno = err;
-			return NULL;
+			goto err_out;
+		}
+		/* @val is mandatory. */
+		if (!val) {
+			Dprintf("%s(): @val is mandatory for always resident "
+					"atributes.\n", __FUNCTION__);
+			errno = EINVAL;
+			return -1;
+		}
+		if (size > ni->vol->mft_record_size) {
+			Dprintf("%s(): Attribute is too big.\n", __FUNCTION__);
+			errno = ERANGE;
+			return -1;
 		}
 	}
 
@@ -2947,28 +2984,38 @@ ntfs_attr *ntfs_attr_add(ntfs_inode *ni,
 	 * Determine resident or not will be new attribute. We add 8 to size in
 	 * non resident case for mapping pairs.
 	 */
-	if (ntfs_attr_can_be_resident(ni->vol, type)) {
+	if (!ntfs_attr_can_be_resident(ni->vol, type)) {
+		/* Attribute can be resident. */
+		is_resident = TRUE;
+		/* Check if it is better to make attribute non resident. */
+		if (!ntfs_attr_can_be_non_resident(ni->vol, type) &&
+				offsetof(ATTR_RECORD, resident_end) + size >= 
+				offsetof(ATTR_RECORD, non_resident_end) + 8)
+			/* Make it non resident. */
+			is_resident = FALSE;
+	} else {
 		if (errno != EPERM) {
 			err = errno;
-			Dprintf("%s(): ntfs_attr_can_be resident failed.\n",
+			Dprintf("%s(): ntfs_attr_can_be_resident failed.\n",
 					__FUNCTION__);
 			goto err_out;
 		}
 		/* Attribute can't be resident. */
+		is_resident = FALSE;
+	}
+	/* Calculate atribute record size. */
+	if (is_resident)
+		attr_rec_size = offsetof(ATTR_RECORD, resident_end) +
+				((name_len * sizeof(ntfschar) + 7) & ~7) +
+				((size + 7) & ~7);
+	else
 		attr_rec_size = offsetof(ATTR_RECORD, non_resident_end) +
 				((name_len * sizeof(ntfschar) + 7) & ~7) + 8;
-	} else {
-		/* Attribute can be resident. */
-		attr_rec_size = offsetof(ATTR_RECORD, resident_end) +
-			((name_len * sizeof(ntfschar) + 7) & ~7);
-		/* Check whether attribute will fit into the MFT record. */
-		if (size + attr_rec_size >= ni->vol->mft_record_size)
-			/* Will not fit, make it non resident. */
-			attr_rec_size = offsetof(ATTR_RECORD,
-					non_resident_end) + ((name_len *
-					sizeof(ntfschar) + 7) & ~7) + 8;
-	}
 
+	/*
+	 * If we have enough free space for the new attribute in the base MFT
+	 * record, then add attribute to it.
+	 */
 	if (le32_to_cpu(ni->mrec->bytes_allocated) -
 			le32_to_cpu(ni->mrec->bytes_in_use) >= attr_rec_size) {
 		attr_ni = ni;
@@ -2999,7 +3046,7 @@ ntfs_attr *ntfs_attr_add(ntfs_inode *ni,
 					__FUNCTION__);
 			goto err_out;
 		}
-		return ntfs_attr_add(ni, type, name, name_len, size);
+		return ntfs_attr_add(ni, type, name, name_len, val, size);
 	}
 	/* Allocate new extent. */
 	attr_ni = ntfs_mft_record_alloc(ni->vol, ni);
@@ -3011,29 +3058,33 @@ ntfs_attr *ntfs_attr_add(ntfs_inode *ni,
 	}
 
 add_attr_record:
-	if (attr_rec_size == offsetof(ATTR_RECORD, resident_end) +
-			((name_len * sizeof(ntfschar) + 7) & ~7)) {
+	if (is_resident) {
 		/* Add resident attribute. */
 		offset = ntfs_resident_attr_record_add(attr_ni, type, name,
-				name_len, 0);
+				name_len, val, size, 0);
 		if (offset < 0) {
 			err = errno;
 			Dprintf("%s(): Failed to add resident attribute.\n",
 					__FUNCTION__);
 			goto free_err_out;
 		}
-	} else {
-		/* Add non resident attribute. */
-		offset = ntfs_non_resident_attr_record_add(attr_ni, type, name,
+		return 0;
+	}
+
+	/* Add non resident attribute. */
+	offset = ntfs_non_resident_attr_record_add(attr_ni, type, name,
 				name_len, 0, 8, 0);
-		if (offset < 0) {
-			err = errno;
-			Dprintf("%s(): Failed to add non resident attribute.\n",
-					__FUNCTION__);
-			goto free_err_out;
-		}
+	if (offset < 0) {
+		err = errno;
+		Dprintf("%s(): Failed to add non resident attribute.\n",
+				__FUNCTION__);
+		goto free_err_out;
 	}
 
+	/* If @size == 0, we are done. */
+	if (!size)
+		return 0;
+
 	/* Open new attribute and resize it. */
 	na = ntfs_attr_open(ni, type, name, name_len);
 	if (!na) {
@@ -3042,21 +3093,23 @@ add_attr_record:
 				__FUNCTION__);
 		goto rm_attr_err_out;
 	}
-	if (!size)
-		return na;
-	if (ntfs_attr_truncate(na, size)) {
+	/* Resize and set attribute value. */
+	if (ntfs_attr_truncate(na, size) ||
+			(val && (ntfs_attr_pwrite(na, 0, size, val) != size))) {
 		err = errno;
-		Dprintf("%s(): Failed to resize just added attribute.\n",
+		Dprintf("%s(): Failed to initialize just added attribute.\n",
 				__FUNCTION__);
 		if (ntfs_attr_rm(na)) {
 			Dprintf("%s(): Failed to remove just added attribute. "
 				"Probably leaving inconstant metadata.\n",
 				__FUNCTION__);
+			ntfs_attr_close(na);
 		}
 		goto err_out;
 	}
+	ntfs_attr_close(na);
 	/* Done !*/
-	return na;
+	return 0;
 
 rm_attr_err_out:
 	/* Remove just added attribute. */
@@ -3076,7 +3129,7 @@ free_err_out:
 	}
 err_out:
 	errno = err;
-	return NULL;
+	return -1;
 }
 
 /**

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- dir.c	22 Aug 2005 21:33:07 -0000	1.22
+++ dir.c	16 Sep 2005 14:28:18 -0000	1.23
@@ -1076,7 +1076,6 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_
 		const unsigned type)
 {
 	ntfs_inode *ni;
-	ntfs_attr *na;
 	FILE_NAME_ATTR *fn = NULL;
 	STANDARD_INFORMATION *si = NULL;
 	int err, fn_len, si_len;
@@ -1110,20 +1109,12 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_
 	si->last_mft_change_time = utc2ntfs(ni->last_mft_change_time);
 	si->last_access_time = utc2ntfs(ni->last_access_time);
 	/* Add STANDARD_INFORMATION to inode. */
-	na = ntfs_attr_add(ni, AT_STANDARD_INFORMATION, AT_UNNAMED, 0, si_len);
-	if (!na) {
+	if (ntfs_attr_add(ni, AT_STANDARD_INFORMATION, AT_UNNAMED, 0,
+			(u8*)si, si_len)) {
 		err = errno;
 		ntfs_error(, "Failed to add STANDARD_INFORMATION attribute.");
 		goto err_out;
 	}
-	if (ntfs_attr_pwrite(na, 0, si_len, si) != si_len) {
-		err = errno;
-		ntfs_attr_close(na);
-		ntfs_error(, "Failed to initialize STANDARD_INFORMATION "
-				"attribute.");
-		goto err_out;
-	}
-	ntfs_attr_close(na);
 	if (type == NTFS_DT_DIR) {
 		INDEX_ROOT *ir = NULL;
 		INDEX_ENTRY *ie;
@@ -1156,30 +1147,19 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_
 		ie->key_length = 0;
 		ie->flags = INDEX_ENTRY_END;
 		/* Add INDEX_ROOT attribute to inode. */
-		na = ntfs_attr_add(ni, AT_INDEX_ROOT, I30, 4, ir_len);
-		if (!na) {
+		if (ntfs_attr_add(ni, AT_INDEX_ROOT, I30, 4, (u8*)ir, ir_len)) {
 			err = errno;
 			free(ir);
 			ntfs_error(, "Failed to add INDEX_ROOT attribute.");
 			goto err_out;
 		}
-		if (ntfs_attr_pwrite(na, 0, ir_len, ir) != ir_len) {
-			err = errno;
-			free(ir);
-			ntfs_attr_close(na);
-			ntfs_error(, "Failed to initialize INDEX_ROOT.");
-			goto err_out;
-		}
-		ntfs_attr_close(na);
 	} else {
 		/* Add DATA attribute to inode. */
-		na = ntfs_attr_add(ni, AT_DATA, AT_UNNAMED, 0, 0);
-		if (!na) {
+		if (ntfs_attr_add(ni, AT_DATA, AT_UNNAMED, 0, NULL, 0)) {
 			err = errno;
 			ntfs_error(, "Failed to add DATA attribute.");
 			goto err_out;
 		}
-		ntfs_attr_close(na);
 	}
 	/* Create FILE_NAME attribute. */
 	fn_len = sizeof(FILE_NAME_ATTR) + name_len * sizeof(ntfschar);
@@ -1201,19 +1181,11 @@ ntfs_inode *ntfs_create(ntfs_inode *dir_
 	fn->last_access_time = utc2ntfs(ni->last_access_time);
 	memcpy(fn->file_name, name, name_len * sizeof(ntfschar));
 	/* Add FILE_NAME attribute to inode. */
-	na = ntfs_attr_add(ni, AT_FILE_NAME, AT_UNNAMED, 0, fn_len);
-	if (!na) {
+	if (ntfs_attr_add(ni, AT_FILE_NAME, AT_UNNAMED, 0, (u8*)fn, fn_len)) {
 		err = errno;
 		ntfs_error(, "Failed to add FILE_NAME attribute.");
 		goto err_out;
 	}
-	if (ntfs_attr_pwrite(na, 0, fn_len, fn) != fn_len) {
-		err = errno;
-		ntfs_attr_close(na);
-		ntfs_error(, "Failed to initialize FILE_NAME attribute.");
-		goto err_out;
-	}
-	ntfs_attr_close(na);
 	/* Add FILE_NAME attribute to index. */
 	if (ntfs_index_add_filename(dir_ni, fn, MK_MREF(ni->mft_no,
 			le16_to_cpu(ni->mrec->sequence_number)))) {

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- inode.c	14 Aug 2005 15:44:47 -0000	1.65
+++ inode.c	16 Sep 2005 14:28:18 -0000	1.66
@@ -866,7 +866,7 @@ int ntfs_inode_add_attrlist(ntfs_inode *
 
 	/* Add $ATTRIBUTE_LIST to mft record. */
 	if (ntfs_resident_attr_record_add(ni,
-				AT_ATTRIBUTE_LIST, NULL, 0, 0) < 0) {
+				AT_ATTRIBUTE_LIST, NULL, 0, NULL, 0, 0) < 0) {
 		err = errno;
 		Dprintf("%s(): Couldn't add $ATTRIBUTE_LIST to MFT record.\n",
 			__FUNCTION__);

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs attrib.h,1.21,1.22

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

Changes by: cha0smaster

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

Modified Files:
	attrib.h 
Log Message:
Fix resident attribute adding: Add @val to ntfs_attr_add and @val and @size to ntfs_resident_attr_record_add.

Still need to fix attribute lis entry adding. :-(


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/attrib.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- attrib.h	4 Aug 2005 00:00:28 -0000	1.21
+++ attrib.h	16 Sep 2005 14:28:18 -0000	1.22
@@ -290,14 +290,15 @@ extern int ntfs_attr_can_be_resident(con
 extern int ntfs_make_room_for_attr(MFT_RECORD *m, u8 *pos, u32 size);
 
 extern int ntfs_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type,
-		ntfschar *name, u8 name_len, ATTR_FLAGS flags);
+		ntfschar *name, u8 name_len, u8 *val, u32 size,
+		ATTR_FLAGS flags);
 extern int ntfs_non_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type,
 		ntfschar *name, u8 name_len, VCN lowest_vcn, int dataruns_size,
 		ATTR_FLAGS flags);
 extern int ntfs_attr_record_rm(ntfs_attr_search_ctx *ctx);
 
-extern ntfs_attr *ntfs_attr_add(ntfs_inode *ni, ATTR_TYPES type,
-		ntfschar *name, u8 name_len, s64 size);
+extern int ntfs_attr_add(ntfs_inode *ni, ATTR_TYPES type,
+		ntfschar *name, u8 name_len, u8 *val, s64 size);
 extern int ntfs_attr_rm(ntfs_attr *na);
 
 extern int ntfs_attr_record_resize(MFT_RECORD *m, ATTR_RECORD *a, u32 new_size);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscp.c,1.25,1.26 ntfsmount.c,1.27,1.28

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

Changes by: cha0smaster

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

Modified Files:
	ntfscp.c ntfsmount.c 
Log Message:
Fix resident attribute adding: Add @val to ntfs_attr_add and @val and @size to ntfs_resident_attr_record_add.

Still need to fix attribute lis entry adding. :-(


Index: ntfscp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ntfscp.c	25 Jul 2005 22:05:27 -0000	1.25
+++ ntfscp.c	16 Sep 2005 14:28:18 -0000	1.26
@@ -378,12 +378,17 @@ int main (int argc, char *argv[])
 			goto close_dst;
 		}
 		/* Requested attribute isn't present, add it. */
-		na = ntfs_attr_add(out, opts.attribute, attr_name,
-				attr_name_len, 0);
-		if (!na) {
+		if (ntfs_attr_add(out, opts.attribute, attr_name,
+				attr_name_len, NULL, 0)) {
 			perror("ERROR: Couldn't add attribute");
 			goto close_dst;
 		}
+		na = ntfs_attr_open(out, opts.attribute, attr_name,
+				attr_name_len);
+		if (!na) {
+			perror("ERROR: Couldn't open just added attribute");
+			goto close_dst;
+		}
 	}
 	if (attr_name != AT_UNNAMED)
 		free(attr_name);

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ntfsmount.c	31 Aug 2005 14:31:53 -0000	1.27
+++ ntfsmount.c	16 Sep 2005 14:28:18 -0000	1.28
@@ -578,7 +578,6 @@ static int ntfs_fuse_create_stream(const
 		ntfschar *stream_name, const int stream_name_len)
 {
 	ntfs_inode *ni;
-	ntfs_attr *na;
 	int res = 0;
 
 	ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
@@ -598,10 +597,7 @@ static int ntfs_fuse_create_stream(const
 		}
 		return res;
 	}
-	na = ntfs_attr_add(ni, AT_DATA, stream_name, stream_name_len, 0);
-	if (na)
-		ntfs_attr_close(na);
-	else
+	if (ntfs_attr_add(ni, AT_DATA, stream_name, stream_name_len, NULL, 0))
 		res = -errno;
 	if (ntfs_inode_close(ni))
 		perror("Failed to close inode");

[Linux-NTFS-cvs] CVS: dynamic-disk/ldminfo ldm.c,1.1,1.2

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/ldminfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22140

Modified Files:
	ldm.c 
Log Message:
fix bugs:
	make dump work again
	print the sequence numbers


Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/ldminfo/ldm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ldm.c	11 Sep 2005 23:53:24 -0000	1.1
+++ ldm.c	16 Sep 2005 00:04:11 -0000	1.2
@@ -930,6 +930,12 @@ static BOOL ldm_parse_dgr4 (const u8 *bu
 	dgrp = &vb->vblk.dgrp;
 
 	ldm_get_vstr (buffer + 0x18 + r_objid, buf, sizeof (buf));
+	//if (r_id1) {
+	//	ldm_get_vstr (buffer + 0x18 + r_id1, dgrp->disk_id,
+	//		sizeof (dgrp->disk_id));
+	//} else {
+		memset (dgrp->disk_id, 0, sizeof (dgrp->disk_id));
+	//}
 	return TRUE;
 }
 
@@ -1152,9 +1158,10 @@ static BOOL ldm_parse_vblk (const u8 *bu
 		return FALSE;
 	}
 
-	vb->flags  = buf[0x12];
-	vb->type   = buf[0x13];
-	vb->obj_id = ldm_get_vnum (buf + 0x18);
+	vb->sequence = BE32 (buf + 0x04);
+	vb->flags    = buf[0x12];
+	vb->type     = buf[0x13];
+	vb->obj_id   = ldm_get_vnum (buf + 0x18);
 	ldm_get_vstr (buf+0x18+r_objid, vb->name, sizeof (vb->name));
 
 	switch (vb->type) {
@@ -1198,7 +1205,7 @@ static BOOL ldm_ldmdb_add (u8 *data, int
 
 	BUG_ON (!data || !ldb);
 
-	vb = malloc (sizeof (*vb));
+	vb = calloc (1, sizeof (*vb));
 	if (!vb) {
 		ldm_crit ("Out of memory.");
 		return FALSE;
@@ -1494,7 +1501,7 @@ int ldm_partition (int dev, struct parse
 
 	if (!ldm_get_vblks (dev, base, ldb)) {
 		ldm_crit ("Failed to read the VBLKs from the database.");
-		goto cleanup;
+		goto out;
 	}
 
 	/* Finally, create the data partition devices. */
@@ -1503,13 +1510,6 @@ int ldm_partition (int dev, struct parse
 		result = 1;
 	}
 	/* else Already logged */
-
-cleanup:
-	ldm_free_vblks (&ldb->v_dgrp);
-	ldm_free_vblks (&ldb->v_disk);
-	ldm_free_vblks (&ldb->v_volu);
-	ldm_free_vblks (&ldb->v_comp);
-	ldm_free_vblks (&ldb->v_part);
 out:
 	return result;
 }