X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=blobdiff_plain;f=dm6;h=44dcb9130318e4cad1c007a672f98fd5e6d88303;hp=874534fac260f177fd174250296d0a872fb16aa3;hb=b369878412e82690f14c5d0756f62dfd22f30431;hpb=79c8d21ca871e2f52d8de960cbf2534ba4509491

diff --git a/dm6 b/dm6
index 874534f..44dcb91 100755
--- a/dm6
+++ b/dm6
@@ -63,11 +63,11 @@ sub link_files {
 		unlink($tmp_to) or warn "unlink: $tmp_to: $!";	# Try, possibly in vain, to clean up
 		die "rename: $tmp_to -> $from: $saved_bang";
 	}
-	print STDERR "\b \b";
+	print STDERR "\b";
 }
 
 my $link_dir = shift @ARGV;
-(-d $link_dir) or usage;
+usage unless $link_dir;
 
 my $prefix_length = 3;
 
@@ -81,18 +81,31 @@ sub slash_prefix {
 	return ($prefix, $suffix);
 }
 
+sub mkdir_p {
+	my ($dir) = @_;
+	return if -d $dir;
+	$dir =~ s:/+$::os;
+	my $parent;
+	($parent = $dir) =~ s:[^/]+$::os;
+	if ($parent ne $dir) {
+		mkdir_p($parent);
+		print STDERR 'm';
+		mkdir($dir) or die "mkdir: $dir: $!";
+	}
+	die "mkdir: $dir: $!" unless -d $dir;
+}
+
 sub prepare_parents {
 	my ($link_dir, $file) = @_;
 	my ($prefix, $suffix) = slash_prefix($file);
 	my $parent = "$link_dir/$prefix";
-	print STDERR 'm';
-	mkpath($parent, { verbose => 0 });
-	print STDERR "\b";
-	die "mkpath: $parent: $!" unless -d $parent;
+	mkdir_p($parent);
 	return "$parent/$suffix";
 }
 
 # ext3 cannot handle more than 32000 links to a file.  Leave some headroom.
+# Arguably this should be configurable, but the losses are miniscule and
+# the coding for option support is not.
 my $link_count_max = 31990;
 
 $/ = "\0";
@@ -114,7 +127,7 @@ while (<STDIN>) {
 			next if ($st->nlink > $link_count_max);
 
 			# Check link to inode
-			my $inode_link = prepare_parents("$link_dir/inode", $st->ino);
+			my $inode_link = prepare_parents($link_dir, $st->ino . 'I');
 			print STDERR 'I';
 			my $inode_st = lstat($inode_link);
 			my $update_links;
@@ -145,7 +158,7 @@ while (<STDIN>) {
 			$digest =~ y:/:_:;
 
 			# Check link to digest
-			my $digest_link = prepare_parents("$link_dir/digest", $digest);
+			my $digest_link = prepare_parents($link_dir, "${digest}D");
 			print STDERR 'D';
 			my $digest_st = lstat($digest_link);
 			if ($digest_st) {
@@ -159,7 +172,7 @@ while (<STDIN>) {
 			print STDERR "\b";
 
 			# Which file are we keeping?
-			my $keep_file;
+			my $keep_ino;
 
 			# If digest link exists, link it to file
 			if ($digest_st) {
@@ -169,17 +182,18 @@ while (<STDIN>) {
 				# Old, replace input with old file
 				print STDERR '-';
 				link_files($digest_link, $file);
-				$keep_file = $digest_link;
+				$keep_ino = $digest_st->ino;
 			} else {
 				# New, add input to digest
 				print STDERR '+';
 				link_files($file, $digest_link);
-				$keep_file = $file;
+				$keep_ino = $st->ino;
 			}
 
 			# A link to the inode indicates we are done, so do it last
-			print STDERR '_';
-			link_files($keep_file, $inode_link);
+			$inode_link = prepare_parents($link_dir, "${keep_ino}I");
+			print STDERR ' ';
+			link_files($digest_link, $inode_link);
 
 		}
 	};
@@ -190,9 +204,9 @@ while (<STDIN>) {
 print STDERR "\nGarbage collection in '$link_dir'...";
 chdir($link_dir) || die "chdir: $link_dir: $!";
 print STDERR "\nRemoving files with link count < 3...";
-system("find digest inode -type f -links -3 -print0 | xargs -0 rm -f") and die "system: exit status $?";
+system("find . -type f -links -3 -print0 | xargs -0 rm -f") and die "system: exit status $?";
 print STDERR "\nRemoving empty directories...";
-system("find digest inode -type d -empty -print0 | xargs -0r rmdir -p --ignore-fail-on-non-empty") and die "system: exit status $?";
+system("find . -type d -empty -print0 | xargs -0r rmdir -p --ignore-fail-on-non-empty") and die "system: exit status $?";
 print STDERR "\nDone.\n";
 
 exit(0);