git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change "expr" to "expr --" in all shell scripts. Fixes: #889
[exim.git]
/
src
/
src
/
exicyclog.src
diff --git
a/src/src/exicyclog.src
b/src/src/exicyclog.src
index efc0af5e771af733c391e5207d46f03bc568045d..097de7eaa0fc1e0a466259607019441ee41129a9 100644
(file)
--- a/
src/src/exicyclog.src
+++ b/
src/src/exicyclog.src
@@
-1,5
+1,5
@@
#! /bin/sh
#! /bin/sh
-# $Cambridge: exim/src/src/exicyclog.src,v 1.
6 2008/01/30 20:09:2
4 nm4 Exp $
+# $Cambridge: exim/src/src/exicyclog.src,v 1.
10 2009/10/30 15:14:0
4 nm4 Exp $
# Copyright (c) 2006 University of Cambridge.
# See the file NOTICE for conditions of use and distribution.
# Copyright (c) 2006 University of Cambridge.
# See the file NOTICE for conditions of use and distribution.
@@
-53,12
+53,12
@@
keep=EXICYCLOG_MAX
compress=COMPRESS_COMMAND
suffix=COMPRESS_SUFFIX
compress=COMPRESS_COMMAND
suffix=COMPRESS_SUFFIX
-chown=CHOWN_COMMAND
chgrp=CHGRP_COMMAND
chmod=CHMOD_COMMAND
chgrp=CHGRP_COMMAND
chmod=CHMOD_COMMAND
-
touch=TOUCH
_COMMAND
+
chown=CHOWN
_COMMAND
mv=MV_COMMAND
rm=RM_COMMAND
mv=MV_COMMAND
rm=RM_COMMAND
+touch=TOUCH_COMMAND
# End of editable lines
#########################################################################
# End of editable lines
#########################################################################
@@
-84,7
+84,7
@@
done
# in different places. We have a fudge that will search the usual suspects if
# requested.
# in different places. We have a fudge that will search the usual suspects if
# requested.
-for cmd in ch
own chgrp mv rm
; do
+for cmd in ch
grp chmod chown mv rm touch
; do
eval "oldcmd=\$$cmd"
if [ "$oldcmd" != "look_for_it" ] ; then continue ; fi
newcmd=$cmd
eval "oldcmd=\$$cmd"
if [ "$oldcmd" != "look_for_it" ] ; then continue ; fi
newcmd=$cmd
@@
-241,8
+241,8
@@
if [ -f $mainlog.$keept.$suffix ]; then $rm $mainlog.$keept.$suffix; fi;
if [ -f $rejectlog.$keept ]; then $rm $rejectlog.$keept; fi;
if [ -f $rejectlog.$keept.$suffix ]; then $rm $rejectlog.$keept.$suffix; fi;
if [ -f $rejectlog.$keept ]; then $rm $rejectlog.$keept; fi;
if [ -f $rejectlog.$keept.$suffix ]; then $rm $rejectlog.$keept.$suffix; fi;
-if [ -f $paniclog.$keept ]; then $rm $
reject
log.$keept; fi;
-if [ -f $paniclog.$keept.$suffix ]; then $rm $
reject
log.$keept.$suffix; fi;
+if [ -f $paniclog.$keept ]; then $rm $
panic
log.$keept; fi;
+if [ -f $paniclog.$keept.$suffix ]; then $rm $
panic
log.$keept.$suffix; fi;
# Now rename all the previous old files by increasing their numbers by 1.
# When the number is less than 10, insert a leading zero.
# Now rename all the previous old files by increasing their numbers by 1.
# When the number is less than 10, insert a leading zero.
@@
-251,7
+251,7
@@
count=$keep
if [ $count -lt 10 ]; then countt=0$count; else countt=$count; fi
while [ $count -gt 1 ]; do
if [ $count -lt 10 ]; then countt=0$count; else countt=$count; fi
while [ $count -gt 1 ]; do
- old=`expr $count - 1`
+ old=`expr
--
$count - 1`
if [ $keep -gt 99 ]; then
if [ $old -lt 10 ]; then oldt=00$old
elif [ $old -lt 100 ]; then oldt=0$old
if [ $keep -gt 99 ]; then
if [ $old -lt 10 ]; then oldt=00$old
elif [ $old -lt 100 ]; then oldt=0$old
@@
-301,7
+301,7
@@
fi
if [ -f $paniclog ]; then
$mv $paniclog $paniclog.$first
if [ -f $paniclog ]; then
$mv $paniclog $paniclog.$first
- $chown $user:$group $
reject
log.$first
+ $chown $user:$group $
panic
log.$first
$touch $paniclog
$chown $user:$group $paniclog
$chmod 640 $paniclog
$touch $paniclog
$chown $user:$group $paniclog
$chmod 640 $paniclog
@@
-334,7
+334,7
@@
while [ $count -le $keep ]; do
$chown $user:$group $paniclog.$countt.$suffix
fi
$chown $user:$group $paniclog.$countt.$suffix
fi
- count=`expr $count + 1`
+ count=`expr
--
$count + 1`
done
# End of exicyclog
done
# End of exicyclog