X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=faster-dupemerge;h=075f0c7c7cb3db23aea8ea0f8633eed443de4842;hb=b9a391c55bb9780e30dcee65f6f5898d4272b7e8;hp=9753e5aacb2a74ffb9b89fa0a4eec5636d600c90;hpb=a4de3164f2ee36a4680c9153fda3b28435a77328;p=dupemerge

diff --git a/faster-dupemerge b/faster-dupemerge
index 9753e5a..075f0c7 100755
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@ -155,6 +155,7 @@ hard links).
                         S, s - lstat(2) (see source for details)
                         U - unlink(2)
                         . - all inodes with similar attributes done
+                        (123456) - current file size in bytes
 
         --sort          pass next options (up to --) to sort command
 
@@ -404,7 +405,7 @@ incumbent_file:
 						}
 
 						if (format_inode($incumbent_dev, $incumbent_ino) ne $incumbent) {
-							warn "$incumbent_file: expected inode $incumbent, found $incumbent_dev:$incumbent_ino";
+							warn "$incumbent_file: expected inode $incumbent, found ".format_inode($incumbent_dev, $incumbent_ino);
 							$surprises++;
 							next incumbent_file;
 						}
@@ -425,7 +426,7 @@ candidate_file:
 							}
 
 							if (format_inode($candidate_dev, $candidate_ino) ne $candidate) {
-								warn "$candidate_file: expected inode $candidate, found $candidate_dev:$candidate_ino";
+								warn "$candidate_file: expected inode $candidate, found ".format_inode($candidate_dev, $candidate_ino);
 								$surprises++;
 								next candidate_file;
 							}
@@ -664,7 +665,7 @@ if ($humane) {
 
 	sub space_numbers {
 		my ($num) = @_;
-		1 while $num =~ s/(\d)(\d\d\d)( \d\d\d)*$/$1 $2$3/os;
+		1 while $num =~ s/(\d)(\d\d\d)((?: \d\d\d)*)$/$1 $2$3/os;
 		$num = ' ' x ($max_num_len - length($num)) . $num;
 		return $num;
 	}