mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-28 07:45:00 +00:00
a464a6c73a
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el: * vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el: * textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el: * strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el: * progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el: * play/tetris.el, play/snake.el, play/pong.el, play/landmark.el: * play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el: * net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el: * image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el: * eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el: * eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el: * eshell/em-cmpl.el, eshell/em-banner.el: * url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el: * url/url-future.el, url/url-dav.el, url/url-cookie.el: * calendar/parse-time.el, test/eshell.el: Use cl-lib. * wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el: * vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el: * textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el: * term/ns-win.el, term.el, shell.el, ps-samp.el: * progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el: * progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el: * play/gamegrid.el, play/bubbles.el, novice.el, notifications.el: * net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el: * net/ldap.el, net/eudc.el, net/browse-url.el, man.el: * mail/mailheader.el, mail/feedmail.el: * url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el: * url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el: Dont use CL. * ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time. * eshell/esh-opt.el (eshell-eval-using-options): Quote code with `lambda' rather than with `quote'. (eshell-do-opt): Adjust accordingly. (eshell-process-option): Simplify. * eshell/esh-var.el: * eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options. * emacs-pcase.el (pcase--dontcare-upats, pcase--let*) (pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern to `pcase--dontcare'. * emacs-cl.el (labels): Mark obsolete. (cl--letf, letf): Move to cl-lib. (cl--letf*, letf*): Remove. * emacs-cl-lib.el (cl-nth-value): Use defalias. * emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule. (cl-progv): Rewrite. (cl--letf, cl-letf): Move from cl.el. (cl-letf*): New macro. * emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
150 lines
5.6 KiB
EmacsLisp
150 lines
5.6 KiB
EmacsLisp
;;; url-expand.el --- expand-file-name for URLs
|
|
|
|
;; Copyright (C) 1999, 2004-2012 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 <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Code:
|
|
|
|
(require 'url-methods)
|
|
(require 'url-util)
|
|
(require 'url-parse)
|
|
|
|
(defun url-expander-remove-relative-links (name)
|
|
;; Strip . and .. from pathnames
|
|
(let ((new (if (not (string-match "^/" name))
|
|
(concat "/" name)
|
|
name)))
|
|
|
|
;; If it ends with a '/.' or '/..', tack on a trailing '/' sot hat
|
|
;; the tests that follow are not too complicated in terms of
|
|
;; looking for '..' or '../', etc.
|
|
(if (string-match "/\\.+$" new)
|
|
(setq new (concat new "/")))
|
|
|
|
;; Remove '/./' first
|
|
(while (string-match "/\\(\\./\\)" new)
|
|
(setq new (concat (substring new 0 (match-beginning 1))
|
|
(substring new (match-end 1)))))
|
|
|
|
;; Then remove '/../'
|
|
(while (string-match "/\\([^/]*/\\.\\./\\)" new)
|
|
(setq new (concat (substring new 0 (match-beginning 1))
|
|
(substring new (match-end 1)))))
|
|
|
|
;; Remove cruft at the beginning of the string, so people that put
|
|
;; in extraneous '..' because they are morons won't lose.
|
|
(while (string-match "^/\\.\\.\\(/\\)" new)
|
|
(setq new (substring new (match-beginning 1) nil)))
|
|
new))
|
|
|
|
(defun url-expand-file-name (url &optional default)
|
|
"Convert URL to a fully specified URL, and canonicalize it.
|
|
Second arg DEFAULT is a URL to start with if URL is relative.
|
|
If DEFAULT is nil or missing, the current buffer's URL is used.
|
|
Path components that are `.' are removed, and
|
|
path components followed by `..' are removed, along with the `..' itself."
|
|
(if (and url (not (string-match "^#" url)))
|
|
;; Need to nuke newlines and spaces in the URL, or we open
|
|
;; ourselves up to potential security holes.
|
|
(setq url (mapconcat (function (lambda (x)
|
|
(if (memq x '(? ?\n ?\r))
|
|
""
|
|
(char-to-string x))))
|
|
url "")))
|
|
|
|
;; Need to figure out how/where to expand the fragment relative to
|
|
(setq default (cond
|
|
((vectorp default)
|
|
;; Default URL has already been parsed
|
|
default)
|
|
(default
|
|
;; They gave us a default URL in non-parsed format
|
|
(url-generic-parse-url default))
|
|
(url-current-object
|
|
;; We are in a URL-based buffer, use the pre-parsed object
|
|
url-current-object)
|
|
((string-match url-nonrelative-link url)
|
|
;; The URL they gave us is absolute, go for it.
|
|
nil)
|
|
(t
|
|
;; Hmmm - this shouldn't ever happen.
|
|
(error "url-expand-file-name confused - no default?"))))
|
|
|
|
(cond
|
|
((= (length url) 0) ; nil or empty string
|
|
(url-recreate-url default))
|
|
((string-match "^#" url) ; Offset link, use it raw
|
|
url)
|
|
((string-match url-nonrelative-link url) ; Fully-qualified URL, return it immediately
|
|
url)
|
|
(t
|
|
(let* ((urlobj (url-generic-parse-url url))
|
|
(inhibit-file-name-handlers t)
|
|
(expander (url-scheme-get-property (url-type default) 'expand-file-name)))
|
|
(if (string-match "^//" url)
|
|
(setq urlobj (url-generic-parse-url (concat (url-type default) ":"
|
|
url))))
|
|
(funcall expander urlobj default)
|
|
(url-recreate-url urlobj)))))
|
|
|
|
(defun url-identity-expander (urlobj defobj)
|
|
(setf (url-type urlobj) (or (url-type urlobj) (url-type defobj))))
|
|
|
|
(defun url-default-expander (urlobj defobj)
|
|
;; The default expansion routine - urlobj is modified by side effect!
|
|
(if (url-type urlobj)
|
|
;; Well, they told us the scheme, let's just go with it.
|
|
nil
|
|
(setf (url-type urlobj) (or (url-type urlobj) (url-type defobj)))
|
|
(setf (url-port urlobj) (or (url-port urlobj)
|
|
(and (string= (url-type urlobj)
|
|
(url-type defobj))
|
|
(url-port defobj))))
|
|
(if (not (string= "file" (url-type urlobj)))
|
|
(setf (url-host urlobj) (or (url-host urlobj) (url-host defobj))))
|
|
(if (string= "ftp" (url-type urlobj))
|
|
(setf (url-user urlobj) (or (url-user urlobj) (url-user defobj))))
|
|
(if (string= (url-filename urlobj) "")
|
|
(setf (url-filename urlobj) "/"))
|
|
;; If the object we're expanding from is full, then we are now
|
|
;; full.
|
|
(unless (url-fullness urlobj)
|
|
(setf (url-fullness urlobj) (url-fullness defobj)))
|
|
(if (string-match "^/" (url-filename urlobj))
|
|
nil
|
|
(let ((query nil)
|
|
(file nil)
|
|
(sepchar nil))
|
|
(if (string-match "[?#]" (url-filename urlobj))
|
|
(setq query (substring (url-filename urlobj) (match-end 0))
|
|
file (substring (url-filename urlobj) 0 (match-beginning 0))
|
|
sepchar (substring (url-filename urlobj) (match-beginning 0) (match-end 0)))
|
|
(setq file (url-filename urlobj)))
|
|
;; We use concat rather than expand-file-name to combine
|
|
;; directory and file name, since urls do not follow the same
|
|
;; rules as local files on all platforms.
|
|
(setq file (url-expander-remove-relative-links
|
|
(concat (url-file-directory (url-filename defobj)) file)))
|
|
(setf (url-filename urlobj)
|
|
(if query (concat file sepchar query) file))))))
|
|
|
|
(provide 'url-expand)
|
|
|
|
;;; url-expand.el ends here
|