[Forensics-changes] [ext3grep] 09/14: Imported Upstream version 0.10.1
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Sun Mar 8 06:07:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository ext3grep.
commit 878e7405658030a74770a2b76935bbb603947ef8
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sun Mar 8 03:07:00 2015 -0300
Imported Upstream version 0.10.1
---
aclocal.m4 | 2 +-
configure | 22 ++++-----
configure.ac | 2 +-
debian/changelog | 71 ----------------------------
debian/compat | 1 -
debian/control | 18 -------
debian/copyright | 62 ------------------------
debian/docs | 1 -
debian/manpage/ext3grep.8 | 117 ----------------------------------------------
debian/manpages | 1 -
debian/rules | 75 -----------------------------
debian/watch | 2 -
src/commandline.cc | 8 ++++
src/commandline.h | 1 +
src/is_blockdetection.cc | 6 +--
15 files changed, 25 insertions(+), 364 deletions(-)
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/debian/changelog b/debian/changelog
deleted file mode 100644
index 7622632..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,71 +0,0 @@
-ext3grep (0.10.0-1) unstable; urgency=low
-
- * Merging upstream version 0.10.0.
- * Replacing obsolete dh_clean -k with dh_prep.
-
- -- Daniel Baumann <daniel at debian.org> Fri, 28 Nov 2008 09:16:00 +0100
-
-ext3grep (0.9.0-1) unstable; urgency=low
-
- [ Daniel Baumann ]
- * Rewording author section in the manpage, also adding reference to
- ext3grep upstream author.
- * Removing imported whitespace at EOL in changelog.
- * Removing imported whitespace at EOF in control.
- * Polishing formating of the manpage.
- * Using package long description in manpage.
- * Updating vcs fields.
- * Regenerating changelog for 0.6.0-1 and 0.8.0-1 from git commit log.
- * Updating download url in copyright file.
- * Merging upstream version 0.9.0. (Closes: #501018)
-
- -- Luca Bruno <lucab at debian.org> Fri, 17 Oct 2008 21:54:42 +0200
-
-ext3grep (0.8.0-1) unstable; urgency=low
-
- [ Luca Bruno ]
- * Imported Upstream version 0.7.0:
-
- [ Rich Ercolani ]
- * Imported Upstream version 0.8.0
- - Allow inode_size_ to be larger than sizeof(Inode) (Closes: #491621)
- * Config --disable-optimization changed to --disable-optimize in this version
-
- [ Luca Bruno ]
- * Removed all big-endian arch, as ext3grep won't work there
-
- -- Rich Ercolani <rercola at acm.jhu.edu> Fri, 15 Aug 2008 01:41:12 -0400
-
-ext3grep (0.6.0-1) unstable; urgency=low
-
- [ Rich Ercolani ]
- * Initial release (Closes: #470813).
-
- [ Luca Bruno ]
- * Now maintained within the Debian Forensics team
- * Added the Vcs-Git related tag
-
- [ Daniel Baumann ]
- * Updating package to debhelper 7.
- * Sorting control fields.
- * Removing unneded build-dependencies to essential packages.
- * Adding soname independent build-depends alternative for libncurses5-dev.
- * Updating to standards 3.8.0.
- * Using punct rather than double-backslash for empty lines in package
- long-description.
- * Removing cruft from watch file.
- * Reordering rules file.
- * Moving manpage into sub-directory of debian/.
- * Rewriting copyright file in machine-interpretable format.
- * Using NEWS file as changelog.
- * Removing unused dirs debhelper file.
- * Forgot to remove manpage file in old location.
- * Rewrapping and reformating manpage.
- * Adding copyright notice for src/kernel-jbd.h to copyright file.
- * Sorting vcs fields in control.
-
- [ Luca Bruno ]
- * Added missing pkg-config build-dep
- * Removing -dbg package (for now)
-
- -- Rich Ercolani <rercola at acm.jhu.edu> Fri, 14 Mar 2008 22:19:59 -0400
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index c2fecba..0000000
--- a/debian/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: ext3grep
-Section: admin
-Priority: extra
-Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
-Uploaders: Luca Bruno <lucab at debian.org>, Rich Ercolani <rercola at acm.jhu.edu>
-Build-Depends: debhelper (>= 7), autotools-dev, e2fslibs-dev, libncurses5 | libncurses-dev, pkg-config
-Standards-Version: 3.8.0
-Homepage: http://code.google.com/p/ext3grep/
-Vcs-Browser: http://git.debian.net/?p=debian-forensics/ext3grep.git
-Vcs-Git: git://git.debian.net/git/debian-forensics/ext3grep.git
-
-Package: ext3grep
-Architecture: alpha amd64 arm armel i386 ia64 mipsel
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Tool to help recover deleted files on ext3 filesystems
- ext3grep is a simple tool intended to aid anyone who accidentally deletes a
- file on an ext3 filesystem, only to find that they wanted it shortly
- thereafter.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 8d310ce..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,62 +0,0 @@
-Author: Carlo Wood <carlo at alinoe.com>
-Download: http://code.google.com/p/ext3grep/downloads/list
-
-Files: *
-Copyright: (C) 2008 Carlo Wood <carlo at alinoe.com>
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program 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; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: src/kernel-jbd.h
-Copyright: (C) 1998-2000 Red Hat, Inc
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program 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; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: debian/*
-Copyright: (C) 2008 Rich Ercolani <rercola at acm.jhu.edu>
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program 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; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/manpage/ext3grep.8 b/debian/manpage/ext3grep.8
deleted file mode 100644
index 182a0f7..0000000
--- a/debian/manpage/ext3grep.8
+++ /dev/null
@@ -1,117 +0,0 @@
-.TH EXT3GREP 8 "2008-09-14" "0.8.0" "recover files on ext3 filesystems"
-
-.SH NAME
-ext3grep \- ext3 file recovery tool
-
-.SH SYNOPSIS
-\fBext3grep\fR [\fIOPTIONS\fR] \fIFILE\fR \&...
-
-.SH DESCRIPTION
-ext3grep is a simple tool intended to aid anyone who accidentally deletes a file on an ext3 filesystem, only to find that they wanted it shortly thereafter.
-
-.SH OPTIONS
-.IP "\fB\-\-superblock\fR" 4
-Print contents of superblock in addition to the rest. If no action is specified then this option is implied.
-.IP "\fB\-\-print\fR" 4
-Print contents of block or inode, if any.
-.IP "\fB\-\-ls\fR" 4
-Print directories, one line per entry. See the \fBFILTERS\fR section for details on filtering this output.
-.IP "\fB\-\-accept\fR \fIFILE\fR" 4
-Accepts 'file' as a legal filename. Can be used multiple times. If you change any \fB\-\-accept\fR you must remove BOTH stage* files!
-.IP "\fB\-\-journal\fR" 4
-Prints the contents of the journal.
-.IP "\fB\-\-show\-path\-inodes\fR" 4
-Show the inode of each directory component in paths.
-.PP
-.SS "Filters:"
-.IP "\fB\-\-group\fR \fIgid\fR" 4
-Only show/process files owned by process group \fIgid\fR.
-.IP "\fB\-\-directory\fR" 4
-Only show/process process directory inodes.
-.IP "\fB\-\-after\fR \fIdtime\fR" 4
-Only show/process entries deleted on or after \fIdtime\fR.
-.IP "\fB\-\-before\fR \fIdtime\fR" 4
-Only show/process entries deleted before \fIdtime\fR.
-.IP "\fB\-\-deleted\fR" 4
-Only show/process deleted entries.
-.IP "\fB\-\-allocated\fR" 4
-Only show/process allocated inodes/blocks.
-.IP "\fB\-\-unallocated\fR" 4
-Only show/process unallocated inodes/blocks.
-.IP "\fB\-\-reallocated\fR" 4
-Do not suppress entries with reallocated inodes. Inodes are considered 'reallocated' if the entry is deleted but the inode is allocated, but also when the file type in the dir entry and the inode are different.
-.IP "\fB\-\-zeroed\-inodes\fR" 4
-Do not suppress entries with zeroed inodes. Linked entries are always shown, regardless of this option.
-.IP "\fB\-\-depth\fR depth"
-Process directories recursively up till a depth of 'depth'.
-.PP
-.SS "Actions:"
-.IP "\fB\-\-inode\-to\-block\fR \fIinode_num\fR" 4
-Print the block that contains inode \fIinode_num\fR.
-.IP "\fB\-\-inode\fR \fIinode_num\fR" 4
-Show info on inode \fIinode_num\fR. If \fB\-\-ls\fR is used and the inode is a directory, then the filters apply to the entries of the directory. If you do not use \fB\-\-ls\fR then \fB\-\-print\fR is implied.
-.IP "\fB\-\-block\fR \fIblock_num\fR" 4
-Show info on block \fIblock_num\fR. If \fB\-\-ls\fR is used and the block is the first block of a directory, then the filters apply to entries of the directory. If you do not use \fB\-\-ls\fR then \fB\-\-print\fR is implied.
-.IP "\fB\-\-histogram\fR=[\fIatime\fR|\fIctime\fR|\fImtime\fR|\fIdtime\fR|\fIgroup\fR]" 4
-Generate a histogram based on the given specs. Using atime, ctime or mtime will change the meaning of \fB\-\-after\fR and \fB\-\-before\fR to those times.
-.IP "\fB\-\-journal\-block\fR \fIblock_num\fR" 4
-Show info on journal block \fIblock_num\fR.
-.IP "\fB\-\-journal\-transaction\fR \fIseq\fR" 4
-Show info on transaction with sequence number \fIseq\fR.
-.IP "\fB\-\-dump\-names\fR" 4
-Write the paths of files to stdout. This implies \fB\-\-ls\fR but suppresses its output.
-.IP "\fB\-\-search\-start\fR \fIstr\fR" 4
-Find blocks that start with the fixed string \fIstr\fR.
-.IP "\fB\-\-search\fR \fIstr\fR" 4
-Find blocks that contain the fixed string \fIstr\fR.
-.IP "\fB\-\-search\-inode\fR \fIblock_num\fR" 4
-Find inodes that refer to block \fIblock_num\fR.
-.IP "\fB\-\-search\-zeroed\-inodes\fR" 4
-Return allocated inode table entries that are zeroed.
-.IP "\fB\-\-inode\-dirblock\-table\fR \fIdir\fR" 4
-Print a table for directory path \fIdir\fR of directory block numbers found and the inodes used for each file.
-.IP "\fB\-\-show\-journal\-inodes\fR \fIinode_num\fR" 4
-Show copies of inode \fIinode_num\fR still in the journal.
-.IP "\fB\-\-restore\-file\fR \fIpath\fR" 4
-Will restore file \fIpath\fR. \fIpath\fR is relative to root of the partition and does not start with a '/' (it must be one of the paths returned by \fB\-\-dump\-names\fR). The restored directory, file or symbolic link is created in the current directory as ./\fIpath\fR.
-.IP "\fB\-\-restore\-all\fR" 4
-As \fB\-\-restore\-file\fR but attempts to restore everything. The use of \fB\-\-after\fR is highly recommended because the attempt to restore very old files will only result in them being hard linked to a more recently deleted file and as such pollute the output.
-.IP "\fB\-\-show\-hardlinks\fR" 4
-Show all inodes that are shared by two or more files.
-.IP "\fB\-\-version\fR, \fB\-[vV]\fR" 4
-Prints the version information and exits.
-.IP "\fB\-\-help\fR," 4
-Prints a help message and exits.
-
-.SH EXAMPLES
-\fBRestoring all files from the ext3 partition/file /backup/sda1:\fR
-.nf
-ext3grep \-\-restore-all /backup/sda1
-.fi
-\fBListing the files owned by GID 1000 on /backup/sda1:\fR
-.nf
-ext3grep \-\-ls \-\-group 1000 /backup/sda1
-.fi
-\fBFinding all files containing the string Critical_report in their name on /backup/sda1:\fR
-.nf
-ext3grep \-\-dump-names /backup/sda1 | grep 'Critical_report'
-.fi
-
-.SH LIMITATIONS
-Do not attempt to use ext3grep for recovery from a mounted filesystem. Ever.
-.PP
-No, not even then.
-.PP
-ext3grep sometimes runs out of memory spare on 32-bit architectures and crashes. It is highly recommended that you run ext3grep in a 64-bit environment when dealing with large filesystems, though this is seen as a bug.
-.PP
-ext3grep cannot recover files if there are no remnants of them.
-.PP
-Some files that ext3grep recovers may have trailing null bytes - just scrape them off like the burnt bits on toast.
-
-.SH SEE ALSO
-\fIdebugfs\fR(8)
-
-.SH AUTHOR
-ext3grep was written by Carlo Wood <\fIcarlo at alinoe.com\fR>.
-.PP
-This manual page was written by Rich Ercolani <\fIrercola at acm.jhu.edu\fR>, for the Debian project (but may be used by others). It may be distributed under the same terms as ext3grep, the GNU General Public License, either version 2 or (at your option) any later version.
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index 31eb23e..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/manpage/*
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 1f3aa7f..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-# Uncomment the following line to disable optimization and enable
-# richer debug information.
-# DEB_BUILD_OPTIONS += nostrip noopt
-
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
- CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
- CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- EXTRA += --enable-debug --disable-optimize
-endif
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean
-
-config.status: configure
- dh_testdir
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
- CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr $(EXTRA)
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/ext3grep install
-
-binary: binary-arch
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs NEWS
- dh_installdocs
- dh_installman
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep:
-
-.PHONY: clean build install binary binary-arch binary-indep
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index c85c06e..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://code.google.com/p/ext3grep/downloads/list http://ext3grep.googlecode.com/files/ext3grep-(.*).tar.gz
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.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/ext3grep.git
More information about the forensics-changes
mailing list