Changeset 1481

Show
Ignore:
Timestamp:
12/07/07 07:50:40 (7 months ago)
Author:
chengyu
Message:

ntfs bug fixed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/mwfetcher/CHANGELOG

    r735 r1481  
     1v0.1.2 
     2* Fixed a bug while processing NTFS file system. !IMPORTANT! After upgrading to 
     3  this version, please use "-i" option a generate a new clean list. 
     4 
    15v0.1.1 
    26* Added auto detection for file system type, which will override "-t vfat" option. 

  • trunk/mwfetcher/install

    r735 r1481  
    11#!/bin/bash 
     2 
     3echo "Installing MwFetcher v0.1.2 ..." 
    24 
    35install_path=${1:-"/usr/sbin/"} 
    …… 
    3032/bin/cp ./src/mwfetcher "$install_path" 
    3133chmod 755 "$install_path/mwfetcher" 
     34 
     35echo "Regenerate clean file list if you just upgraded to version 0.1.2!" 

  • trunk/mwfetcher/src/mwfetcher

    r735 r1481  
    66# Copyright (C) 2006 Artemis: Chinese Honeynet Project 
    77# 
    8 # Version 0.1.1 
     8# Version 0.1.2 
    99#  
    1010# This program is free software; you can redistribute it and/or modify 
    …… 
    6060#Do not modify 
    6161fetch_dir=tools/Samples 
    62 version="0.1.1" 
     62version="0.1.2" 
    6363 
    6464# mount_vmdisk 
    …… 
    178178                cp "$good_file" "$home_dir/$bad_file" 
    179179        fi 
    180         diff "$home_dir/$bad_file" "$good_file" | grep "^<" | sed '{s/< //}' > "$home_dir/diff.tmp" 
     180        diff -B -H "$home_dir/$bad_file" "$good_file" | grep "^<" | sed '{s/< //}' > "$home_dir/diff.tmp" 
    181181        rm -f "$home_dir/$bad_file" 
    182182         
    …… 
    233233        elif [ -n "$(echo ${sample_path##*/} | grep ^fsck)" ]; then 
    234234                return 1 
    235         elif [ $(ls -l "$sample_path" | awk '{print $5}') == 57856 ]; then 
    236                 return 1 
    237235        elif [ -n "$(file "$sample_path" | grep executable | grep MS)" ]; then 
    238236                return 0 
    …… 
    310308                cat "${fslist_name}.tmp" | while read line 
    311309                do 
    312                         md5sum "$line" 2>/dev/null | sed s/$mount_dir_hdr// >> "$fslist_name" 
     310                        md5sum "$line" 2>/dev/null | sed s/$mount_dir_hdr// | sort >> "$fslist_name" 
    313311                done 
    314312                rm "${fslist_name}.tmp" -f 
    315313        else 
    316314                echo "Normal" > "$fslist_name" 
    317                 find "$mount_dir" -type f | sed s/$mount_dir_hdr// >> "$fslist_name" 
     315                find "$mount_dir" -type f | sed s/$mount_dir_hdr// | sort >> "$fslist_name" 
    318316        fi 
    319317