From 39d18b4ff0a94a59375c6cc6985155c3413ad4a2 Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Sun, 28 May 2023 19:24:53 +0100
Subject: [PATCH] Fix missing pathname when scanning for .ts files Don't abort
 on safe_delete error

---
 webif/lib/auto/plugin/expire/auto.hook | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/webif/lib/auto/plugin/expire/auto.hook b/webif/lib/auto/plugin/expire/auto.hook
index d4f69ed..e9b1eb1 100755
--- a/webif/lib/auto/plugin/expire/auto.hook
+++ b/webif/lib/auto/plugin/expire/auto.hook
@@ -22,12 +22,13 @@ proc ::expire::directory {dir} {
 	set entries [lsort \
 	    -command [lambda {a b} {upvar getter g; expr {[$g $a] - [$g $b]}}]\
 	    [lmap i [readdir -nocomplain $dir] {
+		set fname "$dir/$i"
 		if {[string match {*.hmt} $i]} {
-		    if {[file exists "[file rootname $i].ts"]} continue
-		    if {[catch {set ts [ts parse "$dir/$i" [ts exec "$dir/$i"]]}]}\
+		    if {[file exists "[file rootname $fname].ts"]} continue
+		    if {[catch {set ts [ts parse $fname [ts exec $fname]]}]}\
 		        continue
 		} elseif {[string match {*.ts} $i]} {
-		    if {[catch {set ts [ts fetch "$dir/$i"]}]} continue
+		    if {[catch {set ts [ts fetch $fname]}]} continue
 		} else continue
 		if {$ts == 0} continue
 		list $ts
@@ -68,11 +69,9 @@ proc ::expire::directory {dir} {
 			}
 		}
 		log "        Removing."
-		if {![safe_delete $file]} {
-			log "Unknown error in safe_delete, aborting." 0
-			break
+		if {[safe_delete $file]} {
+			log "     EXPIRE: removed $file" 0
 		}
-		log "     EXPIRE: removed $file" 0
 		::auto::recalcdir $dir
 		incr num -1
 	}