From d53bd50bae722eefaf3f7df7a8159f9a83e1214e Mon Sep 17 00:00:00 2001 From: Zygo Blaxell Date: Wed, 6 Jan 2010 11:59:49 -0500 Subject: [PATCH] dupemerge: make inode sort order strictly numeric --- faster-dupemerge | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 () { - 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 _)) { -- 2.30.2