]> 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:

projects / etc / mutt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix mailbox sourcing
[etc/mutt.git] / .mutt / sendmail-checks.d / check-attachments
diff --git a/.mutt/sendmail-checks.d/check-attachments b/.mutt/sendmail-checks.d/check-attachments
index 5632f2ea863e5cd0d54f11f5144a89f7feb129df..fe80dc044d3340a7a5a4c58ade482e9b590ce742 100755 (executable)
--- a/.mutt/sendmail-checks.d/check-attachments
+++ b/.mutt/sendmail-checks.d/check-attachments
@@ -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" \
 OVERRIDE_HEADER=X-No-Attach
 
 if ! grep -qi "^${OVERRIDE_HEADER}:" "$1" \
-     && grep -v '^> ' "$1" | 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,"
 
   if [ $nr_attach -lt 2 ]; then
     echo >&2 "E: the mail message likely references an attachment,"
mutt configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.