From: Zygo Blaxell <zblaxell@faye.furryterror.org>
Date: Wed, 6 Jan 2010 16:59:49 +0000 (-0500)
Subject: dupemerge: make inode sort order strictly numeric
X-Git-Tag: dm6-0.20100514~28
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=commitdiff_plain;h=d53bd50bae722eefaf3f7df7a8159f9a83e1214e

dupemerge: make inode sort order strictly numeric
---

diff --git a/faster-dupemerge b/faster-dupemerge
index 8df7885..5028ca8 100755
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@ -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 _)) {