mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-08 13:19:36 +00:00

`string-search` is easier to understand, less error-prone, much faster, does not pollute the regexp cache, and does not mutate global state. Use it where applicable and obviously safe (erring on the conservative side). * admin/authors.el (authors-canonical-file-name) (authors-scan-change-log): * lisp/apropos.el (apropos-command) (apropos-documentation-property, apropos-symbols-internal): * lisp/arc-mode.el (archive-arc-summarize) (archive-zoo-summarize): * lisp/calc/calc-aent.el (math-read-factor): * lisp/calc/calc-ext.el (math-read-big-expr) (math-format-nice-expr, math-format-number-fancy): * lisp/calc/calc-forms.el (math-read-angle-brackets): * lisp/calc/calc-graph.el (calc-graph-set-range): * lisp/calc/calc-keypd.el (calc-keypad-press): * lisp/calc/calc-lang.el (tex, latex, math-read-big-rec): * lisp/calc/calc-prog.el (calc-fix-token-name) (calc-user-define-permanent, math-define-exp): * lisp/calc/calc.el (calc-record, calcDigit-key) (calc-count-lines): * lisp/calc/calcalg2.el (calc-solve-for, calc-poly-roots) (math-do-integral): * lisp/calc/calcalg3.el (calc-find-root, calc-find-minimum) (calc-get-fit-variables): * lisp/cedet/ede/speedbar.el (ede-tag-expand): * lisp/cedet/semantic/java.el (semantic-java-expand-tag): * lisp/cedet/semantic/sb.el (semantic-sb-show-extra) (semantic-sb-expand-group): * lisp/cedet/semantic/wisent/python.el (semantic-python-instance-variable-p): * lisp/cus-edit.el (get): * lisp/descr-text.el (describe-text-sexp): * lisp/dired-aux.el (dired-compress-file): * lisp/dired-x.el (dired-make-relative-symlink): * lisp/dired.el (dired-glob-regexp): * lisp/dos-fns.el (dos-convert-standard-filename, dos-8+3-filename): * lisp/edmacro.el (edmacro-format-keys): * lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand): * lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand): * lisp/emacs-lisp/lisp-mnt.el (lm-keywords-list): * lisp/emacs-lisp/warnings.el (display-warning): * lisp/emulation/viper-ex.el (viper-ex-read-file-name) (ex-print-display-lines): * lisp/env.el (read-envvar-name, setenv): * lisp/epa-mail.el (epa-mail-encrypt): * lisp/epg.el (epg--start): * lisp/erc/erc-backend.el (erc-parse-server-response): * lisp/erc/erc-dcc.el (erc-dcc-member): * lisp/erc/erc-speedbar.el (erc-speedbar-expand-server) (erc-speedbar-expand-channel, erc-speedbar-expand-user): * lisp/erc/erc.el (erc-send-input): * lisp/eshell/em-glob.el (eshell-glob-entries): * lisp/eshell/esh-proc.el (eshell-needs-pipe-p): * lisp/eshell/esh-util.el (eshell-convert): * lisp/eshell/esh-var.el (eshell-envvar-names): * lisp/faces.el (x-resolve-font-name): * lisp/ffap.el (ffap-file-at-point): * lisp/files.el (wildcard-to-regexp, shell-quote-wildcard-pattern): * lisp/forms.el (forms--update): * lisp/frameset.el (frameset-filter-unshelve-param): * lisp/gnus/gnus-art.el (article-decode-charset): * lisp/gnus/gnus-kill.el (gnus-kill-parse-rn-kill-file): * lisp/gnus/gnus-mlspl.el (gnus-group-split-fancy): * lisp/gnus/gnus-msg.el (gnus-summary-resend-message-insert-gcc) (gnus-inews-insert-gcc): * lisp/gnus/gnus-rfc1843.el (rfc1843-decode-article-body): * lisp/gnus/gnus-search.el (gnus-search-indexed-parse-output) (gnus-search--complete-key-data): * lisp/gnus/gnus-spec.el (gnus-parse-simple-format): * lisp/gnus/gnus-sum.el (gnus-summary-refer-article): * lisp/gnus/gnus-util.el (gnus-extract-address-components) (gnus-newsgroup-directory-form): * lisp/gnus/gnus-uu.el (gnus-uu-grab-view): * lisp/gnus/gnus.el (gnus-group-native-p, gnus-short-group-name): * lisp/gnus/message.el (message-check-news-header-syntax) (message-make-message-id, message-user-mail-address) (message-make-fqdn, message-get-reply-headers, message-followup): * lisp/gnus/mm-decode.el (mm-dissect-buffer): * lisp/gnus/nnheader.el (nnheader-insert): * lisp/gnus/nnimap.el (nnimap-process-quirk) (nnimap-imap-ranges-to-gnus-ranges): * lisp/gnus/nnmaildir.el (nnmaildir--ensure-suffix): * lisp/gnus/nnmairix.el (nnmairix-determine-original-group-from-path): * lisp/gnus/nnrss.el (nnrss-match-macro): * lisp/gnus/nntp.el (nntp-find-group-and-number): * lisp/help-fns.el (help--symbol-completion-table-affixation): * lisp/help.el (help-function-arglist): * lisp/hippie-exp.el (he-concat-directory-file-name): * lisp/htmlfontify.el (hfy-relstub): * lisp/ido.el (ido-make-prompt, ido-complete, ido-copy-current-word) (ido-exhibit): * lisp/image/image-converter.el (image-convert-p): * lisp/info-xref.el (info-xref-docstrings): * lisp/info.el (Info-toc-build, Info-follow-reference) (Info-backward-node, Info-finder-find-node) (Info-speedbar-expand-node): * lisp/international/mule-diag.el (print-fontset-element): * lisp/language/korea-util.el (default-korean-keyboard): * lisp/linum.el (linum-after-change): * lisp/mail/ietf-drums.el (ietf-drums-parse-address): * lisp/mail/mail-utils.el (mail-dont-reply-to): * lisp/mail/rfc2047.el (rfc2047-encode-1, rfc2047-decode-string): * lisp/mail/rfc2231.el (rfc2231-parse-string): * lisp/mail/rmailkwd.el (rmail-set-label): * lisp/mail/rmailsum.el (rmail-header-summary): * lisp/mail/smtpmail.el (smtpmail-maybe-append-domain) (smtpmail-user-mail-address): * lisp/mail/uce.el (uce-reply-to-uce): * lisp/man.el (Man-default-man-entry): * lisp/mh-e/mh-alias.el (mh-alias-gecos-name) (mh-alias-minibuffer-confirm-address): * lisp/mh-e/mh-comp.el (mh-forwarded-letter-subject): * lisp/mh-e/mh-speed.el (mh-speed-parse-flists-output): * lisp/mh-e/mh-utils.el (mh-collect-folder-names-filter) (mh-folder-completion-function): * lisp/minibuffer.el (completion--make-envvar-table) (completion-file-name-table, completion-flex-try-completion) (completion-flex-all-completions): * lisp/mpc.el (mpc--proc-quote-string, mpc-cmd-special-tag-p) (mpc-constraints-tag-lookup): * lisp/net/ange-ftp.el (ange-ftp-send-cmd) (ange-ftp-allow-child-lookup): * lisp/net/mailcap.el (mailcap-mime-types): * lisp/net/mairix.el (mairix-search-thread-this-article): * lisp/net/pop3.el (pop3-open-server): * lisp/net/soap-client.el (soap-decode-xs-complex-type): * lisp/net/socks.el (socks-filter): * lisp/nxml/nxml-outln.el (nxml-highlighted-qname): * lisp/nxml/rng-cmpct.el (rng-c-expand-name, rng-c-expand-datatype): * lisp/nxml/rng-uri.el (rng-uri-file-name-1): * lisp/obsolete/complete.el (partial-completion-mode) (PC-do-completion): * lisp/obsolete/longlines.el (longlines-encode-string): * lisp/obsolete/nnir.el (nnir-compose-result): * lisp/obsolete/terminal.el (te-quote-arg-for-sh): * lisp/obsolete/tpu-edt.el (tpu-check-search-case): * lisp/obsolete/url-ns.el (isPlainHostName): * lisp/pcmpl-unix.el (pcomplete/scp): * lisp/play/dunnet.el (dun-listify-string2, dun-get-path) (dun-unix-parse, dun-doassign, dun-cat, dun-batch-unix-interface): * lisp/progmodes/ebnf2ps.el: (ebnf-eps-header-footer-comment): * lisp/progmodes/gdb-mi.el (gdb-var-delete) (gdb-speedbar-expand-node, gdbmi-bnf-incomplete-record-result): * lisp/progmodes/gud.el (gud-find-expr): * lisp/progmodes/idlw-help.el (idlwave-do-context-help1): * lisp/progmodes/idlw-shell.el (idlwave-shell-mode) (idlwave-shell-filter-hidden-output, idlwave-shell-filter): * lisp/progmodes/idlwave.el (idlwave-skip-label-or-case) (idlwave-routine-info): * lisp/progmodes/octave.el (inferior-octave-completion-at-point): * lisp/progmodes/sh-script.el (sh-add-completer): * lisp/progmodes/sql.el (defun): * lisp/progmodes/xscheme.el (xscheme-process-filter): * lisp/replace.el (query-replace-compile-replacement) (map-query-replace-regexp): * lisp/shell.el (shell--command-completion-data) (shell-environment-variable-completion): * lisp/simple.el (display-message-or-buffer): * lisp/speedbar.el (speedbar-dired, speedbar-tag-file) (speedbar-tag-expand): * lisp/subr.el (split-string-and-unquote): * lisp/tar-mode.el (tar-extract): * lisp/term.el (term-command-hook, serial-read-name): * lisp/textmodes/bibtex.el (bibtex-print-help-message): * lisp/textmodes/ispell.el (ispell-lookup-words, ispell-filter) (ispell-parse-output, ispell-buffer-local-parsing): * lisp/textmodes/reftex-cite.el (reftex-do-citation): * lisp/textmodes/reftex-parse.el (reftex-notice-new): * lisp/textmodes/reftex-ref.el (reftex-show-entry): * lisp/textmodes/reftex.el (reftex-compile-variables): * lisp/textmodes/tex-mode.el (tex-send-command) (tex-start-tex, tex-append): * lisp/thingatpt.el (thing-at-point-url-at-point): * lisp/tmm.el (tmm-add-one-shortcut): * lisp/transient.el (transient-format-key): * lisp/url/url-auth.el (url-basic-auth) (url-digest-auth-directory-id-assoc): * lisp/url/url-news.el (url-news): * lisp/url/url-util.el (url-parse-query-string): * lisp/vc/vc-cvs.el (vc-cvs-parse-entry): * lisp/wid-browse.el (widget-browse-sexp): * lisp/woman.el (woman-parse-colon-path, woman-mini-help) (WoMan-getpage-in-background, woman-negative-vertical-space): * lisp/xml.el: * test/lisp/emacs-lisp/check-declare-tests.el (check-declare-tests-warn): * test/lisp/files-tests.el (files-tests-file-name-non-special-dired-compress-handler): * test/lisp/net/network-stream-tests.el (server-process-filter): * test/src/coding-tests.el (ert-test-unibyte-buffer-dos-eol-decode): Use `string-search` instead of `string-match` and `string-match-p`.
310 lines
9.8 KiB
EmacsLisp
310 lines
9.8 KiB
EmacsLisp
;;; rfc2231.el --- Functions for decoding rfc2231 headers -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 1998-2021 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 3 of the License, 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. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
|
(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 &optional signal-error)
|
|
"Parse STRING and return a list.
|
|
The list will be on the form
|
|
`(name (attribute . value) (attribute . value)...)'.
|
|
|
|
If the optional SIGNAL-ERROR is non-nil, signal an error when this
|
|
function fails in parsing of parameters. Otherwise, this function
|
|
must never cause a Lisp error."
|
|
(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"))
|
|
c type attribute encoded number parameters value)
|
|
(ietf-drums-init
|
|
(condition-case nil
|
|
(mail-header-remove-whitespace
|
|
(mail-header-remove-comments string))
|
|
;; The most likely cause of an error is unbalanced parentheses
|
|
;; or double-quotes. If all parentheses and double-quotes are
|
|
;; quoted meaninglessly with backslashes, removing them might
|
|
;; make it parsable. Let's try...
|
|
(error
|
|
(let (mod)
|
|
(when (and (string-search "\\\"" string)
|
|
(not (string-match "\\`\"\\|[^\\]\"" string)))
|
|
(setq string (string-replace "\\\"" "\"" string)
|
|
mod t))
|
|
(when (and (string-search "\\(" string)
|
|
(string-search "\\)" string)
|
|
(not (string-match "\\`(\\|[^\\][()]" string)))
|
|
(setq string (replace-regexp-in-string
|
|
"\\\\\\([()]\\)" "\\1" string)
|
|
mod t))
|
|
(or (and mod
|
|
(ignore-errors
|
|
(mail-header-remove-whitespace
|
|
(mail-header-remove-comments string))))
|
|
;; Finally, attempt to extract only type.
|
|
(if (string-match
|
|
(concat "\\`[\t\n ]*\\([^" ietf-drums-tspecials "\t\n ]+"
|
|
"\\(?:/[^" ietf-drums-tspecials
|
|
"\t\n ]+\\)?\\)\\(?:[\t\n ;]\\|\\'\\)")
|
|
string)
|
|
(match-string 1 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 (ignore-errors
|
|
(downcase
|
|
(buffer-substring (point) (progn
|
|
(forward-sexp 1)
|
|
(point)))))))
|
|
;; Do the params
|
|
(condition-case err
|
|
(progn
|
|
(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))
|
|
(if (eq c ?*)
|
|
(progn
|
|
(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)))))
|
|
(setq number nil
|
|
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)))))
|
|
(when encoded
|
|
(setq value (mapconcat (lambda (c) (format "%%%02x" c))
|
|
value ""))))
|
|
((and (or (memq c ttoken)
|
|
;; EXTENSION: Support non-ascii chars.
|
|
(> c ?\177))
|
|
(not (memq c stoken)))
|
|
(setq value
|
|
(buffer-substring
|
|
(point)
|
|
(progn
|
|
;; Jump over asterisk, non-ASCII
|
|
;; and non-boundary characters.
|
|
(while (and c
|
|
(or (eq c ?*)
|
|
(> c ?\177)
|
|
(not (eq (char-syntax c) ? ))))
|
|
(forward-char 1)
|
|
(setq c (char-after)))
|
|
(point)))))
|
|
(t
|
|
(error "Invalid header: %s" string)))
|
|
(push (list attribute value number encoded)
|
|
parameters))))
|
|
(error
|
|
(setq parameters nil)
|
|
(when signal-error
|
|
(signal (car err) (cdr err)))))
|
|
|
|
;; Now collect and concatenate continuation parameters.
|
|
(let ((cparams nil)
|
|
elem)
|
|
(cl-loop for (attribute value part encoded)
|
|
in (sort parameters (lambda (e1 e2)
|
|
(< (or (caddr e1) 0)
|
|
(or (caddr e2) 0))))
|
|
do (cond
|
|
;; First part.
|
|
((or (not (setq elem (assq attribute cparams)))
|
|
(and (numberp part)
|
|
(zerop part)))
|
|
(push (list attribute value encoded) cparams))
|
|
;; Repetition of a part; do nothing.
|
|
((and elem
|
|
(null number))
|
|
)
|
|
;; Concatenate continuation parts.
|
|
(t
|
|
(setcar (cdr elem) (concat (cadr elem) value)))))
|
|
;; Finally decode encoded values.
|
|
(cons type (mapcar
|
|
(lambda (elem)
|
|
(cons (car elem)
|
|
(if (nth 2 elem)
|
|
(rfc2231-decode-encoded-string (nth 1 elem))
|
|
(nth 1 elem))))
|
|
(nreverse cparams))))))))
|
|
|
|
(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\",
|
|
\"us-ascii\\='\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
|
\"\\='en-us\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
|
\"\\='\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
|
|
\"This is ***fun***\"."
|
|
(if (not (string-match "\\`\\(?:\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)\\'"
|
|
string))
|
|
(error "Unrecognized RFC2231 format: %S" string)
|
|
(let ((value (match-string 3 string))
|
|
;;(language (match-string 2 string))
|
|
(coding-system (mm-charset-to-coding-system
|
|
(match-string 1 string) nil t)))
|
|
(mm-with-unibyte-buffer
|
|
(insert value)
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "%\\([[:xdigit:]][[:xdigit:]]\\)" nil t)
|
|
(insert
|
|
(prog1
|
|
(string-to-number (match-string 1) 16)
|
|
(delete-region (match-beginning 0) (match-end 0)))))
|
|
;; Decode using the charset, if any.
|
|
(if (memq coding-system '(nil ascii))
|
|
(buffer-string)
|
|
(decode-coding-string (buffer-string) coding-system))))))
|
|
|
|
(defun rfc2231-encode-string (param value)
|
|
"Return a PARAM=VALUE string encoded according to RFC2231.
|
|
Use `mml-insert-parameter' or `mml-insert-parameter-string' to insert
|
|
the result of this function."
|
|
(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)
|
|
;; Don't make lines exceeding 76 column.
|
|
(limit (- 74 (length param)))
|
|
spacep encodep charsetp charset broken)
|
|
(mm-with-multibyte-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)))
|
|
(mm-disable-multibyte)
|
|
(cond
|
|
((or encodep charsetp
|
|
(progn
|
|
(end-of-line)
|
|
(> (current-column) (if spacep (- limit 2) limit))))
|
|
(setq limit (- limit 6))
|
|
(goto-char (point-min))
|
|
(insert (symbol-name (or charset 'us-ascii)) "''")
|
|
(while (not (eobp))
|
|
(if (or (not (memq (following-char) ascii))
|
|
(memq (following-char) control)
|
|
(memq (following-char) tspecial)
|
|
(memq (following-char) special)
|
|
(eq (following-char) ? ))
|
|
(progn
|
|
(when (>= (current-column) (1- limit))
|
|
(insert ";\n")
|
|
(setq broken t))
|
|
(insert "%" (format "%02x" (following-char)))
|
|
(delete-char 1))
|
|
(when (> (current-column) limit)
|
|
(insert ";\n")
|
|
(setq broken t))
|
|
(forward-char 1)))
|
|
(goto-char (point-min))
|
|
(if (not broken)
|
|
(insert param "*=")
|
|
(while (not (eobp))
|
|
(insert (if (>= num 0) " " "")
|
|
param "*" (format "%d" (cl-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)
|
|
|
|
;;; rfc2231.el ends here
|