mm-decode.el (mm-dissect-buffer): Guess content-type if the first token is missing...

[gnus] / lisp / nndoc.el

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 9f147e3..00d9f4d 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -1,7 +1,6 @@
 ;;; nndoc.el --- single file access for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2013 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -918,7 +917,8 @@ from the document.")
            (setq body-end (point))
            (push (list (incf i) head-begin head-end body-begin body-end
                        (count-lines body-begin body-end))
-                 nndoc-dissection-alist)))))))
+                 nndoc-dissection-alist)))))
+    (setq nndoc-dissection-alist (nreverse nndoc-dissection-alist))))
 
 (defun nndoc-article-begin ()
   (if nndoc-article-begin-function
@@ -968,15 +968,61 @@ PARENT is the message-ID of the parent summary line, or nil for none."
     (goto-char head-begin)
     (setq content-type (message-fetch-field "Content-Type"))
     (when content-type
-      (when (string-match
-            "^ *\\([^ \t\n/;]+\\)/\\([^ \t\n/;]+\\)" content-type)
+      (with-temp-buffer
+       (insert content-type)
+       (goto-char (point-min))
+       (when (re-search-forward ";[\t\n ]*name=\\([\"']\\|\\([^\t\n\r ]+\\)\\)"
+                                nil t)
+            (setq subject (or (match-string 2)
+                              (progn
+                                (goto-char (match-beginning 1))
+                                (condition-case nil
+                                    (progn
+                                      (forward-sexp 1)
+                                      (buffer-substring
+                                       (1+ (match-beginning 1)) (1- (point))))
+                                  (error nil)))))))
+      (when (or (string-match "^ *\\([^ \t\n/;]+\\)/\\([^ \t\n/;]+\\)"
+                             content-type)
+               ;; Guess Content-Type from the file name extention.
+               ;; Some mailer sends a part without type like this:
+               ;;  Content-Type: ; name="IMG_3156.JPG"
+               ;;  Content-Disposition: attachment; filename="IMG_3156.JPG"
+               (let ((tem (message-fetch-field "Content-Disposition"))
+                     (case-fold-search t)
+                     len)
+                 (when (and
+                        (setq tem
+                              (or (and tem
+                                       (mail-content-type-get
+                                        (mail-header-parse-content-disposition
+                                         tem)
+                                        'filename))
+                                  subject))
+                        (setq tem (file-name-extension tem))
+                        (require 'mailcap)
+                        (setq content-type
+                              (cdr (assoc (concat "." (downcase tem))
+                                          mailcap-mime-extensions)))
+                        (string-match "^ *\\([^ \t\n/;]+\\)/\\([^ \t\n/;]+\\)"
+                                      content-type))
+                   (save-match-data
+                     (goto-char (point-min))
+                     (when (re-search-forward "^Content-Type:\\([^;]*\\);"
+                                              nil t)
+                       (setq len (- (match-end 1) (match-beginning 1)
+                                    (length content-type))
+                             head-end (- head-end len)
+                             body-begin (- body-begin len)
+                             body-end (- body-end len))
+                       (replace-match (concat "Content-Type: " content-type
+                                              ";"))))
+                   t)))
        (setq type (downcase (match-string 1 content-type))
              subtype (downcase (match-string 2 content-type))
              message-rfc822 (and (string= type "message")
                                  (string= subtype "rfc822"))
              multipart-any (string= type "multipart")))
-      (when (string-match ";[ \t\n]*name=\\([^ \t\n;]+\\)" content-type)
-       (setq subject (match-string 1 content-type)))
       (when (string-match "boundary=\"?\\([^\"\n]*[^\" \t\n]\\)" content-type)
        (setq boundary-regexp (concat "^--"
                                      (regexp-quote