hush.in: Fix ordering of log files so we don't delete the wrong ones.

[misc] / hush.in

diff --git a/hush.in b/hush.in
index 4b3b751f5f73b450c35ca0ebadfd5d370d77f7bc..f10f5070ab50eb8689052aa8be4aaa7ac6d3a8d3 100755 (executable)
--- a/hush.in
+++ b/hush.in
@@ -145,10 +145,11 @@ EOF
 ## stage of a pipeline, where we actually wanted the status of the first.  So
 ## we write that to another pipe (fd 5) and pick it out using command
 ## substitution.
+copy () { while IFS= read -r line; do printf "%s %s\n" "$1" "$line"; done; }
 rc=$(
-  { { { { set +e; $lbuf "$cmd" "$@"; echo $? >&5; } |
-       while IFS= read line; do echo "| $line"; done >&4; } 2>&1 |
-      while IFS= read line; do echo "* $line"; done >&4; } 4>&1 |
+  { { { { set +e; $lbuf "$cmd" "$@" 3>&- 4>&- 5>&-; echo $? >&5; } |
+       copy "|" >&4; } 2>&1 |
+      copy "*" >&4; } 4>&1 |
     cat -u >&3; } 5>&1 </dev/null
 )
 
@@ -162,20 +163,21 @@ exec 3>&-
 ###--------------------------------------------------------------------------
 ### Delete old log files if there are too many.
 
-## Count up the logfiles.
-nlog=0
+## Find out the tails of the logfile names.  We assume that we're responsible
+## for all of these, and therefore that they're nicely formed.
+logs="" nlog=0
 for i in "$logdir/$tag".*; do
   if [ ! -f "$i" ]; then continue; fi
-  nlog=$(( nlog + 1 ))
+  nlog=$(( $nlog + 1 ))
+  logs="$logs ${i#$logdir/$tag.}"
 done
 
 ## If there are too many, go through and delete some early ones.
 if [ $nlog -gt $maxlog ]; then
-  n=$(( nlog - maxlog ))
-  for i in "$logdir/$tag".*; do
-    if [ ! -f "$i" ]; then continue; fi
-    rm -f "$i"
-    n=$(( n - 1 ))
+  n=$(( $nlog - $maxlog ))
+  for i in $logs; do echo $i; done | sort -t# -k1,1 -k2n | while read i; do
+    rm -f "$logdir/$tag.$i"
+    n=$(( $n - 1 ))
     if [ $n -eq 0 ]; then break; fi
   done
 fi