* mm-bodies.el (mm-long-lines-p): New function.

[gnus] / lisp / mm-bodies.el

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 135b974..28d202e 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -1,5 +1,5 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 ;;; mm-bodies.el --- Functions for decoding MIME things

-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.

 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     MORIOKA Tomohiko <morioka@jaist.ac.jp>
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     MORIOKA Tomohiko <morioka@jaist.ac.jp>


@@ -26,103 +26,260 @@
 
 (eval-and-compile
   (or (fboundp  'base64-decode-region)
 
 (eval-and-compile
   (or (fboundp  'base64-decode-region)

-      (autoload 'base64-decode-region "base64" nil t)))
+      (require 'base64)))
+
+(eval-when-compile
+  (defvar mm-uu-decode-function)
+  (defvar mm-uu-binhex-decode-function))
+

 (require 'mm-util)
 (require 'rfc2047)
 (require 'mm-util)
 (require 'rfc2047)

-(require 'qp)
+(require 'mm-encode)
+
+;; 8bit treatment gets any char except: 0x32 - 0x7f, CR, LF, TAB, BEL,
+;; BS, vertical TAB, form feed, and ^_
+(defvar mm-7bit-chars "\x20-\x7f\r\n\t\x7\x8\xb\xc\x1f")

 
 

-(defun mm-encode-body ()
+(defcustom mm-body-charset-encoding-alist
+  '((iso-2022-jp . 7bit)
+    (iso-2022-jp-2 . 7bit))
+  "Alist of MIME charsets to encodings.
+Valid encodings are `7bit', `8bit', `quoted-printable' and `base64'."
+  :type '(repeat (cons (symbol :tag "charset")
+                      (choice :tag "encoding"
+                              (const 7bit)
+                              (const 8bit)
+                              (const quoted-printable)
+                              (const base64))))
+  :group 'mime)
+
+(defun mm-encode-body (&optional charset)

   "Encode a body.
 Should be called narrowed to the body that is to be encoded.
 If there is more than one non-ASCII MULE charset, then list of found
 MULE charsets are returned.
   "Encode a body.
 Should be called narrowed to the body that is to be encoded.
 If there is more than one non-ASCII MULE charset, then list of found
 MULE charsets are returned.

+If CHARSET is non-nil, it is used.

 If successful, the MIME charset is returned.
 If no encoding was done, nil is returned."
 If successful, the MIME charset is returned.
 If no encoding was done, nil is returned."

-  (save-excursion
-    (goto-char (point-min))
-    (let ((charsets
-          (delq 'ascii (find-charset-region (point-min) (point-max))))
-         charset)
-      (cond
-       ;; No encoding.
-       ((null charsets)
-       nil)
-       ;; Too many charsets.
-       ((> (length charsets) 1)
-       charsets)
-       ;; We encode.
-       (t
-       (let ((mime-charset 
-              (mm-mime-charset (car charsets) (point-min) (point-max)))
+  (if (not (mm-multibyte-p))
+      ;; In the non-Mule case, we search for non-ASCII chars and
+      ;; return the value of `mail-parse-charset' if any are found.
+      (or charset
+         (save-excursion
+           (goto-char (point-min))
+           (if (re-search-forward "[^\x0-\x7f]" nil t)
+               (or mail-parse-charset
+                   (message-options-get 'mm-encody-body-charset)
+                   (message-options-set 
+                    'mm-encody-body-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
+      (if charset
+         (progn
+           (mm-encode-coding-region (point-min) (point-max) charset)
+           charset)
+       (goto-char (point-min))
+       (let ((charsets (mm-find-mime-charset-region (point-min) (point-max)))

              start)
              start)

-         (when (or t
-                   ;; We always decode.
-                   (not (mm-coding-system-equal
-                         mime-charset buffer-file-coding-system)))
+         (cond
+          ;; No encoding.
+          ((null charsets)
+           nil)
+          ;; Too many charsets.
+          ((> (length charsets) 1)
+           charsets)
+          ;; We encode.
+          (t
+           (setq charset (car charsets))

            (while (not (eobp))
            (while (not (eobp))

-             (if (eq (char-charset (following-char)) 'ascii)
+             (if (eq (mm-charset-after) 'ascii)

                  (when start
                    (save-restriction
                      (narrow-to-region start (point))
                  (when start
                    (save-restriction
                      (narrow-to-region start (point))

-                     (mm-encode-coding-region start (point) mime-charset)
+                     (mm-encode-coding-region
+                      start (point) (mm-charset-to-coding-system charset))

                      (goto-char (point-max)))
                    (setq start nil))
                (unless start
                  (setq start (point))))
              (forward-char 1))
            (when start
                      (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)
-             (setq start nil)))
-         mime-charset))))))
-
-(defun mm-body-encoding ()
-  "Return the encoding of the current buffer."
-  (if (and  
-       (null (delq 'ascii (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")
-        (eobp)))
-      '7bit
-    '8bit))
+             (mm-encode-coding-region start (point)
+                                      (mm-charset-to-coding-system charset))
+             (setq start nil))
+           charset)))))))
+
+(defun mm-long-lines-p (length)
+  "Say whether any of the lines in the buffer is longer than LINES."
+  (save-excursion
+    (goto-char (point-min))
+    (end-of-line)
+    (while (and (not (eobp))
+               (not (> (current-column) length)))
+      (forward-line 1)
+      (end-of-line))
+    (and (> (current-column) length)
+        (current-column))))
+
+(defvar message-posting-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))
+       (longp (mm-long-lines-p 1000)))
+    (require 'message)
+    (cond
+     ((and (not mm-use-ultra-safe-encoding)
+          (not longp)
+          (eq bits '7bit))
+      bits)
+     ((and (not mm-use-ultra-safe-encoding)
+          (not longp)
+          (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))
+         (skip-chars-forward mm-7bit-chars)
+         (eobp))
+       '7bit
+      '8bit))
+   (t
+    ;; Mule version
+    (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 mm-7bit-chars)
+              (eobp)))
+       '7bit
+      '8bit))))

 
 ;;;
 ;;; Functions for decoding
 ;;;
 
 
 ;;;
 ;;; Functions for decoding
 ;;;
 

-(defun mm-decode-content-transfer-encoding (encoding)
-  (cond
-   ((eq encoding 'quoted-printable)
-    (quoted-printable-decode-region (point-min) (point-max)))
-   ((eq encoding 'base64)
-    (condition-case ()
-       (base64-decode-region (point-min) (point-max))
-      (error nil)))
-   ((memq encoding '(7bit 8bit binary))
-    )
-   ((null encoding)
-    )
-   (t
-    (error "Can't decode encoding %s" encoding))))
+(defun mm-decode-content-transfer-encoding (encoding &optional type)
+  (prog1
+      (condition-case error
+         (cond
+          ((eq encoding 'quoted-printable)
+           (quoted-printable-decode-region (point-min) (point-max)))
+          ((eq encoding 'base64)
+           (base64-decode-region
+            (point-min)
+            ;; Some mailers insert whitespace
+            ;; junk at the end which
+            ;; base64-decode-region dislikes.
+            ;; Also remove possible junk which could
+            ;; have been added by mailing list software.
+            (save-excursion
+              (goto-char (point-min))
+              (while (re-search-forward "^[\t ]*\r?\n" nil t)
+                (delete-region (match-beginning 0) (match-end 0)))
+              (goto-char (point-max))
+              (when (re-search-backward "^[A-Za-z0-9+/]+=*[\t ]*$" nil t)
+                (forward-line))
+              (point))))
+          ((memq encoding '(7bit 8bit binary))
+           ;; Do nothing.
+           )
+          ((null encoding)
+           ;; Do nothing.
+           )
+          ((memq encoding '(x-uuencode x-uue))
+           (require 'mm-uu)
+           (funcall mm-uu-decode-function (point-min) (point-max)))
+          ((eq encoding 'x-binhex)
+           (require 'mm-uu)
+           (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
+        (message "Error while decoding: %s" error)
+        nil))
+    (when (and
+          (memq encoding '(base64 x-uuencode x-uue x-binhex))
+          (equal type "text/plain"))
+      (goto-char (point-min))
+      (while (search-forward "\r\n" nil t)
+       (replace-match "\n" t t)))))

 
 

-(defun mm-decode-body (charset encoding)
+(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."
   "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
   (save-excursion
     (when encoding

-      (mm-decode-content-transfer-encoding encoding))
+      (mm-decode-content-transfer-encoding encoding type))

     (when (featurep 'mule)
     (when (featurep 'mule)

-      (let (mule-charset)
-       (when (and charset
-                  (setq mule-charset (mm-charset-to-coding-system charset))
-                  buffer-file-coding-system
-                  (or (not (eq mule-charset 'ascii))
-                      (setq mule-charset rfc2047-default-charset)))
-         (mm-decode-coding-region (point-min) (point-max) mule-charset))))))
+      (let ((coding-system (mm-charset-to-coding-system charset)))
+       (if (and (not coding-system)
+                (listp mail-parse-ignored-charsets)
+                (memq 'gnus-unknown mail-parse-ignored-charsets))
+           (setq coding-system 
+                 (mm-charset-to-coding-system mail-parse-charset)))
+       (when (and charset coding-system
+                  ;; buffer-file-coding-system
+                  ;;Article buffer is nil coding system
+                  ;;in XEmacs
+                  (mm-multibyte-p)
+                  (or (not (eq coding-system 'ascii))
+                      (setq coding-system mail-parse-charset))
+                  (not (eq coding-system 'gnus-decoded)))
+         (mm-decode-coding-region (point-min) (point-max) coding-system))))))
+
+(defun mm-decode-string (string charset)
+  "Decode STRING with CHARSET."
+  (when (stringp charset)
+    (setq charset (intern (downcase charset))))
+  (when (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 ((coding-system (mm-charset-to-coding-system charset)))
+       (if (and (not coding-system)
+               (listp mail-parse-ignored-charsets)
+               (memq 'gnus-unknown mail-parse-ignored-charsets))
+          (setq coding-system 
+                (mm-charset-to-coding-system mail-parse-charset)))
+       (when (and charset coding-system
+                 (mm-multibyte-p)
+                 (or (not (eq coding-system 'ascii))
+                     (setq coding-system mail-parse-charset)))
+        (mm-decode-coding-string string coding-system))))
+   string))

 
 (provide 'mm-bodies)
 
 
 (provide 'mm-bodies)