Mercurial > emacs
annotate lisp/url/url-expand.el @ 83467:d04d8ccb3c41
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-41
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-42
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-43
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-44
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-45
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-46
Merge from erc--emacs--0
* emacs@sv.gnu.org/emacs--devo--0--patch-47
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-48
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-14
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-15
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-16
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-17
Merge from emacs--devo--0
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-507
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 06 Feb 2006 18:44:57 +0000 |
parents | 532e0a9335a9 e8a3fb527b77 |
children | b8d9a391daf3 |
rev | line source |
---|---|
54695 | 1 ;;; url-expand.el --- expand-file-name for URLs |
57612 | 2 |
68640
e8a3fb527b77
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64748
diff
changeset
|
3 ;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc. |
57612 | 4 |
54695 | 5 ;; Keywords: comm, data, processes |
6 | |
57612 | 7 ;; This file is part of GNU Emacs. |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
10 ;; it under the terms of the GNU General Public License as published by | |
11 ;; the Free Software Foundation; either version 2, or (at your option) | |
12 ;; any later version. | |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64084 | 21 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
22 ;; Boston, MA 02110-1301, USA. | |
57612 | 23 |
24 ;;; Code: | |
54695 | 25 |
26 (require 'url-methods) | |
27 (require 'url-util) | |
28 (require 'url-parse) | |
29 | |
30 (defun url-expander-remove-relative-links (name) | |
31 ;; Strip . and .. from pathnames | |
32 (let ((new (if (not (string-match "^/" name)) | |
33 (concat "/" name) | |
34 name))) | |
35 | |
36 ;; If it ends with a '/.' or '/..', tack on a trailing '/' sot hat | |
37 ;; the tests that follow are not too complicated in terms of | |
38 ;; looking for '..' or '../', etc. | |
39 (if (string-match "/\\.+$" new) | |
40 (setq new (concat new "/"))) | |
41 | |
42 ;; Remove '/./' first | |
43 (while (string-match "/\\(\\./\\)" new) | |
44 (setq new (concat (substring new 0 (match-beginning 1)) | |
45 (substring new (match-end 1))))) | |
46 | |
47 ;; Then remove '/../' | |
48 (while (string-match "/\\([^/]*/\\.\\./\\)" new) | |
49 (setq new (concat (substring new 0 (match-beginning 1)) | |
50 (substring new (match-end 1))))) | |
51 | |
52 ;; Remove cruft at the beginning of the string, so people that put | |
53 ;; in extraneous '..' because they are morons won't lose. | |
54 (while (string-match "^/\\.\\.\\(/\\)" new) | |
55 (setq new (substring new (match-beginning 1) nil))) | |
56 new)) | |
57 | |
58 (defun url-expand-file-name (url &optional default) | |
59 "Convert URL to a fully specified URL, and canonicalize it. | |
60 Second arg DEFAULT is a URL to start with if URL is relative. | |
61 If DEFAULT is nil or missing, the current buffer's URL is used. | |
62 Path components that are `.' are removed, and | |
63 path components followed by `..' are removed, along with the `..' itself." | |
64 (if (and url (not (string-match "^#" url))) | |
65 ;; Need to nuke newlines and spaces in the URL, or we open | |
66 ;; ourselves up to potential security holes. | |
67 (setq url (mapconcat (function (lambda (x) | |
68 (if (memq x '(? ?\n ?\r)) | |
69 "" | |
70 (char-to-string x)))) | |
71 url ""))) | |
72 | |
73 ;; Need to figure out how/where to expand the fragment relative to | |
74 (setq default (cond | |
75 ((vectorp default) | |
76 ;; Default URL has already been parsed | |
77 default) | |
78 (default | |
79 ;; They gave us a default URL in non-parsed format | |
80 (url-generic-parse-url default)) | |
81 (url-current-object | |
82 ;; We are in a URL-based buffer, use the pre-parsed object | |
83 url-current-object) | |
84 ((string-match url-nonrelative-link url) | |
85 ;; The URL they gave us is absolute, go for it. | |
86 nil) | |
87 (t | |
88 ;; Hmmm - this shouldn't ever happen. | |
89 (error "url-expand-file-name confused - no default?")))) | |
90 | |
91 (cond | |
92 ((= (length url) 0) ; nil or empty string | |
93 (url-recreate-url default)) | |
94 ((string-match "^#" url) ; Offset link, use it raw | |
95 url) | |
96 ((string-match url-nonrelative-link url) ; Fully-qualified URL, return it immediately | |
97 url) | |
98 (t | |
99 (let* ((urlobj (url-generic-parse-url url)) | |
100 (inhibit-file-name-handlers t) | |
101 (expander (url-scheme-get-property (url-type default) 'expand-file-name))) | |
102 (if (string-match "^//" url) | |
103 (setq urlobj (url-generic-parse-url (concat (url-type default) ":" | |
104 url)))) | |
105 (funcall expander urlobj default) | |
106 (url-recreate-url urlobj))))) | |
107 | |
108 (defun url-identity-expander (urlobj defobj) | |
109 (url-set-type urlobj (or (url-type urlobj) (url-type defobj)))) | |
110 | |
111 (defun url-default-expander (urlobj defobj) | |
112 ;; The default expansion routine - urlobj is modified by side effect! | |
113 (if (url-type urlobj) | |
114 ;; Well, they told us the scheme, let's just go with it. | |
115 nil | |
116 (url-set-type urlobj (or (url-type urlobj) (url-type defobj))) | |
117 (url-set-port urlobj (or (url-port urlobj) | |
118 (and (string= (url-type urlobj) | |
119 (url-type defobj)) | |
120 (url-port defobj)))) | |
121 (if (not (string= "file" (url-type urlobj))) | |
122 (url-set-host urlobj (or (url-host urlobj) (url-host defobj)))) | |
123 (if (string= "ftp" (url-type urlobj)) | |
124 (url-set-user urlobj (or (url-user urlobj) (url-user defobj)))) | |
125 (if (string= (url-filename urlobj) "") | |
126 (url-set-filename urlobj "/")) | |
127 (if (string-match "^/" (url-filename urlobj)) | |
128 nil | |
129 (let ((query nil) | |
130 (file nil) | |
131 (sepchar nil)) | |
132 (if (string-match "[?#]" (url-filename urlobj)) | |
133 (setq query (substring (url-filename urlobj) (match-end 0)) | |
134 file (substring (url-filename urlobj) 0 (match-beginning 0)) | |
135 sepchar (substring (url-filename urlobj) (match-beginning 0) (match-end 0))) | |
136 (setq file (url-filename urlobj))) | |
137 (setq file (url-expander-remove-relative-links | |
138 (concat (url-basepath (url-filename defobj)) file))) | |
139 (url-set-filename urlobj (if query (concat file sepchar query) file)))))) | |
140 | |
141 (provide 'url-expand) | |
54699 | 142 |
143 ;;; arch-tag: 7b5f744b-b721-49da-be47-484631680a5a | |
57612 | 144 ;;; url-expand.el ends here |