projects
/
dupemerge
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f55031
)
dupemerge: inodes are now non-numeric
author
Zygo Blaxell
<zblaxell@faye.furryterror.org>
Wed, 6 Jan 2010 18:22:38 +0000
(13:22 -0500)
committer
Zygo Blaxell
<zblaxell@waya.furryterror.org>
Sat, 9 Jan 2010 02:22:03 +0000
(21:22 -0500)
faster-dupemerge
patch
|
blob
|
history
diff --git
a/faster-dupemerge
b/faster-dupemerge
index 4ad0176ea3dfcddddc95fa685aa8c2c9ef63d0f6..7e77776d59474a93e560d97989d39f2601c9c899 100755
(executable)
--- a/
faster-dupemerge
+++ b/
faster-dupemerge
@@
-288,6
+288,12
@@
sub link_files {
}
}
}
}
+# Convert $dev,$ino into a single string where lexical and numeric orderings are equivalent
+sub format_inode ($$) {
+ my ($dev, $ino) = @_;
+ 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,7
+366,7
@@
incumbent_file:
next incumbent_file;
}
next incumbent_file;
}
- if (
$incumbent_ino !=
$incumbent) {
+ if (
format_inode($incumbent_dev, $incumbent_ino) ne
$incumbent) {
warn "$incumbent_file: expected inode $incumbent, found $incumbent_ino";
$surprises++;
next incumbent_file;
warn "$incumbent_file: expected inode $incumbent, found $incumbent_ino";
$surprises++;
next incumbent_file;
@@
-380,7
+386,7
@@
candidate_file:
next candidate_file;
}
next candidate_file;
}
- if (
$candidate_ino !=
$candidate) {
+ if (
format_inode($candidate_dev, $candidate_ino) ne
$candidate) {
warn "$candidate_file: expected inode $candidate, found $candidate_ino";
$surprises++;
next candidate_file;
warn "$candidate_file: expected inode $candidate, found $candidate_ino";
$surprises++;
next candidate_file;
@@
-547,7
+553,7
@@
while (<FIND>) {
die "read error: $!\nLast input line was '$_'" unless defined($name);
# 64 bits out to be enough for everybody!
die "read error: $!\nLast input line was '$_'" unless defined($name);
# 64 bits out to be enough for everybody!
- 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;