nntp: use substr to check for trailing CRLF

[public-inbox.git] / scripts / dc-dlvr

diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr
index 5ebca3fedc23ea1c0eacbe111c64cc8e7ef3cb2e..935a8312d8527970c2bb435fc7b5c6bda15bb46f 100755 (executable)
--- a/scripts/dc-dlvr
+++ b/scripts/dc-dlvr
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2008-2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2008-2021 all contributors <meta@public-inbox.org>
 # License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>
 # This is installed as /etc/dc-dcvr on my system
 # to use with postfix main.cf: mailbox_command = /etc/dc-dlvr "$EXTENSION"
@@ -25,7 +25,8 @@ cat >$CDMSG
 $CLAMDSCAN --quiet - <$CDMSG
 if test $? -eq 1
 then
-       exec $DELIVER -m INBOX.spam <$CDMSG
+       $DELIVER -m INBOX.spam <$CDMSG
+       exec rm -f $rm_list
 fi
 
 # pre-filter, for infrequently read lists which do their own spam filtering:
@@ -56,14 +57,14 @@ err=$?
 set -e
 
 case $err in
-1) $DELIVER -m INBOX.spam < $TMPMSG ;;
+1) $DELIVER -m INBOX.spam <$TMPMSG ;;
 *)
        # users may override normal delivery and have it go elsewhere
        if test -r ~/.dc-dlvr.rc
        then
                . ~/.dc-dlvr.rc
        else
-               $DELIVER -m INBOX < $TMPMSG
+               $DELIVER -m INBOX <$TMPMSG
        fi
        ;;
 esac