From c26e62de439b9d9d5c64583d5edbd35e2b45c38c Mon Sep 17 00:00:00 2001
From: Adam Spiers <stow@adamspiers.org>
Date: Fri, 18 Nov 2011 10:33:08 +0000
Subject: [PATCH] Trace individual cases separately when skipping stow dirs
 during unstow.

---
 stow.in | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/stow.in b/stow.in
index c9575fd..010e0ca 100755
--- a/stow.in
+++ b/stow.in
@@ -543,6 +543,33 @@ sub stow_node {
     return;
 }
 
+#===== SUBROUTINE ===========================================================
+# Name      : should_skip_stow_dir_target()
+# Purpose   : determine whether target is a stow directory and should be skipped
+# Parameters: $target => relative path to symlink target from the current directory
+# Returns   : true iff target is a stow directory
+# Throws    : n/a
+# Comments  : none
+#============================================================================
+sub should_skip_stow_dir_target {
+    my ($target) = @_;
+
+    #  don't try to remove anything under a stow directory
+    if ($target eq $Stow_Path) {
+        debug(2, "Skipping target which was current stow directory $target");
+        return 1;
+    }
+    for my $f (".stow", ".nonstow") {
+        if (-e join_paths($target, $f)) {
+            debug(2, "Skipping $target which contained $f");
+            return 1;
+        }
+    }
+
+    debug (4, "$target not protected");
+    return 0;
+}
+
 #===== SUBROUTINE ===========================================================
 # Name      : unstow_contents_orig()
 # Purpose   : unstow the contents of the given directory
@@ -556,11 +583,8 @@ sub stow_node {
 sub unstow_contents_orig {
     my ($path, $target) = @_;
 
-    #  don't try to remove anything under a stow directory
-    if ($target eq $Stow_Path or -e "$target/.stow" or -e "$target/.nonstow") {
-        debug(2, "Not unstowing from protected directory $target (compat mode)");
-        return;
-    }
+    return if should_skip_stow_dir_target($target);
+
     my $cwd = getcwd();
     debug(2, "Unstowing from $target (compat mode, cwd is $cwd)");
     debug(3, "--- source path is $path");
@@ -663,11 +687,8 @@ sub unstow_node_orig {
 sub unstow_contents {
     my ($path, $target) = @_;
 
-    #  don't try to remove anything under a stow directory
-    if ($target eq $Stow_Path or -e "$target/.stow") {
-        debug(2, "Not unstowing from protected directory $target");
-        return;
-    }
+    return if should_skip_stow_dir_target($target);
+
     my $cwd = getcwd();
     debug(2, "Unstowing from $target (cwd is $cwd)");
     debug(3, "--- source path is $path");