mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-13 09:32:47 +00:00
3c94c7bc02
Problems reported by Mattias Engdegård in: https://lists.gnu.org/r/emacs-devel/2019-03/msg00085.html * admin/admin.el (set-version): * lisp/allout.el (allout-latexify-one-item): * lisp/arc-mode.el (archive-arc-rename-entry) (archive-rar-summarize): * lisp/calc/calc-graph.el (calc-graph-set-styles) (calc-graph-hide): * lisp/calc/calc-help.el (calc-describe-key): * lisp/calc/calc-lang.el (math-compose-tex-func, eqn): * lisp/calc/calc.el (calcDigit-key): * lisp/cedet/ede/makefile-edit.el (makefile-macro-file-list): * lisp/cedet/ede/speedbar.el (ede-tag-expand): * lisp/cedet/semantic/sb.el (semantic-sb-show-extra) (semantic-sb-expand-group): * lisp/comint.el (comint-substitute-in-file-name): * lisp/dired.el (dired-actual-switches): * lisp/emacs-lisp/chart.el (chart-rmail-from): * lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand): * lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand): * lisp/emacs-lisp/rx.el (rx-not, rx-atomic-p): * lisp/emulation/viper-ex.el (viper-get-ex-token) (viper-get-ex-pat, ex-set-read-variable): * lisp/epg.el (epg--status-SIG_CREATED): * lisp/erc/erc-speedbar.el (erc-speedbar-expand-user): (erc-speedbar-expand-channel, erc-speedbar-expand-server) * lisp/erc/erc.el (erc-is-message-ctcp-and-not-action-p) (erc-banlist-update): * lisp/eshell/em-dirs.el (eshell-parse-drive-letter, eshell/pwd): * lisp/find-dired.el (find-dired): * lisp/frame.el (frame-set-background-mode): * lisp/generic-x.el (apache-log-generic-mode): * lisp/gnus/gnus-art.el (gnus-button-valid-localpart-regexp): * lisp/gnus/gnus.el (gnus-short-group-name): * lisp/gnus/message.el (message-mailer-swallows-blank-line): * lisp/ibuffer.el (ibuffer-fontification-alist): * lisp/ido.el (ido-set-matches-1): * lisp/info-xref.el (info-xref-lock-file-p): * lisp/info.el (Info-dir-remove-duplicates) (Info-unescape-quotes, Info-split-parameter-string) (Info-speedbar-expand-node): * lisp/international/mule.el (sgml-html-meta-auto-coding-function): * lisp/isearch.el (isearch-pre-command-hook): * lisp/language/ethio-util.el (ethio-fidel-to-tex-buffer): * lisp/mail/rmail.el (rmail-collect-deleted): * lisp/mh-e/mh-alias.el (mh-alias-suggest-alias): * lisp/mh-e/mh-comp.el (mh-forward): * lisp/mh-e/mh-search.el (mh-index-next-folder) (mh-index-create-imenu-index): * lisp/mh-e/mh-xface.el (mh-picon-get-image): * lisp/minibuffer.el (completion--embedded-envvar-re): * lisp/net/ange-ftp.el (ange-ftp-ls-parser): * lisp/net/goto-addr.el (goto-address-mail-regexp) (goto-address-find-address-at-point): * lisp/net/pop3.el (pop3-read-response, pop3-user) (pop3-pass, pop3-apop): * lisp/net/tramp.el (tramp-ipv6-regexp) (tramp-replace-environment-variables): * lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set): * lisp/nxml/rng-uri.el (rng-uri-escape-multibyte): * lisp/nxml/rng-xsd.el (rng-xsd-convert-any-uri): * lisp/obsolete/pgg.el (pgg-fetch-key): * lisp/obsolete/vip.el (vip-get-ex-token): * lisp/org/ob-core.el (org-babel-string-read): * lisp/org/org-agenda.el: (org-agenda-add-entry-to-org-agenda-diary-file): * lisp/org/org-element.el (org-element-keyword-parser): * lisp/org/org-list.el (org-list-indent-item-generic): * lisp/org/org-mhe.el (org-mhe-get-message-folder-from-index): * lisp/org/org-mobile.el (org-mobile-apply): * lisp/org/org-mouse.el (org-mouse-context-menu): * lisp/org/org-plot.el (org-plot/gnuplot): * lisp/org/org-protocol.el (org-protocol-flatten-greedy): * lisp/org/org-table.el (org-table-copy-down) (org-table-formula-make-cmp-string) (org-table-get-stored-formulas, org-table-recalculate) (org-table-edit-formulas): * lisp/org/org.el (org-translate-link-from-planner) (org-fill-line-break-nobreak-p): * lisp/org/ox-ascii.el (org-ascii-item): * lisp/org/ox-latex.el (org-latex-clean-invalid-line-breaks): * lisp/org/ox.el (org-export-expand-include-keyword): * lisp/progmodes/ada-xref.el (ada-treat-cmd-string): * lisp/progmodes/cfengine.el (cfengine2-font-lock-keywords): * lisp/progmodes/cperl-mode.el (cperl-to-comment-or-eol) (cperl-find-pods-heres, cperl-fix-line-spacing) (cperl-have-help-regexp, cperl-word-at-point-hard) (cperl-make-regexp-x): * lisp/progmodes/dcl-mode.el (dcl-option-value-offset): * lisp/progmodes/etags.el (tag-implicit-name-match-p): * lisp/progmodes/fortran.el (fortran-fill): * lisp/progmodes/gdb-mi.el (gdb-speedbar-expand-node) (gdb-locals-handler-custom): * lisp/progmodes/grep.el (grep-mode-font-lock-keywords): * lisp/progmodes/gud.el (gud-jdb-find-source-using-classpath): * lisp/progmodes/js.el (js--continued-expression-p): * lisp/progmodes/m4-mode.el (m4-font-lock-keywords): * lisp/progmodes/meta-mode.el (meta-indent-level-count): * lisp/progmodes/mixal-mode.el (mixal-font-lock-keywords): * lisp/progmodes/opascal.el (opascal-find-unit-in-directory): * lisp/progmodes/pascal.el (pascal-progbeg-re): * lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re) (ruby-expr-beg, ruby-parse-partial) (ruby-toggle-string-quotes, ruby-font-lock-keywords): * lisp/progmodes/sql.el (sql--make-help-docstring): * lisp/progmodes/verilog-mode.el (verilog-coverpoint-re) (verilog-skip-forward-comment-p) (verilog-read-sub-decls-gate) (verilog-read-auto-template-middle): * lisp/progmodes/vhdl-mode.el (vhdl-resolve-env-variable) (vhdl-speedbar-expand-project, vhdl-speedbar-expand-entity) (vhdl-speedbar-expand-architecture) (vhdl-speedbar-expand-config, vhdl-speedbar-expand-package) (vhdl-speedbar-dired): * lisp/speedbar.el (speedbar-dired, speedbar-tag-file) (speedbar-tag-expand): * lisp/textmodes/dns-mode.el (dns-mode-font-lock-keywords): * lisp/textmodes/flyspell.el (flyspell-debug-signal-word-checked): * lisp/textmodes/ispell.el (ispell-process-line): * lisp/textmodes/reftex-cite.el (reftex-end-of-bib-entry): * lisp/textmodes/reftex-ref.el (reftex-replace-prefix-escapes): * lisp/url/url-parse.el (url-generic-parse-url): * lisp/url/url-util.el (url-truncate-url-for-viewing): * lisp/vc/diff-mode.el (diff-unified->context): * lisp/vc/vc-bzr.el (vc-bzr-error-regexp-alist): * lisp/vc/vc-cvs.el (vc-cvs-parse-status): * lisp/woman.el (woman0-el, woman-if-ignore) (woman-change-fonts): * lisp/xdg.el (xdg--substitute-home-env): Fix regular-expression infelicities and typos. Fix regular expression typos Fix typos reported by Mattias Engdegård in: that occurred in preloaded modules. * lisp/frame.el (frame-set-background-mode): * lisp/international/mule.el (sgml-html-meta-auto-coding-function): * lisp/isearch.el (isearch-pre-command-hook): * lisp/minibuffer.el (completion--embedded-envvar-re):
254 lines
8.9 KiB
EmacsLisp
254 lines
8.9 KiB
EmacsLisp
;;; url-parse.el --- Uniform Resource Locator parser -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
|
|
|
|
;; Keywords: comm, data, processes
|
|
|
|
;; 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:
|
|
|
|
(require 'url-vars)
|
|
(require 'auth-source)
|
|
(eval-when-compile (require 'cl-lib))
|
|
|
|
(autoload 'url-scheme-get-property "url-methods")
|
|
|
|
(cl-defstruct (url
|
|
(:constructor nil)
|
|
(:constructor url-parse-make-urlobj
|
|
(&optional type user password host portspec filename
|
|
target attributes fullness))
|
|
(:copier nil))
|
|
type user password host portspec filename target attributes fullness
|
|
silent (use-cookies t)
|
|
(asynchronous t))
|
|
|
|
(defsubst url-port (urlobj)
|
|
"Return the port number for the URL specified by URLOBJ.
|
|
If the port spec is nil (i.e. URLOBJ specifies no port number),
|
|
return the default port number for URLOBJ's scheme."
|
|
(declare (gv-setter (lambda (port) `(setf (url-portspec ,urlobj) ,port))))
|
|
(or (url-portspec urlobj)
|
|
(if (url-type urlobj)
|
|
(url-scheme-get-property (url-type urlobj) 'default-port))))
|
|
|
|
(defun url-path-and-query (urlobj)
|
|
"Return the path and query components of URLOBJ.
|
|
These two components are stored together in the FILENAME slot of
|
|
the object. The return value of this function is (PATH . QUERY),
|
|
where each of PATH and QUERY are strings or nil."
|
|
(let ((name (url-filename urlobj))
|
|
path query)
|
|
(when name
|
|
(if (string-match "\\?" name)
|
|
(setq path (substring name 0 (match-beginning 0))
|
|
query (substring name (match-end 0)))
|
|
(setq path name)))
|
|
(cons path query)))
|
|
|
|
(defun url-port-if-non-default (urlobj)
|
|
"Return the port number specified by URLOBJ, if it is not the default.
|
|
If the specified port number is the default, return nil."
|
|
(let ((port (url-portspec urlobj))
|
|
type)
|
|
(and port
|
|
(or (null (setq type (url-type urlobj)))
|
|
(not (equal port (url-scheme-get-property type 'default-port))))
|
|
port)))
|
|
|
|
;;;###autoload
|
|
(defun url-recreate-url (urlobj)
|
|
"Recreate a URL string from the parsed URLOBJ."
|
|
(let* ((type (url-type urlobj))
|
|
(user (url-user urlobj))
|
|
(pass (url-password urlobj))
|
|
(host (url-host urlobj))
|
|
;; RFC 3986: "omit the port component and its : delimiter if
|
|
;; port is empty or if its value would be the same as that of
|
|
;; the scheme's default."
|
|
(port (url-port-if-non-default urlobj))
|
|
(file (url-filename urlobj))
|
|
(frag (url-target urlobj)))
|
|
(concat (if type (concat type ":"))
|
|
(if (url-fullness urlobj) "//")
|
|
(if (or user pass)
|
|
(concat user
|
|
(if pass (concat ":" pass))
|
|
"@"))
|
|
host
|
|
(if port (format ":%d" (url-port urlobj)))
|
|
(or file "/")
|
|
(if frag (concat "#" frag)))))
|
|
|
|
(defun url-recreate-url-attributes (urlobj)
|
|
"Recreate the attributes of an URL string from the parsed URLOBJ."
|
|
(declare (obsolete nil "24.3"))
|
|
(when (url-attributes urlobj)
|
|
(concat ";"
|
|
(mapconcat (lambda (x)
|
|
(if (cdr x)
|
|
(concat (car x) "=" (cdr x))
|
|
(car x)))
|
|
(url-attributes urlobj) ";"))))
|
|
|
|
;;;###autoload
|
|
(defun url-generic-parse-url (url)
|
|
"Return an URL-struct of the parts of URL.
|
|
The CL-style struct contains the following fields:
|
|
|
|
TYPE is the URI scheme (string or nil).
|
|
USER is the user name (string or nil).
|
|
PASSWORD is the password (string [deprecated] or nil).
|
|
HOST is the host (a registered name, IP literal in square
|
|
brackets, or IPv4 address in dotted-decimal form).
|
|
PORTSPEC is the specified port (a number), or nil.
|
|
FILENAME is the path AND the query component of the URI.
|
|
TARGET is the fragment identifier component (used to refer to a
|
|
subordinate resource, e.g. a part of a webpage).
|
|
ATTRIBUTES is nil; this slot originally stored the attribute and
|
|
value alists for IMAP URIs, but this feature was removed
|
|
since it conflicts with RFC 3986.
|
|
FULLNESS is non-nil if the hierarchical sequence component of
|
|
the URL starts with two slashes, \"//\".
|
|
|
|
The parser follows RFC 3986, except that it also tries to handle
|
|
URIs that are not fully specified (e.g. lacking TYPE), and it
|
|
does not check for or perform %-encoding.
|
|
|
|
Here is an example. The URL
|
|
|
|
foo://bob:pass@example.com:42/a/b/c.dtb?type=animal&name=narwhal#nose
|
|
|
|
parses to
|
|
|
|
TYPE = \"foo\"
|
|
USER = \"bob\"
|
|
PASSWORD = \"pass\"
|
|
HOST = \"example.com\"
|
|
PORTSPEC = 42
|
|
FILENAME = \"/a/b/c.dtb?type=animal&name=narwhal\"
|
|
TARGET = \"nose\"
|
|
ATTRIBUTES = nil
|
|
FULLNESS = t"
|
|
(if (null url)
|
|
(url-parse-make-urlobj)
|
|
(with-temp-buffer
|
|
;; Don't let those temp-buffer modifications accidentally
|
|
;; deactivate the mark of the current-buffer.
|
|
(let ((deactivate-mark nil))
|
|
(set-syntax-table url-parse-syntax-table)
|
|
(erase-buffer)
|
|
(insert url)
|
|
(goto-char (point-min))
|
|
(let ((save-pos (point))
|
|
scheme user pass host port file fragment full
|
|
(inhibit-read-only t))
|
|
|
|
;; 3.1. Scheme
|
|
;; This is nil for a URI that is not fully specified.
|
|
(when (looking-at "\\([a-zA-Z][-a-zA-Z0-9+.]*\\):")
|
|
(goto-char (match-end 0))
|
|
(setq save-pos (point))
|
|
(setq scheme (downcase (match-string 1))))
|
|
|
|
;; 3.2. Authority
|
|
(when (looking-at "//")
|
|
(setq full t)
|
|
(forward-char 2)
|
|
(setq save-pos (point))
|
|
(skip-chars-forward "^/?#")
|
|
(setq host (buffer-substring save-pos (point)))
|
|
;; 3.2.1 User Information
|
|
(if (string-match "^\\([^@]+\\)@" host)
|
|
(setq user (match-string 1 host)
|
|
host (substring host (match-end 0))))
|
|
(if (and user (string-match "\\`\\([^:]*\\):\\(.*\\)" user))
|
|
(setq pass (match-string 2 user)
|
|
user (match-string 1 user)))
|
|
(cond
|
|
;; IPv6 literal address.
|
|
((string-match "^\\(\\[[^]]+\\]\\)\\(?::\\([0-9]*\\)\\)?$" host)
|
|
(setq port (match-string 2 host)
|
|
host (match-string 1 host)))
|
|
;; Registered name or IPv4 address.
|
|
((string-match ":\\([0-9]*\\)$" host)
|
|
(setq port (match-string 1 host)
|
|
host (substring host 0 (match-beginning 0)))))
|
|
(cond ((equal port "")
|
|
(setq port nil))
|
|
(port
|
|
(setq port (string-to-number port))))
|
|
(setq host (downcase host)))
|
|
|
|
;; Now point is on the / ? or # which terminates the
|
|
;; authority, or at the end of the URI, or (if there is no
|
|
;; authority) at the beginning of the absolute path.
|
|
|
|
(setq save-pos (point))
|
|
(if (string= "data" scheme)
|
|
;; For the "data" URI scheme, all the rest is the FILE.
|
|
(setq file (buffer-substring save-pos (point-max)))
|
|
;; For hysterical raisins, our data structure returns the
|
|
;; path and query components together in one slot.
|
|
;; 3.3. Path
|
|
(skip-chars-forward "^?#")
|
|
;; 3.4. Query
|
|
(when (looking-at "\\?")
|
|
(skip-chars-forward "^#"))
|
|
(setq file (buffer-substring save-pos (point)))
|
|
;; 3.5 Fragment
|
|
(when (looking-at "#")
|
|
(let ((opoint (point)))
|
|
(forward-char 1)
|
|
(setq fragment (buffer-substring (point) (point-max)))
|
|
(delete-region opoint (point-max)))))
|
|
|
|
(if (and host (string-match "%[0-9][0-9]" host))
|
|
(setq host (url-unhex-string host)))
|
|
(url-parse-make-urlobj scheme user pass host port file
|
|
fragment nil full))))))
|
|
|
|
(defmacro url-bit-for-url (method lookfor url)
|
|
`(let* ((urlobj (url-generic-parse-url ,url))
|
|
(bit (funcall ,method urlobj))
|
|
(methods (list 'url-recreate-url
|
|
'url-host))
|
|
auth-info)
|
|
(while (and (not bit) (> (length methods) 0))
|
|
(setq auth-info (auth-source-search
|
|
:max 1
|
|
:host (funcall (pop methods) urlobj)
|
|
:port (url-type urlobj)))
|
|
(setq bit (plist-get (nth 0 auth-info) ,lookfor))
|
|
(when (functionp bit)
|
|
(setq bit (funcall bit))))
|
|
bit))
|
|
|
|
(defun url-user-for-url (url)
|
|
"Attempt to use .authinfo to find a user for this URL."
|
|
(url-bit-for-url 'url-user :user url))
|
|
|
|
(defun url-password-for-url (url)
|
|
"Attempt to use .authinfo to find a password for this URL."
|
|
(url-bit-for-url 'url-password :secret url))
|
|
|
|
(provide 'url-parse)
|
|
|
|
;;; url-parse.el ends here
|