X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=faster-dupemerge;h=7e899ddc8eb8ae4f87770d42a33efe4acca43b95;hb=6910de85c5daa8b99a1ea7d6e4614584fbfdfec5;hp=aa8b142ceeab5bc2390aa7fcc4abef9a10719cc5;hpb=55ebeb05eb7883f9eb09976ebfe0f8ea7718e933;p=dupemerge

diff --git a/faster-dupemerge b/faster-dupemerge
index aa8b142..7e899dd 100755
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@ -4,7 +4,7 @@ use Fcntl qw(:DEFAULT :flock);
 use File::Compare;
 use File::Temp;
 
-# Copyright (C) 2003-2010 Zygo Blaxell <faster-dupemerge@mailtoo.hungrycats.org>
+# Copyright (C) 2002-2010 Zygo Blaxell <faster-dupemerge@mailtoo.hungrycats.org>
 
 # 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
@@ -380,7 +380,7 @@ incumbent_file:
 						my ($incumbent_dev,$incumbent_ino,$incumbent_mode,$incumbent_nlink,$incumbent_uid,$incumbent_gid,$incumbent_rdev,$incumbent_size,$incumbent_atime,$incumbent_mtime,$incumbent_ctime,$incumbent_blksize,$incumbent_blocks) = lstat($incumbent_file);
 						print STDERR "\t\tINCUMBENT dev=$incumbent_dev ino=$incumbent_ino mode=$incumbent_mode nlink=$incumbent_nlink uid=$incumbent_uid gid=$incumbent_gid rdev=$incumbent_rdev size=$incumbent_size atime=$incumbent_atime mtime=$incumbent_mtime ctime=$incumbent_ctime blksize=$incumbent_blksize blocks=$incumbent_blocks _=$incumbent_file\n" if $debug;
 
-						if (!defined($incumbent_blocks)) {
+						if (!defined($incumbent_blocks) || ! (-f _)) {
 							warn "lstat: $incumbent_file: $!";
 							$surprises++;
 							next incumbent_file;
@@ -401,7 +401,7 @@ candidate_file:
 							my ($candidate_dev,$candidate_ino,$candidate_mode,$candidate_nlink,$candidate_uid,$candidate_gid,$candidate_rdev,$candidate_size,$candidate_atime,$candidate_mtime,$candidate_ctime,$candidate_blksize,$candidate_blocks) = lstat($candidate_file);
 							print STDERR "\t\t\tCANDIDATE dev=$candidate_dev ino=$candidate_ino mode=$candidate_mode nlink=$candidate_nlink uid=$candidate_uid gid=$candidate_gid rdev=$candidate_rdev size=$candidate_size atime=$candidate_atime mtime=$candidate_mtime ctime=$candidate_ctime blksize=$candidate_blksize blocks=$candidate_blocks _=$candidate_file\n" if $debug;
 
-							if (!defined($candidate_blocks)) {
+							if (!defined($candidate_blocks) || ! (-f _)) {
 								warn "lstat: $candidate_file: $!";
 								$surprises++;
 								next candidate_file;
@@ -637,6 +637,7 @@ if ($humane) {
 
 $stats_blob =~ s/([^\n]*\n[^\n]*? )(\s+)( [^\n]*\n)/$1 . ('.' x length($2)) . $3/oemg;
 
+print STDERR "\n" if $progress;
 print STDERR $stats_blob;
 
 exit(0);