[Forensics-changes] [SCM] debian-forensics/extundelete branch, debian, updated. upstream/0.2.0-7-ge08ed25

[Elías Alejandro]

The following commit has been merged in the debian branch:
commit e08ed25cec677eea1cddf9397d702addcfdf826b
Author: Elías Alejandro <ealmdz at gmail.com>
Date:   Mon Oct 25 12:17:40 2010 -0500

    Patch output-directory

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/patches/01_output_dir.patch b/debian/patches/01_output_dir.patch
new file mode 100644
index 0000000..141f624
--- /dev/null
+++ b/debian/patches/01_output_dir.patch
@@ -0,0 +1,51 @@
+Index: extundelete/src/extundelete.cc
+===================================================================
+--- extundelete.orig/src/extundelete.cc	2010-10-25 11:50:25.000000000 -0500
++++ extundelete/src/extundelete.cc	2010-10-25 12:01:12.000000000 -0500
+@@ -466,6 +466,8 @@
+   os << "  --restore-files 'path' Will restore files which are listed in the file 'path'.\n";
+   os << "                         Each filename should be in the same format as an option\n";
+   os << "                         to --restore-file, and there should be one per line.\n";
++  os << "  --output-dir 'path'    Restore files in the output dir 'path'.\n";
++  os << "                         By default the restored files are created in ./RESTORE_FILES.\n";
+   os << "  --restore-all          Attempts to restore everything.\n";
+   os << "  -j journal             Reads an external journal from the named file.\n";
+   os << "  -b blocknumber         Uses the backup superblock at blocknumber when opening\n";
+@@ -601,6 +603,7 @@
+ 		opt_show_journal_inodes,
+ 		opt_restore_file,
+ 		opt_restore_files,
++		opt_output_dir,
+ 		opt_restore_directory,
+ 		opt_restore_inode,
+ 		opt_restore_all,
+@@ -626,6 +629,7 @@
+ 		{"restore-inode", 1, &long_option, opt_restore_inode},
+ 		{"restore-file", 1, &long_option, opt_restore_file},
+ 		{"restore-files", 1, &long_option, opt_restore_files},
++		{"output-dir", 1, &long_option, opt_output_dir},
+ 		{"restore-directory", 1, &long_option, opt_restore_directory},
+ 		{"restore-all", 0, &long_option, opt_restore_all},
+ 		{"show-hardlinks", 0, &long_option, opt_show_hardlinks},
+@@ -688,6 +692,21 @@
+ 			case opt_restore_files:
+ 				commandline_restore_files = optarg;
+ 				break;
++			case opt_output_dir:
++				{
++				std::string optarg1 = optarg;
++				int subcad = optarg1.find_last_of("/");
++				std::string res = optarg1.substr(subcad+1);
++					if(res!="")
++						{
++						outputdir = optarg1 + "/RECOVERED_FILES/";
++						}
++					else
++						{
++						outputdir = optarg1 + "RECOVERED_FILES/";
++						}
++				}
++				break;
+ 			case opt_restore_directory:
+ 				commandline_restore_directory = optarg;
+ 				break;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8388ca0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_output_dir.patch

-- 
debian-forensics/extundelete