[Forensics-changes] [SCM] Tool to help recover deleted files on ext3 filesystems branch, upstream, updated. upstream/0.10.0-1-gf6e1648

Daniel Baumann daniel at debian.org
Fri Dec 19 22:25:31 UTC 2008


The following commit has been merged in the upstream branch:
commit f6e1648b1b9d490f9fc197e83e194c01dd1d72d2
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Dec 19 23:20:11 2008 +0100

    Adding upstream version 0.10.1.

diff --git a/aclocal.m4 b/aclocal.m4
index 9dd73eb..af233fc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -927,7 +927,7 @@ AC_DEFUN([CW_AUTOMACROS], [dnl
 dnl Check cwautomacros version.
 minver=$1
 test -n "$minver" || minver=0
-if test 20081012 -lt $minver; then
+if test 20081123 -lt $minver; then
   AC_MSG_ERROR([cwautomacros version $minver or later is required.])
 fi
 dnl Detect unexpanded macros.
diff --git a/configure b/configure
index 7d8bc3f..617c495 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 7 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for ext3grep 0.10.0.
+# Generated by GNU Autoconf 2.61 for ext3grep 0.10.1.
 #
 # Report bugs to <carlo at alinoe.com>.
 #
@@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='ext3grep'
 PACKAGE_TARNAME='ext3grep'
-PACKAGE_VERSION='0.10.0'
-PACKAGE_STRING='ext3grep 0.10.0'
+PACKAGE_VERSION='0.10.1'
+PACKAGE_STRING='ext3grep 0.10.1'
 PACKAGE_BUGREPORT='carlo at alinoe.com'
 
 ac_unique_file="src/ext3grep.cc"
@@ -1256,7 +1256,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ext3grep 0.10.0 to adapt to many kinds of systems.
+\`configure' configures ext3grep 0.10.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1326,7 +1326,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ext3grep 0.10.0:";;
+     short | recursive ) echo "Configuration of ext3grep 0.10.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1422,7 +1422,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ext3grep configure 0.10.0
+ext3grep configure 0.10.1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1436,7 +1436,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ext3grep $as_me 0.10.0, which was
+It was created by ext3grep $as_me 0.10.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2133,7 +2133,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ext3grep'
- VERSION='0.10.0'
+ VERSION='0.10.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2305,7 +2305,7 @@ fi
 
 minver=20080318
 test -n "$minver" || minver=0
-if test 20081012 -lt $minver; then
+if test 20081123 -lt $minver; then
   { { echo "$as_me:$LINENO: error: cwautomacros version $minver or later is required." >&5
 echo "$as_me: error: cwautomacros version $minver or later is required." >&2;}
    { (exit 1); exit 1; }; }
@@ -6639,7 +6639,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ext3grep $as_me 0.10.0, which was
+This file was extended by ext3grep $as_me 0.10.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6692,7 +6692,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-ext3grep config.status 0.10.0
+ext3grep config.status 0.10.1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index b18c728..8f02f9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl CW_VERSION_REVISION            : Increment every public release; or set to 0
 
 define(CW_VERSION_MAJOR, 0)
 define(CW_VERSION_MINOR, 10)
-define(CW_VERSION_REVISION, 0)
+define(CW_VERSION_REVISION, 1)
 
 define(CW_PACKAGE_NAME, [ext3grep])
 define(CW_BUGREPORT, [carlo at alinoe.com])
diff --git a/src/commandline.cc b/src/commandline.cc
index 838e3f5..084598a 100644
--- a/src/commandline.cc
+++ b/src/commandline.cc
@@ -70,6 +70,7 @@ bool commandline_show_hardlinks = false;
 bool commandline_debug = false;
 bool commandline_debug_malloc = false;
 bool commandline_custom = false;
+bool commandline_accept_all = false;
 
 //-----------------------------------------------------------------------------
 //
@@ -91,6 +92,7 @@ static void print_usage(std::ostream& os)
   os << "  --accept filen         Accept 'filen' as a legal filename. Can be used multi-\n";
   os << "                         ple times. If you change any --accept you must remove\n";
   os << "                         BOTH stage* files!\n";
+  os << "  --accept-all           Simply accept everything as filename.\n";
   os << "  --journal              Show content of journal.\n";
   os << "  --show-path-inodes     Show the inode of each directory component in paths.\n";
 #ifdef CWDEBUG
@@ -192,6 +194,7 @@ enum opts {
   opt_histogram,
   opt_directory,
   opt_accept,
+  opt_accept_all,
   opt_dump_names,
   opt_reallocated,
   opt_depth,
@@ -239,6 +242,7 @@ void decode_commandline_options(int& argc, char**& argv)
     {"histogram", 1, &long_option, opt_histogram},
     {"directory", 0, &long_option, opt_directory},
     {"accept", 1, &long_option, opt_accept},
+    {"accept-all", 0, &long_option, opt_accept_all},
     {"dump-names", 0, &long_option, opt_dump_names},
     {"depth", 1, &long_option, opt_depth},
     {"journal", 0, &long_option, opt_journal},
@@ -471,6 +475,10 @@ void decode_commandline_options(int& argc, char**& argv)
 	    accepted_filenames.insert(Accept(optarg, true));
 	    break;
 	  }
+	  case opt_accept_all:
+	  {
+	    commandline_accept_all = true;
+	  }
         }
         break;
       case 'v':
diff --git a/src/commandline.h b/src/commandline.h
index 4475099..71456ba 100644
--- a/src/commandline.h
+++ b/src/commandline.h
@@ -69,5 +69,6 @@ extern bool commandline_show_hardlinks;
 extern bool commandline_debug;
 extern bool commandline_debug_malloc;
 extern bool commandline_custom;
+extern bool commandline_accept_all;
 
 #endif // COMMANDLINE_H
diff --git a/src/is_blockdetection.cc b/src/is_blockdetection.cc
index 8fdb95e..cdc8673 100644
--- a/src/is_blockdetection.cc
+++ b/src/is_blockdetection.cc
@@ -227,9 +227,9 @@ is_directory_type is_directory(unsigned char* block, int blocknr, DirectoryBlock
   if (commandline_block != -1)
     number_of_weird_characters = 0;
 #if 1
-  // New code... just accept everything at this point, except filenames existing of a single unlikely character.
-  if (dir_entry->name_len == 1 && number_of_weird_characters > 0 &&
-      (blocknr != 4745500 && blocknr != 6546132 && blocknr != 6549681 && blocknr != 6550057 && blocknr != 6582345 && blocknr != 6582333 && blocknr != 6583272))
+  // Accept everything at this point, except filenames existing of a single unlikely character.
+  // If --accept-all is given, accept even those.
+  if (!commandline_accept_all && dir_entry->name_len == 1 && number_of_weird_characters > 0)
     ok = false;
 #else
   // Setting ok to false means we reject this entry. Also setting illegal will reject it silently.

-- 
Tool to help recover deleted files on ext3 filesystems



More information about the forensics-changes mailing list