- $HAM_REPORT < "$file" >/dev/null;
- grep -e '^From ' -e 'From: ' -e 'To: ' -e 'Cc: ' "$file"|spamassassin -W>/dev/null;
+ $HAM_REPORT < "$file" >/dev/null 2>&1;
+ formail -c < "$file" |grep -e '^From ' -e 'From: ' -e 'To: ' -e 'Cc: '|spamassassin --add-to-whitelist >/dev/null 2>&1;
+ if ! $SPAM_CHECK < "$file" >/dev/null 2>&1; then
+ mkdir -p "${NEEDS_HAM_RULES}/cur";
+ TMP="$(mktemp -d)"
+ trap "rm -f '$TMP'/file; rmdir '$TMP'" EXIT
+ spamc -s $((100 * 1024 * 1024)) < "$file" > "$TMP/file" 2>/dev/null;
+ mv "$TMP/file" "${NEEDS_HAM_RULES}/cur/$(basename "$file")";
+ trap - EXIT;
+ rmdir "$TMP";
+ elif [ "$(pwd)" = "${NEEDS_HAM_RULES}" ]; then
+ rm -f "$file";
+ fi;