Mercurial > emacs
view lisp/gnus/rfc2231.el @ 67643:1c477099d3ac
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 169-173)
- Merge from emacs--cvs-trunk--0
- Update from CVS
2005-12-16 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-signature-separator): Fix custom type.
* lisp/gnus/mm-decode.el (mm-inlined-types): Fix custom type.
(mm-keep-viewer-alive-types): Ditto.
(mm-automatic-display): Ditto.
(mm-attachment-override-types): Ditto.
(mm-inline-override-types): Ditto.
(mm-automatic-external-display): Ditto.
2005-12-12 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-buttonized-mime-types): Mention addition of
multipart/alternative and add xref to mm-discouraged-alternatives
in doc string.
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Add xref to
gnus-buttonized-mime-types in doc string.
2005-12-12 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-charset-to-coding-system): Recognize
us-ascii as a MIME charset.
* lisp/gnus/mm-bodies.el (mm-decode-content-transfer-encoding): Protect
against the case where the 2nd arg TYPE is nil.
2005-12-09 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-start.el (gnus-no-server-1): Mention
`gnus-level-default-subscribed' in doc string.
2005-11-26 Dave Love <fx@gnu.org>
* lisp/gnus/tls.el (open-tls-stream): Rename arg SERVICE to PORT.
(tls-program, tls-success): Provide openssl alternative.
* lisp/gnus/starttls.el: Doc fixes.
(starttls-open-stream-gnutls, starttls-open-stream): Rename arg
SERVICE to PORT.
2005-12-09 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-start.el (gnus-start-draft-setup): Enforce
`gnus-draft-mode' for nndraft:drafts at startup.
* lisp/gnus/gnus.el (gnus-splash): Change custom group.
(gnus-group-get-parameter, gnus-group-parameter-value): Describe
allow-list argument.
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Format doc
string.
2005-12-09 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-decode.el (mm-display-external): Add lacked cdr.
2005-12-12 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (MIME Commands): Mention addition of
multipart/alternative to gnus-buttonized-mime-types and add xref
to mm-discouraged-alternatives.
* man/emacs-mime.texi (Display Customization): Mention addition of
"image/.*" and add xref to gnus-buttonized-mime-types in the
mm-discouraged-alternatives section.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 17 Dec 2005 21:41:34 +0000 |
parents | 28264c86d408 |
children | 5ea0e0a7dd38 7beb78bc1f8e |
line wrap: on
line source
;;; rfc2231.el --- Functions for decoding rfc2231 headers ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, ;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;;; Code: (eval-when-compile (require 'cl)) (require 'ietf-drums) (require 'rfc2047) (autoload 'mm-encode-body "mm-bodies") (autoload 'mail-header-remove-whitespace "mail-parse") (autoload 'mail-header-remove-comments "mail-parse") (defun rfc2231-get-value (ct attribute) "Return the value of ATTRIBUTE from CT." (cdr (assq attribute (cdr ct)))) (defun rfc2231-parse-qp-string (string) "Parse QP-encoded string using `rfc2231-parse-string'. N.B. This is in violation with RFC2047, but it seem to be in common use." (rfc2231-parse-string (rfc2047-decode-string string))) (defun rfc2231-parse-string (string) "Parse STRING and return a list. The list will be on the form `(name (attribute . value) (attribute . value)...)" (with-temp-buffer (let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token)) (stoken (ietf-drums-token-to-list ietf-drums-tspecials)) (ntoken (ietf-drums-token-to-list "0-9")) (prev-value "") display-name mailbox c display-string parameters attribute value type subtype number encoded prev-attribute prev-encoded) (ietf-drums-init (mail-header-remove-whitespace (mail-header-remove-comments string))) (let ((table (copy-syntax-table ietf-drums-syntax-table))) (modify-syntax-entry ?\' "w" table) (modify-syntax-entry ?* " " table) (modify-syntax-entry ?\; " " table) (modify-syntax-entry ?= " " table) ;; The following isn't valid, but one should be liberal ;; in what one receives. (modify-syntax-entry ?\: "w" table) (set-syntax-table table)) (setq c (char-after)) (when (and (memq c ttoken) (not (memq c stoken))) (setq type (downcase (buffer-substring (point) (progn (forward-sexp 1) (point))))) ;; Do the params (while (not (eobp)) (setq c (char-after)) (unless (eq c ?\;) (error "Invalid header: %s" string)) (forward-char 1) ;; If c in nil, then this is an invalid header, but ;; since elm generates invalid headers on this form, ;; we allow it. (when (setq c (char-after)) (if (and (memq c ttoken) (not (memq c stoken))) (setq attribute (intern (downcase (buffer-substring (point) (progn (forward-sexp 1) (point)))))) (error "Invalid header: %s" string)) (setq c (char-after)) (when (eq c ?*) (forward-char 1) (setq c (char-after)) (if (not (memq c ntoken)) (setq encoded t number nil) (setq number (string-to-number (buffer-substring (point) (progn (forward-sexp 1) (point))))) (setq c (char-after)) (when (eq c ?*) (setq encoded t) (forward-char 1) (setq c (char-after))))) ;; See if we have any previous continuations. (when (and prev-attribute (not (eq prev-attribute attribute))) (push (cons prev-attribute (if prev-encoded (rfc2231-decode-encoded-string prev-value) prev-value)) parameters) (setq prev-attribute nil prev-value "" prev-encoded nil)) (unless (eq c ?=) (error "Invalid header: %s" string)) (forward-char 1) (setq c (char-after)) (cond ((eq c ?\") (setq value (buffer-substring (1+ (point)) (progn (forward-sexp 1) (1- (point)))))) ((and (or (memq c ttoken) (> c ?\177)) ;; EXTENSION: Support non-ascii chars. (not (memq c stoken))) (setq value (buffer-substring (point) (progn (forward-sexp) ;; We might not have reached at the end of ;; the value because of non-ascii chars, ;; so we should jump over them if any. (while (and (not (eobp)) (> (char-after) ?\177)) (forward-char 1) (forward-sexp)) (point))))) (t (error "Invalid header: %s" string))) (if number (setq prev-attribute attribute prev-value (concat prev-value value) prev-encoded encoded) (push (cons attribute (if encoded (rfc2231-decode-encoded-string value) value)) parameters)))) ;; Take care of any final continuations. (when prev-attribute (push (cons prev-attribute (if prev-encoded (rfc2231-decode-encoded-string prev-value) prev-value)) parameters)) (when type `(,type ,@(nreverse parameters))))))) (defun rfc2231-decode-encoded-string (string) "Decode an RFC2231-encoded string. These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"." (with-temp-buffer (let ((elems (split-string string "'"))) ;; The encoded string may contain zero to two single-quote ;; marks. This should give us the encoded word stripped ;; of any preceding values. (insert (car (last elems))) (goto-char (point-min)) (while (search-forward "%" nil t) (insert (prog1 (string-to-number (buffer-substring (point) (+ (point) 2)) 16) (delete-region (1- (point)) (+ (point) 2))))) ;; Encode using the charset, if any. (when (and (mm-multibyte-p) (> (length elems) 1) (not (equal (intern (downcase (car elems))) 'us-ascii))) (mm-decode-coding-region (point-min) (point-max) (intern (downcase (car elems))))) (buffer-string)))) (defun rfc2231-encode-string (param value) "Return and PARAM=VALUE string encoded according to RFC2231." (let ((control (ietf-drums-token-to-list ietf-drums-no-ws-ctl-token)) (tspecial (ietf-drums-token-to-list ietf-drums-tspecials)) (special (ietf-drums-token-to-list "*'%\n\t")) (ascii (ietf-drums-token-to-list ietf-drums-text-token)) (num -1) spacep encodep charsetp charset broken) (with-temp-buffer (insert value) (goto-char (point-min)) (while (not (eobp)) (cond ((or (memq (following-char) control) (memq (following-char) tspecial) (memq (following-char) special)) (setq encodep t)) ((eq (following-char) ? ) (setq spacep t)) ((not (memq (following-char) ascii)) (setq charsetp t))) (forward-char 1)) (when charsetp (setq charset (mm-encode-body))) (cond ((or encodep charsetp) (goto-char (point-min)) (while (not (eobp)) (when (> (current-column) 60) (insert ";\n") (setq broken t)) (if (or (not (memq (following-char) ascii)) (memq (following-char) control) (memq (following-char) tspecial) (memq (following-char) special) (eq (following-char) ? )) (progn (insert "%" (format "%02x" (following-char))) (delete-char 1)) (forward-char 1))) (goto-char (point-min)) (insert (symbol-name (or charset 'us-ascii)) "''") (goto-char (point-min)) (if (not broken) (insert param "*=") (while (not (eobp)) (insert (if (>= num 0) " " "\n ") param "*" (format "%d" (incf num)) "*=") (forward-line 1)))) (spacep (goto-char (point-min)) (insert param "=\"") (goto-char (point-max)) (insert "\"")) (t (goto-char (point-min)) (insert param "="))) (buffer-string)))) (provide 'rfc2231) ;;; arch-tag: c3ab751d-d108-406a-b301-68882ad8cd63 ;;; rfc2231.el ends here