make tickle processing more robust

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index d865e86b3f0846fb4109a533870a5936b3875164..672358daf66a82c5557b57f6f644fed95f279737 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -2,30 +2,38 @@
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 {
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 {

+  BIN_DATE=/bin/date
+  DELIVERY_TIME=04:20

   STAMP
   STAMP

+

   :0
   * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
   :0
   * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$

-  { STAMP=$MATCH }
+  { STAMP="$MATCH (`$BIN_DATE -d @$MATCH +%c`)" }
+
+  :0 E
+  * MATCH ?? ^[0-9]+h$
+  * MATCH ?? ^\/[^h]+
+  { DATESTR="$DATE + $MATCH hours" }
+
+  JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"

 
   :0 E
   * MATCH ?? ^[0-9]+m$
   * MATCH ?? ^\/[^m]+
 
   :0 E
   * MATCH ?? ^[0-9]+m$
   * MATCH ?? ^\/[^m]+

-  { DATESTR="$DATE + $MATCH months 00:00" }
+  { DATESTR="$JUST_DATE + $MATCH months $DELIVERY_TIME" }

 
   :0 E
   * MATCH ?? ^[0-9]+w$
   * MATCH ?? ^\/[^w]+
 
   :0 E
   * MATCH ?? ^[0-9]+w$
   * MATCH ?? ^\/[^w]+

-  { DATESTR="$DATE + $MATCH weeks 00:00" }
+  { DATESTR="$JUST_DATE + $MATCH weeks $DELIVERY_TIME" }

 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   * MATCH ?? ^\/[^d]+
 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   * MATCH ?? ^\/[^d]+

-  { DATESTR="$DATE + $MATCH days 00:00" }
+  { DATESTR="$JUST_DATE + $MATCH days $DELIVERY_TIME" }

 
 

-  :0 E
-  * MATCH ?? ^[0-9]+h$
-  * MATCH ?? ^\/[^h]+
-  { DATESTR="$DATE + $MATCH hours" }
+  JUST_DATE
+  DELIVERY_TIME

 
   :0 E
   {
 
   :0 E
   {


@@ -36,13 +44,23 @@
 
   :0
   * ! STAMP ?? .
 
   :0
   * ! STAMP ?? .

-  { STAMP=`/bin/date +%s -d "$DATESTR"` }
+  { STAMP=`$BIN_DATE +'%s (%c)' -d "$DATESTR"` }
+
+  :0
+  * ! STAMP ?? ^[0-9]+ \([A-Za-z ]+ [0-9 :]+\)$
+  {
+    LOG="tickle:      error creating timestamp ($STAMP), using \$now$NL"
+    STAMP="`$BIN_DATE +%s` (ERROR: original stamp '$STAMP' invalid)"
+  }

 
 

-  LOG="tickle:      stamping message $MSGID with $STAMP$NL"
+  :0 E
+  { LOG="tickle:      stamping message $MSGID with $STAMP$NL" }

 
   :0 fw
   |$FORMAIL -i "X-Tickle: $STAMP"
 
   :0
   $BASE/.tickler/
 
   :0 fw
   |$FORMAIL -i "X-Tickle: $STAMP"
 
   :0
   $BASE/.tickler/

+
+  BIN_DATE

 }
 }