]> git.madduck.net Git - etc/mutt.git/blobdiff - .mutt/sendmail-checks.d/check-attachments

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

restore default thread sorting
[etc/mutt.git] / .mutt / sendmail-checks.d / check-attachments
index b24f860614b341c2e2dec8929ca14b976f00f53b..fe80dc044d3340a7a5a4c58ade482e9b590ce742 100755 (executable)
@@ -21,10 +21,10 @@ RE_FRENCH='attach(e|er|(é|=E9|=C3=A9)e?s?|ement|ant)'
 OVERRIDE_HEADER=X-No-Attach
 
 if ! grep -qi "^${OVERRIDE_HEADER}:" "$1" \
-     && grep -v '^> ' | egrep -ziq "($RE_ENGLISH|$RE_GERMAN|$RE_FRENCH)"; then
+    && egrep -v '^(> |Content-Disposition:)' "$1" | egrep -qzi "($RE_ENGLISH|$RE_GERMAN|$RE_FRENCH)"; then
 
-  nr_attach=$(sed -rne 's/^Content-Type:[[:space:]]+//p' "$1" |
-              egrep -cv '^(multipart/|application/pgp-signature)')
+  nr_attach=$(sed -rne 's/^Content-Type:[[:space:]]+//pi' "$1" |
+              egrep -civ '^(multipart/|application/pgp-signature)')
 
   if [ $nr_attach -lt 2 ]; then
     echo >&2 "E: the mail message likely references an attachment,"