If more than 99 log files are being kept, exicyclog now uses 001, 002,

... instead of 01, 02, ...

2 files changed, 34 insertions, 13 deletions

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a0e85bee3..cdc3a636c 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.55 2004/12/21 14:38:02 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.56 2004/12/21 16:26:31 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -244,6 +244,9 @@ Exim version 4.50
 57. Double the size of the debug message buffer (to 2048) so that more of very
     long debug lines gets shown.
 
+58. The exicyclog utility now does better if the number of log files to keep
+    exceeds 99. In this case, it numbers them 001, 002 ... instead of 01, 02...
+
 
 Exim version 4.43
 -----------------
diff --git a/src/src/exicyclog.src b/src/src/exicyclog.src
index 4762f21f7..092b682c6 100644
--- a/src/src/exicyclog.src
+++ b/src/src/exicyclog.src
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Cambridge: exim/src/src/exicyclog.src,v 1.1 2004/10/07 10:39:01 ph10 Exp $
+# $Cambridge: exim/src/src/exicyclog.src,v 1.2 2004/12/21 16:26:31 ph10 Exp $
 
 # Copyright (c) 2004 University of Cambridge.
 # See the file NOTICE for conditions of use and distribution.
@@ -24,8 +24,10 @@
 # This is a shell script for cycling exim main and reject log files. Each time
 # it is run, the files get "shuffled down" by one, the current one (e.g.
 # mainlog) becoming mainlog.01, the previous mainlog.01 becoming mainlog.02,
-# and so on, up to the limit configured here. The same happens to the reject
-# logs. All those with numbers greater than 1 are compressed.
+# and so on, up to the limit configured here. When the number to keep is 
+# greater than 99 (not common, but some people do it), three digits are used 
+# (e.g. mainlog.001). The same shuffling happens to the reject logs. All 
+# renamed files with numbers greater than 1 are compressed.
 
 # This script should be called regularly (e.g. daily) by a root crontab
 # entry of the form
@@ -202,11 +204,18 @@ if [ -f $rejectlog.$keept.$suffix ]; then $rm $rejectlog.$keept.$suffix; fi;
 # When the number is less than 10, insert a leading zero.
 
 count=$keep
-if [ $count -lt 10 ]; then countt=0$count; else countt=$count; fi;
+if [ $count -lt 10 ]; then countt=0$count; else countt=$count; fi
 
 while [ $count -gt 1 ]; do
   old=`expr $count - 1`
-  if [ $old -lt 10 ]; then oldt=0$old; else oldt=$old; fi;
+  if [ $keep -gt 99 ]; then
+    if   [ $old -lt 10 ]; then oldt=00$old 
+    elif [ $old -lt 100 ]; then oldt=0$old
+    else oldt=$old
+    fi   
+  else 
+    if [ $old -lt 10 ]; then oldt=0$old; else oldt=$old; fi;
+  fi   
   if [ -f $mainlog.$oldt ]; then
     $mv $mainlog.$oldt $mainlog.$countt
   elif [ -f $mainlog.$oldt.$suffix ]; then
@@ -221,25 +230,34 @@ while [ $count -gt 1 ]; do
   countt=$oldt
 done
 
-# Now rename the current files as 01
+# Now rename the current files as 01 or 001 if keeping more than 99
+
+if [ $keep -gt 99 ]; then first=001; else first=01; fi
 
 if [ -f $mainlog ]; then
-  $mv $mainlog $mainlog.01
-  $chown $user:$group $mainlog.01
+  $mv $mainlog $mainlog.$first
+  $chown $user:$group $mainlog.$first
 fi
 
 if [ -f $rejectlog ]; then
-  $mv $rejectlog $rejectlog.01
-  $chown $user:$group $rejectlog.01
+  $mv $rejectlog $rejectlog.$first
+  $chown $user:$group $rejectlog.$first
 fi
 
-# Now scan the 02 and later files, compressing where necessary, and
+# Now scan the (0)02 and later files, compressing where necessary, and
 # ensuring that their owners and groups are correct.
 
 count=2;
 
 while [ $count -le $keep ]; do
-  if [ $count -lt 10 ]; then countt=0$count; else countt=$count; fi
+  if [ $keep -gt 99 ]; then
+    if   [ $count -lt 10 ]; then countt=00$count
+    elif [ $count -lt 100 ]; then countt=0$count
+    else countt=$count
+    fi    
+  else 
+    if [ $count -lt 10 ]; then countt=0$count; else countt=$count; fi
+  fi   
   if [ -f $mainlog.$countt ]; then $compress $mainlog.$countt; fi
   if [ -f $mainlog.$countt.$suffix ]; then
     $chown $user:$group $mainlog.$countt.$suffix