X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=faster-dupemerge;h=6371fd037747c419cde6efce2c2a33e8b6788d6a;hb=2f607d26931ff8ed86b7f41d19f62679f8ac916d;hp=82483a22999bc9f71e999f7b37998470bd77edd3;hpb=c95c3458bb3128236b12b7f5a952089ab1667501;p=dupemerge diff --git a/faster-dupemerge b/faster-dupemerge index 82483a2..6371fd0 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@ ') . - '%i %p\0'; + '%D:%i %p\0'; push(@find_command, '!', '-empty') unless $collapse_zero; push(@find_command, '-printf', $printf_string); @@ -538,7 +538,7 @@ end_merge: } while () { - my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?\d+) (\d+) (.+)\0$/so; + my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?\d+) (\d+:\d+) (.+)\0$/so; die "read error: $!\nLast input line was '$_'" unless defined($name); print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;