X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-bodies.el;h=2ee6bf2eb3b81e9a613706dcde46c3e39597eef5;hb=3ad5943c4ad67b4f8d556436b31c3ca8bc4b5064;hp=6f46b9207bd9d3a81da1fccbccb5ffa6a441ac7a;hpb=23c969058026ed1e55687f9942acf0d2e406fb01;p=elisp%2Fgnus.git- diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index 6f46b92..2ee6bf2 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -1,5 +1,5 @@ ;;; mm-bodies.el --- Functions for decoding MIME things -;; Copyright (C) 1998 Free Software Foundation, Inc. +;; Copyright (C) 1998,99 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -36,7 +36,11 @@ ;; 8bit treatment gets any char except: 0x32 - 0x7f, CR, LF, TAB, BEL, ;; BS, vertical TAB, form feed, and ^_ -(defvar mm-8bit-char-regexp "[^\x20-\x7f\r\n\t\x7\x8\xb\xc\x1f]") +(defvar mm-7bit-chars "\x20-\x7f\r\n\t\x7\x8\xb\xc\x1f") + +(defvar mm-body-charset-encoding-alist nil + "Alist of MIME charsets to encodings. +Valid encodings are `7bit', `8bit', `quoted-printable' and `base64'.") (defun mm-encode-body () "Encode a body. @@ -51,14 +55,14 @@ If no encoding was done, nil is returned." (save-excursion (goto-char (point-min)) (if (re-search-forward "[^\x0-\x7f]" nil t) - mm-default-charset + (or mail-parse-charset + (mm-read-charset "Charset used in the article: ")) ;; The logic in `mml-generate-mime-1' confirms that it's OK ;; to return nil here. nil)) (save-excursion (goto-char (point-min)) - (let ((charsets - (delq 'ascii (mm-find-charset-region (point-min) (point-max)))) + (let ((charsets (mm-find-mime-charset-region (point-min) (point-max))) charset) (cond ;; No encoding. @@ -69,47 +73,68 @@ If no encoding was done, nil is returned." charsets) ;; We encode. (t - (let ((mime-charset - (mm-mime-charset (car charsets) (point-min) (point-max))) + (let ((charset (car charsets)) start) (when (or t ;; We always decode. (not (mm-coding-system-equal - mime-charset buffer-file-coding-system))) + charset buffer-file-coding-system))) (while (not (eobp)) - (if (eq (char-charset (char-after)) 'ascii) + (if (eq (mm-charset-after) 'ascii) (when start (save-restriction (narrow-to-region start (point)) - (mm-encode-coding-region start (point) mime-charset) + (mm-encode-coding-region start (point) charset) (goto-char (point-max))) (setq start nil)) (unless start (setq start (point)))) (forward-char 1)) (when start - (mm-encode-coding-region start (point) mime-charset) + (mm-encode-coding-region start (point) charset) (setq start nil))) - mime-charset))))))) - -(defun mm-body-encoding () - "Return the encoding of the current buffer." + charset))))))) + +(defun mm-body-encoding (charset &optional encoding) + "Do Content-Transfer-Encoding and return the encoding of the current buffer." + (let ((bits (mm-body-7-or-8))) + (cond + ((eq bits '7bit) + bits) + ((and (not mm-use-ultra-safe-encoding) + (or (eq t (cdr message-posting-charset)) + (memq charset (cdr message-posting-charset)) + (eq charset mail-parse-charset))) + bits) + (t + (let ((encoding (or encoding + (cdr (assq charset mm-body-charset-encoding-alist)) + (mm-qp-or-base64)))) + (when mm-use-ultra-safe-encoding + (setq encoding (mm-safer-encoding encoding))) + (mm-encode-content-transfer-encoding encoding "text/plain") + encoding))))) + +(defun mm-body-7-or-8 () + "Say whether the body is 7bit or 8bit." (cond ((not (featurep 'mule)) (if (save-excursion (goto-char (point-min)) - (re-search-forward mm-8bit-char-regexp nil t)) - '8bit - '7bit)) + (skip-chars-forward mm-7bit-chars) + (eobp)) + '7bit + '8bit)) (t ;; Mule version - (if (and (null (delq 'ascii (find-charset-region (point-min) (point-max)))) + (if (and (null (delq 'ascii + (mm-find-charset-region (point-min) (point-max)))) ;;!!!The following is necessary because the function ;;!!!above seems to return the wrong result under ;;!!!Emacs 20.3. Sometimes. (save-excursion (goto-char (point-min)) - (skip-chars-forward "\0-\177") + (skip-chars-forward mm-7bit-chars) (eobp))) '7bit '8bit)))) @@ -120,27 +145,40 @@ If no encoding was done, nil is returned." (defun mm-decode-content-transfer-encoding (encoding &optional type) (prog1 - (condition-case () + (condition-case error (cond ((eq encoding 'quoted-printable) (quoted-printable-decode-region (point-min) (point-max))) ((eq encoding 'base64) - (base64-decode-region (point-min) (point-max))) + (base64-decode-region + (point-min) + ;; Some mailers insert whitespace + ;; junk at the end which + ;; base64-decode-region dislikes. + (save-excursion + (goto-char (point-max)) + (skip-chars-backward "\n\t ") + (delete-region (point) (point-max)) + (point)))) ((memq encoding '(7bit 8bit binary)) + ;; Do nothing. ) ((null encoding) + ;; Do nothing. ) - ((eq encoding 'x-uuencode) - (uudecode-decode-region (point-min) (point-max))) + ((memq encoding '(x-uuencode x-uue)) + (funcall mm-uu-decode-function (point-min) (point-max))) ((eq encoding 'x-binhex) - (binhex-decode-region (point-min) (point-max))) + (funcall mm-uu-binhex-decode-function (point-min) (point-max))) ((functionp encoding) (funcall encoding (point-min) (point-max))) (t (message "Unknown encoding %s; defaulting to 8bit" encoding))) - (error nil)) + (error + (message "Error while decoding: %s" error) + nil)) (when (and - (memq encoding '(base64 x-uuencode x-binhex)) + (memq encoding '(base64 x-uuencode x-uue x-binhex)) (equal type "text/plain")) (goto-char (point-min)) (while (search-forward "\r\n" nil t) @@ -149,33 +187,54 @@ If no encoding was done, nil is returned." (defun mm-decode-body (charset &optional encoding type) "Decode the current article that has been encoded with ENCODING. The characters in CHARSET should then be decoded." - (setq charset (or charset rfc2047-default-charset)) + (if (stringp charset) + (setq charset (intern (downcase charset)))) + (if (or (not charset) + (eq 'gnus-all mail-parse-ignored-charsets) + (memq 'gnus-all mail-parse-ignored-charsets) + (memq charset mail-parse-ignored-charsets)) + (setq charset mail-parse-charset)) (save-excursion (when encoding (mm-decode-content-transfer-encoding encoding type)) (when (featurep 'mule) - (let (mule-charset) - (when (and charset - (setq mule-charset (mm-charset-to-coding-system charset)) - ;; buffer-file-coding-system - ;Article buffer is nil coding system - ;in XEmacs - enable-multibyte-characters + (let ((mule-charset (mm-charset-to-coding-system charset))) + (if (and (not mule-charset) + (listp mail-parse-ignored-charsets) + (memq 'gnus-unknown mail-parse-ignored-charsets)) + (setq mule-charset + (mm-charset-to-coding-system mail-parse-charset))) + (when (and charset mule-charset + ;; buffer-file-coding-system + ;;Article buffer is nil coding system + ;;in XEmacs + (mm-multibyte-p) (or (not (eq mule-charset 'ascii)) - (setq mule-charset rfc2047-default-charset))) + (setq mule-charset mail-parse-charset)) + (not (eq mule-charset 'gnus-decoded))) (mm-decode-coding-region (point-min) (point-max) mule-charset)))))) (defun mm-decode-string (string charset) "Decode STRING with CHARSET." - (setq charset (or charset rfc2047-default-charset)) + (if (stringp charset) + (setq charset (intern (downcase charset)))) + (if (or (not charset) + (eq 'gnus-all mail-parse-ignored-charsets) + (memq 'gnus-all mail-parse-ignored-charsets) + (memq charset mail-parse-ignored-charsets)) + (setq charset mail-parse-charset)) (or (when (featurep 'mule) - (let (mule-charset) - (when (and charset - (setq mule-charset (mm-charset-to-coding-system charset)) - enable-multibyte-characters + (let ((mule-charset (mm-charset-to-coding-system charset))) + (if (and (not mule-charset) + (listp mail-parse-ignored-charsets) + (memq 'gnus-unknown mail-parse-ignored-charsets)) + (setq mule-charset + (mm-charset-to-coding-system mail-parse-charset))) + (when (and charset mule-charset + (mm-multibyte-p) (or (not (eq mule-charset 'ascii)) - (setq mule-charset rfc2047-default-charset))) + (setq mule-charset mail-parse-charset))) (mm-decode-coding-string string mule-charset)))) string))