dupemerge: make inode sort order strictly numeric

[dupemerge] / faster-dupemerge

diff --git a/faster-dupemerge b/faster-dupemerge
index d35f591a442a9c7bb6c52ea160bed284825089b0..5028ca8df29cd94690482378926b56f72a307776 100755 (executable)
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@ -4,7 +4,7 @@ use Fcntl qw(:DEFAULT :flock);
 use File::Compare;
 use File::Temp;
 
-# Copyright (C) 2003-2009 Zygo Blaxell <faster-dupemerge@mailtoo.hungrycats.org>
+# Copyright (C) 2003-2010 Zygo Blaxell <faster-dupemerge@mailtoo.hungrycats.org>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -335,7 +335,7 @@ hash_file:
 
                        my $incumbent_list = ($hash_to_inode{$digest} ||= []);
                        my $incumbent_matched = 0;
-                       for my $incumbent (@$incumbent_list) {
+                       for my $incumbent (sort @$incumbent_list) {
                                print STDERR "\t\tInodes $incumbent and $candidate have same hash\n" if $debug;
 
                                my $finished = 0;
@@ -543,9 +543,11 @@ end_merge:
 }
 
 while (<FIND>) {
-       my ($weak_key, $inode, $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);
 
+       my $inode = sprintf('%016x:%016x', $dev, $ino);
+
        print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;
 
        unless (! (-l $name) && (-f _)) {