diff --git a/CHANGES.txt b/CHANGES.txt
index 0117e55ba6..c89714fce0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,8 @@
11/7/08: Bug Fix: Changed case management code to not error when 'dls ...'
line was encountered.
+11/14/08: Bug Fix: Fixed bug 2288406 (parsing of new fls -l format when file name searching and deleted file listing)
+
--------------------------- Version 2.20 --------------------------------
7/1/08: Update: Updated FAT sizes based on new "special" files.
diff --git a/TODO.txt b/TODO.txt
index 7dfe97f22a..d8a262840f 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -52,7 +52,6 @@ files appended to each other?
--------------------- GENERAL -----------------------------
- Add foremost
- link in meta data to list just unallocated / used
-- HTML encode output data (TASK outout)
- Make data bases updatable in the host details view
- Option to mount images in loopback when it is a Linux system
- read config files in autopsy itself and not everytime ...
diff --git a/lib/File.pm b/lib/File.pm
index fc6d618fee..68443175dd 100644
--- a/lib/File.pm
+++ b/lib/File.pm
@@ -971,11 +971,13 @@ EOF3
# for valid files and directories make a link
# Special rule for $OrphanFiles directory, which has a size of 0
- if ( ($meta_int[$i] >= $Fs::first_meta{$ftype})
+ if (
+ ($meta_int[$i] >= $Fs::first_meta{$ftype})
&& (($size[$i] > 0) || ($name[$i] =~ /^\$Orphan/))
&& ( ($itype[$i] eq 'r')
|| ($itype[$i] eq 'd')
- || ($itype[$i] eq 'v')))
+ || ($itype[$i] eq 'v'))
+ )
{
print " | $lcolor";
}
@@ -1191,18 +1193,14 @@ sub file_list_file {
. " | $sp | \n";
# Mod / Written
- print " ![]() ";
- }
- else {
- print "src=\"pict/file_h_wr_link.jpg\" "
+ if ($Fs::has_mtime{$ftype}) {
+ print " | ![]() ";
+ . "alt=\"Written Time\">"
+ . " | \n"
+ . "$sp | \n";
}
- print "\n" . "$sp | \n";
# Access
print " ![]() \n"
. " | $sp | \n";
- # Change / Create
- print " ![]() ";
+ # Change
+ if ($Fs::has_ctime{$ftype}) {
+ print " | ![]() "
+ . " | \n"
+ . "$sp | \n";
}
- else {
- print "src=\"pict/file_h_cre_link.jpg\" "
- . "width=\"59\" height=20 "
- . "alt=\"Create Time\">";
+
+ # Create
+ if ($Fs::has_crtime{$ftype}) {
+ print " ![]() "
+ . " | \n"
+ . "$sp | \n";
}
- print "\n" . "$sp | \n";
# Size
print " ![]() $color$m | "
- . "$sp | \n"
- . "$color$a | "
- . "$sp | \n"
- . "$color$c | "
- . "$sp | \n"
- . "$color$s | "
+ print "$color$m | " . "$sp | \n"
+ if ($Fs::has_mtime{$ftype});
+
+ print "$color$a | " . "$sp | \n";
+ print "$color$c | " . "$sp | \n"
+ if ($Fs::has_ctime{$ftype});
+ print "$color$cr | " . "$sp | \n"
+ if ($Fs::has_crtime{$ftype});
+
+ print "$color$s | "
. "$sp | \n"
. "$color$g | "
. "$sp | \n"
@@ -1470,18 +1479,14 @@ sub file_list_del {
. "$sp | \n";
# Mod / Written
- print " ![]() ";
- }
- else {
- print "src=\"pict/file_h_wr_link.jpg\" "
+ if ($Fs::has_mtime{$ftype}) {
+ print " | ![]() ";
+ . "alt=\"Written Time\">"
+ . " | \n"
+ . "$sp | \n";
}
- print "\n" . "$sp | \n";
# Access
print " ![]() \n"
. " | $sp | \n";
- # Change / Create
- print " ![]() ";
+ # Change
+ if ($Fs::has_ctime{$ftype}) {
+ print " | ![]() "
+ . " | \n"
+ . "$sp | \n";
}
- else {
- print "src=\"pict/file_h_cre_link.jpg\" "
- . "width=\"59\" height=20 "
- . "alt=\"Create Time\">";
+
+ # Create
+ if ($Fs::has_crtime{$ftype}) {
+ print " ![]() "
+ . " | \n"
+ . "$sp | \n";
}
- print "\n" . "$sp | \n";
# Size
print " ![]() $m | "
. "$sp | \n"
- . "$a | "
+ if ($Fs::has_mtime{$ftype});
+
+ print "$a | "
+ . "$sp | \n";
+ print "$c | "
. "$sp | \n"
- . "$c | "
+ if ($Fs::has_ctime{$ftype});
+ print "$cr | "
. "$sp | \n"
- . "$s | "
+ if ($Fs::has_crtime{$ftype});
+
+ print "$s | "
. "$sp | \n"
. "$g | "
. "$sp | \n"
@@ -1876,8 +1897,7 @@ sub content {
);
print "Contents Of File: $fname\n\n\n";
- Print::print_output($_)
- while ($_ = Exec::read_pipe_data(*OUT, 1024));
+ Print::print_output($_) while ($_ = Exec::read_pipe_data(*OUT, 1024));
close(OUT);
}
elsif ($sort == $FIL_SORT_HEX) {
@@ -1905,8 +1925,7 @@ sub content {
);
print "ASCII String Contents Of File: $fname\n\n\n\n";
- Print::print_output($_)
- while ($_ = Exec::read_pipe_line(*OUT));
+ Print::print_output($_) while ($_ = Exec::read_pipe_line(*OUT));
close(OUT);
}
@@ -2170,8 +2189,7 @@ sub report {
Exec::exec_pipe(*OUT,
"'$::TSKDIR/icat' -f $ftype $recflag -o $offset -i $imgtype $img $meta"
);
- Print::print_output($_)
- while ($_ = Exec::read_pipe_data(*OUT, 1024));
+ Print::print_output($_) while ($_ = Exec::read_pipe_data(*OUT, 1024));
close(OUT);
}
elsif ($sort == $FIL_SORT_HEX) {
@@ -2189,8 +2207,7 @@ sub report {
Exec::exec_pipe(*OUT,
"'$::TSKDIR/icat' -f $ftype $recflag -o $offset -i $imgtype $img $meta | '$::TSKDIR/srch_strings' -a"
);
- Print::print_output($_)
- while ($_ = Exec::read_pipe_line(*OUT));
+ Print::print_output($_) while ($_ = Exec::read_pipe_line(*OUT));
close(OUT);
}