checklinks: --remove: unlink hardlink sources as well

2 files changed, 11 insertions, 7 deletions

diff --git a/bin/checklinks b/bin/checklinks
index 0a3337a..0e20186 100755
--- a/bin/checklinks
+++ b/bin/checklinks
@@ -37,7 +37,7 @@ while(<$links>) {
 	my ($type, $src, $dst) = split;
 	next unless ($type eq 'soft' or $type eq 'hard');
 	if ($remove) {
-		remove_link($src);
+		remove_link($type, $src, $dst);
 	} elsif ($type eq 'soft') {
 		check_symlink($src, $dst);
 	} elsif ($type eq 'hard') {
@@ -47,11 +47,14 @@ while(<$links>) {
 close($links);
 
 sub remove_link {
-	my $link = shift;
-
-	if (-l "$base/$link") {
-		unlink("$base/$link") or warn("cannot unlink $base/$link: $!");
-		print_format('removed', $link, '', 'red', 1);
+	my ($type, $src, $dst) = @_;
+
+	if (
+	       ($type eq 'soft' and -l "$base/$src")
+	    or ($type eq 'hard' and -e "$base/$src" and -e "$base/$dst")
+	) {
+		unlink("$base/$src") or warn("cannot unlink $base/$src: $!");
+		print_format('removed', $src, '', 'red', 1);
 	}
 	return;
 }
@@ -178,7 +181,7 @@ Shortcut for C<< --msglevel=1 >>
 
 =item B<-r>, B<--remove>
 
-Remove all symlinks. Hardlinks will be left as they are.
+Remove all link sources (hardlinks: only if their destination exists)
 
 =back
 
diff --git a/test/checklinks b/test/checklinks
index 5b70e27..53d36c6 100644
--- a/test/checklinks
+++ b/test/checklinks
@@ -22,6 +22,7 @@ checklinks
 
 echo "# checklinks --remove"
 checklinks --remove
+[[ ! -e foo ]]
 [[ -e bar ]]
 [[ ! -e link ]]
 [[ -e file ]]