From 5fd0819ebca5db112f09295b477158985f8dd339 Mon Sep 17 00:00:00 2001 From: Matteo Cafasso Date: Wed, 30 Mar 2016 22:18:08 +0300 Subject: [PATCH] Rename icat command in download_inode The "icat" name comes from the employed command line tool which might be replaced at any time with a different implementation. The command name is a bit confusing because it's similar to "cat" but act as "download". download_inode is more clear and descriptive. Signed-off-by: Matteo Cafasso --- daemon/sleuthkit.c | 2 +- generator/actions.ml | 2 +- tests/tsk/Makefile.am | 2 +- tests/tsk/{test-icat.sh => test-download-inode.sh} | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename tests/tsk/{test-icat.sh => test-download-inode.sh} (92%) diff --git a/daemon/sleuthkit.c b/daemon/sleuthkit.c index 0fe1250e4..2f8c97b5a 100644 --- a/daemon/sleuthkit.c +++ b/daemon/sleuthkit.c @@ -40,7 +40,7 @@ optgroup_sleuthkit_available (void) } int -do_icat (const mountable_t *mountable, int64_t inode) +do_download_inode (const mountable_t *mountable, int64_t inode) { CLEANUP_FREE char *cmd = NULL; diff --git a/generator/actions.ml b/generator/actions.ml index ff72cfe94..e5cb93971 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -12946,7 +12946,7 @@ The filesystem from which to extract the file must be unmounted, otherwise the call will fail." }; { defaults with - name = "icat"; added = (1, 33, 14); + name = "download_inode"; added = (1, 33, 14); style = RErr, [Mountable "device"; Int64 "inode"; FileOut "filename"], []; proc_nr = Some 464; optional = Some "sleuthkit"; diff --git a/tests/tsk/Makefile.am b/tests/tsk/Makefile.am index e060e5874..0cd7c03a3 100644 --- a/tests/tsk/Makefile.am +++ b/tests/tsk/Makefile.am @@ -18,7 +18,7 @@ include $(top_srcdir)/subdir-rules.mk TESTS = \ - test-icat.sh + test-download-inode.sh TESTS_ENVIRONMENT = $(top_builddir)/run --test diff --git a/tests/tsk/test-icat.sh b/tests/tsk/test-download-inode.sh similarity index 92% rename from tests/tsk/test-icat.sh rename to tests/tsk/test-download-inode.sh index 3b0fca422..9c65aa915 100755 --- a/tests/tsk/test-icat.sh +++ b/tests/tsk/test-download-inode.sh @@ -16,11 +16,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Test the icat command. +# Test the download_inode command. set -e -if [ -n "$SKIP_TEST_ICAT_SH" ]; then +if [ -n "$SKIP_TEST_DOWNLOAD_INODE_SH" ]; then echo "$0: test skipped because environment variable is set." exit 77 fi @@ -41,7 +41,7 @@ fi # download Master File Table ($MFT). guestfish --ro -a ../../test-data/phony-guests/windows.img <