X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=blobdiff_plain;f=faster-dupemerge;h=4cdef9716fd5e5de600b9810a198936ca9d46301;hp=f7334d775cea316ffee6963cb6be11f4249297eb;hb=0c34a3856f509e8b615afc0fed52b7399fee21df;hpb=e0a51bad2557267a4c38b16e8acfe5b2a33980f5

diff --git a/faster-dupemerge b/faster-dupemerge
index f7334d7..4cdef97 100755
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@ -155,7 +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
+                        (123456) - current file size in bytes
 
         --sort          pass next options (up to --) to sort command
 
@@ -242,7 +242,7 @@ while ($#ARGV >= 0) {
 	}
 }
 
-@directories or usage;
+@directories or usage($0);
 
 if (defined($lock_file) && !$dry_run) {
 	sysopen(LOCK_FILE, $lock_file, O_CREAT|O_RDONLY, 0666) or die "open: $lock_file: $!";
@@ -405,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;
 						}
@@ -426,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;
 							}
@@ -665,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;
 	}