X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=blobdiff_plain;f=faster-dupemerge;fp=faster-dupemerge;h=62f4bc99c47b401bff653a252366eb9ef11e28e2;hp=2c85685b7056ba3c55abb05df99d84faf7aa34bb;hb=4f5affec900edd9b4b9acc4c390bfed4c91fb248;hpb=5d6afd72794a9be8dcf2040fd4cad7fb1ad75cd6 diff --git a/faster-dupemerge b/faster-dupemerge index 2c85685..62f4bc9 100755 --- a/faster-dupemerge +++ b/faster-dupemerge @@ -42,11 +42,11 @@ my $lost_bytes = 0; my $surprises = 0; eval ' - use Digest::SHA1 qw(sha1 sha1_hex sha1_base64); + use Digest::SHA qw(sha1 sha1_hex sha1_base64); '; if ($@) { - warn "Digest::SHA1: $@\nUsing external md5sum program to generate hashes.\nPlease install Digest::SHA1 (libdigest-sha1-perl)"; + warn "Digest::SHA: $@\nUsing external md5sum program to generate hashes.\nPlease install Digest::SHA"; eval <<'DIGEST'; sub really_digest { @@ -72,7 +72,7 @@ DIGEST sub really_digest { my ($filename) = (@_); die "'$filename' is not a plain file" if (-l $filename) || ! (-f _); - my $ctx = Digest::SHA1->new; + my $ctx = Digest::SHA->new; sysopen(FILE, $filename, O_RDONLY|O_NONBLOCK) or die "open: $filename: $!"; binmode(FILE); # FIXME: Necessary? Probably harmless... $ctx->addfile(\*FILE); @@ -180,7 +180,7 @@ hard links). either hashed (if it is below the --skip-hash size threshold) or compared (if it is above), but never both. -Version: 0.20120103 +Version: 0.20120914 USAGE }