[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsundelete.8.in,1.4,1.5 ntfsundelete.c,1.13,1.14 ntfsundelete.h,1.8,1.9

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

Changes by: flatcap

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

Modified Files:
	ntfsundelete.8.in ntfsundelete.c ntfsundelete.h 
Log Message:
sort out the output and some of the return values


Index: ntfsundelete.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsundelete.8.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- ntfsundelete.8.in	15 Jul 2002 22:45:45 -0000	1.4
+++ ntfsundelete.8.in	16 Jul 2002 23:41:43 -0000	1.5
@@ -70,4 +70,8 @@
 will not try and piece together such records.  It will simply show unnamed files
 with data.
+.SS Compressed and Encrypted Files
+.B ntfsundelete
+cannot recover compressed or encrypted files.  When scanning for them, it will
+display as being 0% recoverable.
 .SH OPTIONS
 Below is a summary of all the options that

Index: ntfsundelete.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsundelete.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- ntfsundelete.c	15 Jul 2002 16:41:48 -0000	1.13
+++ ntfsundelete.c	16 Jul 2002 23:41:43 -0000	1.14
@@ -40,4 +40,5 @@
 #include <libintl.h>
 #include <time.h>
+#include <stdarg.h>
 
 #include "ntfsundelete.h"
@@ -52,6 +53,7 @@
 static const char *EXEC_NAME = "ntfsundelete";
 static const char *MFTFILE   = "mft";
+static const char *UNNAMED   = "<unnamed>";
+static       char *NONE      = "<none>";
 static       char *UNKNOWN   = "unknown";
[...1324 lines suppressed...]
 	case MODE_UNDELETE:
-		result = undelete_file (vol, opts.uinode);
+		result = !undelete_file (vol, opts.uinode);
+		if (result)
+			Vprintf ("Failed to undelete inode %d.\n", opts.uinode);
 		break;
 	case MODE_COPY:
-		result = copy_mft (vol, opts.mft_begin, opts.mft_end);
+		result = !copy_mft (vol, opts.mft_begin, opts.mft_end);
+		if (result)
+			Vprintf ("Failed to read MFT blocks %lld-%lld.\n",
+				opts.mft_begin, min (vol->nr_mft_records, opts.mft_end));
 		break;
 	default:
@@ -1802,4 +1925,5 @@
 
 	ntfs_umount (vol, FALSE);
+	//free_opts();
 
 	return result;

Index: ntfsundelete.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsundelete.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- ntfsundelete.h	15 Jul 2002 16:30:41 -0000	1.8
+++ ntfsundelete.h	16 Jul 2002 23:41:43 -0000	1.9
@@ -82,5 +82,5 @@
 	long long	 size_data;	/* Actual size of data */
 	long long	 size_init;	/* Initialised size, may be less than data size */
-	long long	 size_vcn;	/* The highest VCN in the data runs */
+	long long	 size_vcn;	/* Highest VCN in the data runs */
 	run_list_element*run_list;	/* Decoded data runs */
 	int		 percent;	/* Amont potentially recoverable */
@@ -93,8 +93,9 @@
 	struct list_head name;		/* A list of filenames */
 	struct list_head data;		/* A list of data streams */
-	char		*pref_name;	/* The preferred filename */
+	char		*pref_name;	/* Preferred filename */
+	long long	 max_size;	/* Largest size we find */
 	int		 attr_list;	/* MFT record may be one of many */
 	int		 directory;	/* MFT record represents a directory */
-	MFT_RECORD	*mft;		/* The raw MFT record */
+	MFT_RECORD	*mft;		/* Raw MFT record */
 };