more spammers

[etc/mailfilter.git] / bin / process-delayed-queue

diff --git a/bin/process-delayed-queue b/bin/process-delayed-queue
index fd8484005f5ae44f6cd5312353cc3c3992e118ee..e978a40aacc9125166a658b7544d095390748fb8 100755 (executable)
--- a/bin/process-delayed-queue
+++ b/bin/process-delayed-queue
@@ -10,39 +10,40 @@ DELAYED_QUEUE_DB=$HOME/.var/procmail/delayed-queue.sqlite
 
 QUERY='select * from messages where release_ts < strftime("%s", "now")'
 
 
 QUERY='select * from messages where release_ts < strftime("%s", "now")'
 

-$SQLITE -column $DELAYED_QUEUE_DB "$QUERY" | while read msgid basefile ts; do
-
-  file="$MAILDIR/$basefile"
-  files="$file ${file}:2,"
-
-  basename="${file##*/}"
-  dirname="${file%/*}"
-  case "${dirname##*/}" in
-    cur)
-      files="$files ${file}:2,S"
-      file="${dirname%/cur}/new/$basename"
-      files="$files $file ${file}:2,"
-      ;;
-    new)
-      file="${dirname%/new}/cur/$basename"
-      files="$files ${file}:2, ${file}:2,S"
-      ;;
-  esac
-
-  found=0
-  for file in $files; do
-    if [ -f "$file" ]; then
-      $RESUBMIT "$file"
-      echo "I: resubmitted $msgid"
-      found=1
-      break
+$SQLITE -list -separator ' ' $DELAYED_QUEUE_DB "$QUERY" \
+  | while read msgid basefile ts; do
+
+    file="$MAILDIR/$basefile"
+    files="$file ${file}:2,"
+
+    basename="${file##*/}"
+    dirname="${file%/*}"
+    case "${dirname##*/}" in
+      cur)
+        files="$files ${file}:2,S"
+        file="${dirname%/cur}/new/$basename"
+        files="$files $file ${file}:2,"
+        ;;
+      new)
+        file="${dirname%/new}/cur/$basename"
+        files="$files ${file}:2, ${file}:2,S"
+        ;;
+    esac
+
+    found=0
+    for file in $files; do
+      if [ -f "$file" ]; then
+        $RESUBMIT "$file"
+        echo "I: resubmitted $msgid"
+        found=1
+        break
+      fi
+    done
+
+    $SQLITE $DELAYED_QUEUE_DB "delete from messages where msgid = '$msgid'"
+
+    if [ $found -eq 0 ]; then
+      echo "E: message $msgid not found in $basefile" >&2

     fi
     fi

-  done
-
-  $SQLITE $DELAYED_QUEUE_DB "delete from messages where msgid = '$msgid'"
-
-  if [ $found -eq 0 ]; then
-    echo "E: message $msgid not found in $basefile" >&2
-  fi

 
 done
 
 done