}
}
+# 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++;
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;
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;
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;