mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-13 09:32:47 +00:00
aa0a8561bb
Merge from gnus--rel--5.10 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80 Update from CVS 2004-12-22 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-spec.el (gnus-spec-tab): Make a Lisp form which works correctly even if there are wide characters. 2004-12-21 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/rfc2231.el (rfc2231-parse-string): Decode encoded value after concatenating segments rather than before concatenating them. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>. 2004-12-17 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/mm-util.el (mm-xemacs-find-mime-charset): New macro. 2004-12-17 Aidan Kehoe <kehoea@parhasard.net> * lisp/gnus/mm-util.el (mm-xemacs-find-mime-charset-1): New function used to unify Latin characters in XEmacs. (mm-find-mime-charset-region): Use it. 2004-12-17 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-util.el (gnus-delete-directory): New function. * lisp/gnus/gnus-agent.el (gnus-agent-delete-group): Use it. * lisp/gnus/gnus-cache.el (gnus-cache-delete-group): Use it.
234 lines
7.4 KiB
EmacsLisp
234 lines
7.4 KiB
EmacsLisp
;;; rfc2231.el --- Functions for decoding rfc2231 headers
|
|
|
|
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
|
|
;; 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., 59 Temple Place - Suite 330,
|
|
;; Boston, MA 02111-1307, 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)
|
|
(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 prev-value) parameters)
|
|
(setq prev-attribute nil
|
|
prev-value ""))
|
|
(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) (point)))))
|
|
(t
|
|
(error "Invalid header: %s" string)))
|
|
(if number
|
|
(setq prev-attribute attribute
|
|
prev-value (concat prev-value value))
|
|
(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 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
|