From d14ccef3bfe4bf69b661deb9cb312a686bf6024f Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hummypkg.org.uk>
Date: Sat, 25 Jan 2020 17:00:28 +0000
Subject: [PATCH] Catch errors from stat that might cause automatic processing
 to stall

---
 CONTROL/postinst    |  4 ++--
 webif/lib/auto/scan | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CONTROL/postinst b/CONTROL/postinst
index fc7fbe6..ef6a577 100755
--- a/CONTROL/postinst
+++ b/CONTROL/postinst
@@ -21,8 +21,8 @@ if [ -x $crontab ]; then
 	$crontab -l | grep -v webif/lib/bin/auto \
 	    | grep -v webif/lib/auto > $tmpf
 	cat $tmpf - << EOM | $crontab -
-* * * * * /mod/webif/lib/auto/scan >/dev/null 2>&1
-* * * * * /mod/webif/lib/auto/deq >/dev/null 2>&1
+* * * * * /mod/webif/lib/auto/scan >/dev/null 2>>/mod/tmp/auto.log
+* * * * * /mod/webif/lib/auto/deq >/dev/null 2>>/mod/tmp/auto.log
 EOM
 fi
 
diff --git a/webif/lib/auto/scan b/webif/lib/auto/scan
index d1df8c2..05fea36 100755
--- a/webif/lib/auto/scan
+++ b/webif/lib/auto/scan
@@ -121,35 +121,39 @@ proc ::auto::buildflagdb {dir {active {}}} {{seen {}} {indent 0}} {
 	variable rootdev
 
 	incr indent 2
-	log "[string repeat " " $indent]\[$dir]" 3
+	set pre [string repeat " " $indent]
+
+	log "${pre}\[$dir]" 3
 
 	if {$dir eq $dustbin} {
-		log "[string repeat " " $indent]Dustbin, skipping." 3
+		log "${pre}Dustbin, skipping." 3
 		incr indent -2
 		return
 	}
 
-	file stat "$dir/" st
+	if {[catch {file stat "$dir/" st} msg]} {
+		log "${pre}Can't stat $dir - $msg, skipping.." 2
+		incr indent -2
+		return
+	}
 
 	if {[specialdir $dir]} {
 		# Special folder
 		if {$st(dev) != $rootdev} {
-			log "[string repeat " " $indent\
-			    ]Special folder on different device, skipping." 3
+			log "${pre}Special folder on different device, skipping." 3
 			incr indent -2
 			return
 		}
 		if {[llength $active]} {
 			set active {}
-			log "[string repeat " " $indent\
-			    ]Special folder, overriding recursion." 3
+			log "${pre}Special folder, overriding recursion." 3
 		}
 	}
 
 	# Already seen
 	set key "$st(dev):$st(ino)"
 	if {$key in $seen} {
-		log "[string repeat " " $indent]Already seen, skipping." 3
+		log "${pre}Already seen, skipping." 3
 		incr indent -2
 		return
 	}
@@ -181,7 +185,7 @@ proc ::auto::buildflagdb {dir {active {}}} {{seen {}} {indent 0}} {
 
 	if {[llength $flags]} {
 		lappend flagdb $dir $flags
-		log "[string repeat " " $indent]    $flags" 3
+		log "${pre}    $flags" 3
 		foreach f $flags { ladd activeflags $f }
 	}