projects
/
dupemerge
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dupemerge: merge with waya-zblaxell, fix warning message
[dupemerge]
/
faster-dupemerge
diff --git
a/faster-dupemerge
b/faster-dupemerge
index 5028ca8df29cd94690482378926b56f72a307776..be6e29bc678bd78aec0d92fef00f030e8d829ef3 100755
(executable)
--- a/
faster-dupemerge
+++ b/
faster-dupemerge
@@
-238,7
+238,7
@@
my @find_command = ('find', @directories, @extra_find_opts, '-type', 'f');
my $printf_string = '%s ' .
($collapse_access ? '0 0 0 ' : '%U %G %m ') .
($collapse_timestamp ? '0 ' : '%T@ ') .
my $printf_string = '%s ' .
($collapse_access ? '0 0 0 ' : '%U %G %m ') .
($collapse_timestamp ? '0 ' : '%T@ ') .
- '%D
:
%i %p\0';
+ '%D
%i %p\0';
push(@find_command, '!', '-empty') unless $collapse_zero;
push(@find_command, '-printf', $printf_string);
push(@find_command, '!', '-empty') unless $collapse_zero;
push(@find_command, '-printf', $printf_string);
@@
-288,6
+288,13
@@
sub link_files {
}
}
}
}
+# Convert $dev,$ino into a single string where lexical and numeric orderings are equivalent
+sub format_inode ($$) {
+ my ($dev, $ino) = @_;
+ # 64 bits ought to be enough for everybody!
+ return sprintf('%016x:%016x', $dev, $ino);
+}
+
# Process all known files so far.
sub merge_files {
$merges_attempted++;
# Process all known files so far.
sub merge_files {
$merges_attempted++;
@@
-360,8
+367,8
@@
incumbent_file:
next incumbent_file;
}
next incumbent_file;
}
- if (
$incumbent_ino !=
$incumbent) {
- warn "$incumbent_file: expected inode $incumbent, found $incumbent_ino";
+ if (
format_inode($incumbent_dev, $incumbent_ino) ne
$incumbent) {
+ warn "$incumbent_file: expected inode $incumbent, found $incumbent_
dev:$incumbent_
ino";
$surprises++;
next incumbent_file;
}
$surprises++;
next incumbent_file;
}
@@
-380,8
+387,8
@@
candidate_file:
next candidate_file;
}
next candidate_file;
}
- if (
$candidate_ino !=
$candidate) {
- warn "$candidate_file: expected inode $candidate, found $candidate_ino";
+ if (
format_inode($candidate_dev, $candidate_ino) ne
$candidate) {
+ warn "$candidate_file: expected inode $candidate, found $candidate_
dev:$candidate_
ino";
$surprises++;
next candidate_file;
}
$surprises++;
next candidate_file;
}
@@
-543,10
+550,10
@@
end_merge:
}
while (<FIND>) {
}
while (<FIND>) {
- my ($weak_key, $dev, $ino, $name) = m/^(\d+ \d+ \d+ \d+ -?[\d.]+) (\d+)
:
(\d+) (.+)\0$/so;
+ my ($weak_key, $dev, $ino, $name) = m/^(\d+ \d+ \d+ \d+ -?[\d.]+) (\d+)
(\d+) (.+)\0$/so;
die "read error: $!\nLast input line was '$_'" unless defined($name);
die "read error: $!\nLast input line was '$_'" unless defined($name);
- my $inode =
sprintf('%016x:%016x',
$dev, $ino);
+ my $inode =
format_inode(
$dev, $ino);
print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;
print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;