1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 02:51:31 -08:00
emacs/lisp/gnus/rfc2231.el
Miles Bader 58090a8d28 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 157-168)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
   - Update from CVS: texi/message.texi: Fix default values.

2005-12-08  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
   Suggest image/.* in the doc string.

2005-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
   RFC1524) if it is in mailcap or add a suffix according to
   mailcap-mime-extensions when generating a temp filename; postpone
   deleting a temp file for 2 seconds for some wrappers, shell
   scripts, and so on, which might exit right after having started a
   viewer command as a background job.

2005-12-06  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
   `function' to custom type.

2005-12-02  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)

   * lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
   parens.

2005-11-29  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
   long lines.
   (gnus-cache-delete-group): Wrap doc strings.

   * lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
   (gnus-agent-delete-group): Wrap doc strings.

2005-11-24  Pascal Rigaux  <pixel@mandriva.com>  (tiny change)

   * lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.

2005-11-22  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
   of current-time-string.

2005-11-20  Stefan Schimanski  <schimmi@debian.org>  (tiny change)

   * lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
   date header.

2005-11-16  Boris Samorodov <bsam@ipt.ru>  (tiny patch)

   * lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.

2005-11-14  Kevin Greiner  <kevin.greiner@compsol.cc>

   * lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
   internal variable to a custom variable.  Changed default value
   from compressed(2) to uncompressed(1).
   (gnus-agent-read-agentview): Reversed revision 7.8 to restore
   support for uncompressed agentview files.  Taken together, reading
   the agentview file should now be 6-7 times faster.
   (gnus-agent-long-article,
   gnus-agent-short-article, gnus-agent-score): Renamed category
   keywords to match gnus-cus.
   (gnus-agent-summary-fetch-series): Modified to protect against
   gnus-agent-summary-fetch-group clearing processable flags.
   (gnus-agent-synchronize-group-flags): Update live group buffer as
   synchronization may occur due to the user toggling the plugged
   status.
   (gnus-agent-braid-nov): Now tests new nov entries
   for duplicates which are removed.  The invalid sort check then
   triggers a rescan after the sort as sorting may have moved
   duplicate entries such that they can be cheaply detected.
   (gnus-agent-read-local): Trivial fix to format of
   error message to display actual error condition.
   (gnus-agent-save-local): Avoid saving symbols that are bound to
   nil as they simply result in a warning message in
   gnus-agent-read-local.
   (gnus-agent-fetch-group-1): Clear downloadable flag when article
   successfully downloaded.
   (gnus-agent-regenerate-group): Use
   gnus-agent-synchronize-group-flags to reset read status in both
   gnus and server.

   * lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
   (nntp-authinfo-rejected): New error condition.
   (nntp-wait-for): Use new error condition to signal authentication
   error.
   (nntp-retrieve-data): Rethrow new error condition to break out of
   recursive call to nntp-send-authinfo.

2005-11-13  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
   rather than make-variable-buffer-local for file-precious-flag.

2005-11-13  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.

2005-11-11  Jan Nieuwenhuizen  <janneke@gnu.org>

   * lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
   as a buffer-local variable.  This avoids creating truncated
   dribble files as a result of a hang up, eg.

2005-11-04 Ken Manheimer  <ken.manheimer@gmail.com>

   * lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
   (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
   (pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
   (pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
   argument to all these routines, so the passphrase can be managed
   externally and passed in to the system.
   (pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
   pgg-add-passphrase-to-cache function.

   * lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
   (pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
   (pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
   (pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
   argument to all these routines, so the passphrase can be managed
   externally and passed in to the system.
   (pgg-pgp5-sign-region): Use new name of	pgg-add-passphrase-to-cache
   function.

2005-10-30  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
   object.

2005-10-29  Ken Manheimer  <ken.manheimer@gmail.com>

   * lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
   part of the decoded armor to find the key-identifier.
   (pgg-gpg-lookup-key-owner): New function to return the
   human-readable identifier of a key owner.
   (pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
   key itself.
   (pgg-gpg-decrypt-region): Prompt with the key owner (rather than
   the key value) if we have a key and can match it against a secret
   key.  Also, added a note pointing out fact that the prompt only
   indicates the first matching key.

   * lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
   pgg-decrypt-region.
   (pgg-pending-timers): A new hash for tracking the passphrase cache
   timers, so that new ones supercede old ones.
   (pgg-add-passphrase-to-cache): Rename from
   `pgg-add-passphrase-cache' to reduce confusion (all callers
   changed).  Modified to cancel old timers when new ones are added.
   (pgg-remove-passphrase-from-cache): Rename from
   `pgg-remove-passphrase-cache' to reduce confusion (all callers
   changed).  Modified to cancel old timers when their keys are
   removed from the cache.
   (pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
   XEmacs, an indirection to delete-itimer.
   (pgg-read-passphrase-from-cache, pgg-read-passphrase):
   Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
   users can only check cache without risk of prompting.  Correct bug in
   notruncate behavior.
   (pgg-read-passphrase-from-cache, pgg-read-passphrase)
   (pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
   Add informative docstrings.
   (pgg-decrypt): Convey provided passphrase in subordinate call to
   pgg-decrypt-region.

2005-10-20  Ken Manheimer <ken.manheimer+emacs@gmail.com>

   * lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
   (pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
   (pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
   'passphrase' argument, so the passphrase can be managed externally
   and then passed in to the system.

   * lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
   (pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
   so the passphrase cache can be used reliably with identifiers
   besides a pgp packet's key id.

   * lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
   (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
   (pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
   (pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
   argument to all these routines, so the passphrase can be managed
   externally and passed in to the system.

   * lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
   'notruncate' argument, so the passphrase cache can be used
   reliably with identifiers besides a pgp packet's key id.

2005-10-29  Sascha Wilde  <swilde@sha-bang.de>

   * lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
   symmetric encryption.
   (pgg-gpg-symmetric-key-p): New function to check for an symmetric
   encrypted session key.
   (pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
   message ask for the passphrase in a proper way.

   * lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
   New user commands for symmetric encryption.

2005-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/pgg.texi (User Commands): Fix description of pgg-verify-region.
   (Selecting an implementation): Fix descriptions.

2005-11-30  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi (Various Message Variables): Addition.

2005-11-29  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi: Fix default values.

2005-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi (Header Commands): Clarify descriptions of
   message-cross-post-followup-to, message-reduce-to-to-cc, and
   message-insert-wide-reply.
   (Various Commands): Fix kindex for message-kill-to-signature;
   clarify description of message-tab.

2005-11-22  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi (Mailing Lists): Fix description about MFT.

   * man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.

2005-11-17  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Slow Terminal Connection): Replace old description
   with new one.

2005-11-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
   replace X-Draft-Headers with X-Draft-From.

2005-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Various Various): Fix the default value of
   nnheader-max-head-length.
   (Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00

249 lines
7.8 KiB
EmacsLisp

;;; 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