From 3f55031eaa283dff0db4536758304cd045e53045 Mon Sep 17 00:00:00 2001 From: Zygo Blaxell Date: Wed, 6 Jan 2010 12:23:28 -0500 Subject: [PATCH] dupemerge: make sure 'sort -znr' still considers dev/inode numeric --- faster-dupemerge | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/faster-dupemerge b/faster-dupemerge index 5028ca8..4ad0176 100755 --- a/faster-dupemerge +++ b/faster-dupemerge @@ -238,7 +238,7 @@ my @find_command = ('find', @directories, @extra_find_opts, '-type', 'f'); my $printf_string = '%s ' . ($collapse_access ? '0 0 0 ' : '%U %G %m ') . ($collapse_timestamp ? '0 ' : '%T@ ') . - '%D:%i %p\0'; + '%D %i %p\0'; push(@find_command, '!', '-empty') unless $collapse_zero; push(@find_command, '-printf', $printf_string); @@ -543,9 +543,10 @@ end_merge: } while () { - my ($weak_key, $dev, $ino, $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); + # 64 bits out to be enough for everybody! my $inode = sprintf('%016x:%016x', $dev, $ino); print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug; -- 2.30.2