X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fmm-encode.el;h=ecd88b3dac96ef8f4ab2eb03c4d7f5a5cd4c826e;hp=e3bd0af6a6b750551ac76829385a6987b06bf251;hb=125d88b46ad2efa065f06d5dac37a245b488985a;hpb=0fd5076731e4ecde4612bdcf887a9dfb0e3a02f2 diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el index e3bd0af6a..ecd88b3da 100644 --- a/lisp/mm-encode.el +++ b/lisp/mm-encode.el @@ -1,5 +1,6 @@ ;;; mm-encode.el --- Functions for encoding MIME things -;; Copyright (C) 1998 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 +;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -24,56 +25,44 @@ ;;; Code: +(eval-when-compile (require 'cl)) (require 'mail-parse) - -(defvar mm-mime-file-types - '(("\\.rtf$" "text/richtext") - ("\\.\\(html\\|htm\\)$" "text/html") - ("\\.ps$" "application/postscript" - (encoding quoted-printable) - (disposition "attachment")) - ("\\.\\(jpeg\\|jpg\\)$" "image/jpeg") - ("\\.gif$" "image/gif") - ("\\.png$" "image/png") - ("\\.\\(tiff\\|tif\\)$" "image/tiff") - ("\\.pic$" "image/x-pic") - ("\\.mag$" "image/x-mag") - ("\\.xbm$" "image/x-xbm") - ("\\.xwd$" "image/x-xwd") - ("\\.au$" "audio/basic") - ("\\.mpg$" "video/mpeg") - ("\\.txt$" "text/plain") - ("\\.el$" "application/octet-stream" - ("type" ."emacs-lisp")) - ("\\.lsp$" "application/octet-stream" - ("type" "common-lisp")) - ("\\.tar\\.gz$" "application/octet-stream" - ("type" "tar+gzip")) - ("\\.tgz$" "application/octet-stream" - ("type" "tar+gzip")) - ("\\.tar\\.Z$" "application/octet-stream" - ("type" "tar+compress")) - ("\\.taz$" "application/octet-stream" - ("type" "tar+compress")) - ("\\.gz$" "application/octet-stream" - ("type" "gzip")) - ("\\.Z$" "application/octet-stream" - ("type" "compress")) - ("\\.lzh$" "application/octet-stream" - ("type" . "lha")) - ("\\.zip$" "application/zip") - ("\\.diffs?$" "text/plain" - ("type" . "patch")) - ("\\.patch$" "application/octet-stream" - ("type" "patch")) - ("\\.signature" "text/plain") - (".*" "application/octet-stream")) - "*Alist of regexps and MIME types.") - -(defvar mm-content-transfer-encoding-defaults - '(("text/.*" quoted-printable) +(require 'mailcap) +(eval-and-compile + (autoload 'mm-body-7-or-8 "mm-bodies") + (autoload 'mm-long-lines-p "mm-bodies")) + +(defcustom mm-content-transfer-encoding-defaults + '(("text/x-patch" 8bit) + ("text/.*" qp-or-base64) + ("message/rfc822" 8bit) + ("application/emacs-lisp" 8bit) + ("application/x-emacs-lisp" 8bit) + ("application/x-patch" 8bit) (".*" base64)) - "Alist of regexps that match MIME types and their encodings.") + "Alist of regexps that match MIME types and their encodings. +If the encoding is `qp-or-base64', then either quoted-printable +or base64 will be used, depending on what is more efficient." + :type '(repeat (list (regexp :tag "MIME type") + (choice :tag "encoding" + (const 7bit) + (const 8bit) + (const qp-or-base64) + (const quoted-printable) + (const base64)))) + :group 'mime) + +(defvar mm-use-ultra-safe-encoding nil + "If non-nil, use encodings aimed at Procrustean bed survival. + +This means that textual parts are encoded as quoted-printable if they +contain lines longer than 76 characters or starting with \"From \" in +the body. Non-7bit encodings (8bit, binary) are generally disallowed. +This is to reduce the probability that a broken MTA or MDA changes the +message. + +This variable should never be set directly, but bound before a call to +`mml-generate-mime' or similar functions.") (defun mm-insert-rfc822-headers (charset encoding) "Insert text/plain headers with CHARSET and ENCODING." @@ -87,61 +76,74 @@ "Insert multipart/mixed headers." (let ((boundary "=-=-=")) (insert "MIME-Version: 1.0\n") - (insert (format "Content-Type: multipart/mixed; boundary=\"%s\"\n" - boundary)) + (insert "Content-Type: multipart/mixed; boundary=\"" boundary "\"\n") boundary)) (defun mm-default-file-encoding (file) "Return a default encoding for FILE." - (let ((types mm-mime-file-types) - type) - (catch 'found - (while (setq type (pop types)) - (when (string-match (car type) file) - (throw 'found (cdr type))) - (pop types))))) + (if (not (string-match "\\.[^.]+$" file)) + "application/octet-stream" + (mailcap-extension-to-mime (match-string 0 file)))) + +(defun mm-safer-encoding (encoding) + "Return an encoding similar to ENCODING but safer than it." + (cond + ((memq encoding '(7bit 8bit quoted-printable)) 'quoted-printable) + ;; The remaining encodings are binary and base64 (and perhaps some + ;; non-standard ones), which are both turned into base64. + (t 'base64))) (defun mm-encode-content-transfer-encoding (encoding &optional type) + "Encode the current buffer with ENCODING for MIME type TYPE. +ENCODING can be: nil (do nothing); one of `quoted-printable', `base64'; +`7bit', `8bit' or `binary' (all do nothing); a function to do the encoding." (cond ((eq encoding 'quoted-printable) - (quoted-printable-encode-region (point-min) (point-max))) + ;; This used to try to make a multibyte buffer unibyte. That's + ;; completely wrong, since you'd get QP-encoded emacs-mule. If + ;; this gets run on multibyte text it's an error that needs + ;; fixing, and the encoding function will signal an error. + ;; Likewise base64 below. + (quoted-printable-encode-region (point-min) (point-max) t)) ((eq encoding 'base64) (when (equal type "text/plain") (goto-char (point-min)) (while (search-forward "\n" nil t) (replace-match "\r\n" t t))) - (condition-case () - (base64-encode-region (point-min) (point-max)) - (error nil))) + (base64-encode-region (point-min) (point-max))) ((memq encoding '(7bit 8bit binary)) + ;; Do nothing. ) ((null encoding) + ;; Do nothing. ) - ((eq encoding 'x-uuencode) - (condition-case () - (uudecode-encode-region (point-min) (point-max)) - (error nil))) + ;; Fixme: Ignoring errors here looks bogus. ((functionp encoding) - (condition-case () - (funcall encoding (point-min) (point-max)) - (error nil))) + (ignore-errors (funcall encoding (point-min) (point-max)))) (t - (message "Unknown encoding %s; defaulting to 8bit" encoding)))) + (error "Unknown encoding %s" encoding)))) (defun mm-encode-buffer (type) - "Encode the buffer which contains data of TYPE. + "Encode the buffer which contains data of MIME type TYPE. +TYPE is a string or a list of the components. The encoding used is returned." (let* ((mime-type (if (stringp type) type (car type))) (encoding (or (and (listp type) (cadr (assq 'encoding type))) - (mm-content-transfer-encoding mime-type)))) + (mm-content-transfer-encoding mime-type))) + (bits (mm-body-7-or-8))) + ;; We force buffers that are 7bit to be unencoded, no matter + ;; what the preferred encoding is. + ;; Only if the buffers don't contain lone lines. + (when (and (eq bits '7bit) (not (mm-long-lines-p 76))) + (setq encoding bits)) (mm-encode-content-transfer-encoding encoding mime-type) encoding)) (defun mm-insert-headers (type encoding &optional file) "Insert headers for TYPE." - (insert "Content-Type: " (car type)) + (insert "Content-Type: " type) (when file (insert ";\n\tname=\"" (file-name-nondirectory file) "\"")) (insert "\n") @@ -153,14 +155,44 @@ The encoding used is returned." (insert "\n")) (defun mm-content-transfer-encoding (type) - "Return a CTE suitable for TYPE." + "Return a CTE suitable for TYPE to encode the current buffer." (let ((rules mm-content-transfer-encoding-defaults)) (catch 'found (while rules (when (string-match (caar rules) type) - (throw 'found (cadar rules))) + (throw 'found + (let ((encoding + (if (eq (cadr (car rules)) 'qp-or-base64) + (mm-qp-or-base64) + (cadr (car rules))))) + (if mm-use-ultra-safe-encoding + (mm-safer-encoding encoding) + encoding)))) (pop rules))))) +(defun mm-qp-or-base64 () + "Return the type with which to encode the buffer. +This is either `base64' or `quoted-printable'." + (if (equal mm-use-ultra-safe-encoding '(sign . "pgp")) + ;; perhaps not always accurate? + 'quoted-printable + (save-excursion + (let ((limit (min (point-max) (+ 2000 (point-min)))) + (n8bit 0)) + (goto-char (point-min)) + (skip-chars-forward "\x20-\x7f\r\n\t" limit) + (while (< (point) limit) + (incf n8bit) + (forward-char 1) + (skip-chars-forward "\x20-\x7f\r\n\t" limit)) + (if (or (< (* 6 n8bit) (- limit (point-min))) + ;; Don't base64, say, a short line with a single + ;; non-ASCII char when splitting parts by charset. + (= n8bit 1)) + 'quoted-printable + 'base64))))) + (provide 'mm-encode) +;;; arch-tag: 7d01bba4-d469-4851-952b-dc863f84ed66 ;;; mm-encode.el ends here