Mercurial > emacs
view lisp/url/url-parse.el @ 73269:aeb79612dc36
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 145-148)
- Merge from emacs--devo--0
- Update from CVS
2006-10-04 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-sum.el (gnus-summary-make-menu-bar): Clarify
gnus-summary-limit-to-articles.
2006-10-04 Romain Francoise <romain@orebokech.com>
* lisp/gnus/gnus-util.el (gnus-alist-to-hashtable, gnus-hashtable-to-alist):
Moved here (and renamed) from gnus-registry.el.
* lisp/gnus/gnus-registry.el: Require gnus-util.
Use `gnus-alist-to-hashtable' and `gnus-hashtable-to-alist'.
2006-10-04 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/pop3.el (pop3-authentication-scheme): Clarify doc.
(pop3-movemail): Warn about pop3-leave-mail-on-server.
2006-10-04 Dave Love <fx@gnu.org>
* lisp/gnus/pop3.el (pop3-authentication-scheme): Add custom version.
2006-10-04 Jesper Harder <harder@ifa.au.dk>
* lisp/gnus/pop3.el (pop3-leave-mail-on-server): Don't quote nil in
doc string. Improve doc string.
2006-10-03 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-util.el (gnus-with-local-quit): New macro.
* lisp/gnus/gnus-demon.el (gnus-demon): Replace with-local-quit with it.
2006-10-06 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Image Enhancements): Update for Emacs 22.
* man/gnus-faq.texi ([1.3]): Update.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-466
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 07 Oct 2006 01:51:54 +0000 |
parents | f6c1ac4c14c7 |
children | 8c2a0bfc98b0 |
line wrap: on
line source
;;; url-parse.el --- Uniform Resource Locator parser ;; Copyright (C) 1996, 1997, 1998, 1999, 2004, ;; 2005, 2006 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 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: (require 'url-vars) (autoload 'url-scheme-get-property "url-methods") (defmacro url-type (urlobj) `(aref ,urlobj 0)) (defmacro url-user (urlobj) `(aref ,urlobj 1)) (defmacro url-password (urlobj) `(aref ,urlobj 2)) (defmacro url-host (urlobj) `(aref ,urlobj 3)) (defmacro url-port (urlobj) `(or (aref ,urlobj 4) (if (url-fullness ,urlobj) (url-scheme-get-property (url-type ,urlobj) 'default-port)))) (defmacro url-filename (urlobj) `(aref ,urlobj 5)) (defmacro url-target (urlobj) `(aref ,urlobj 6)) (defmacro url-attributes (urlobj) `(aref ,urlobj 7)) (defmacro url-fullness (urlobj) `(aref ,urlobj 8)) (defmacro url-set-type (urlobj type) `(aset ,urlobj 0 ,type)) (defmacro url-set-user (urlobj user) `(aset ,urlobj 1 ,user)) (defmacro url-set-password (urlobj pass) `(aset ,urlobj 2 ,pass)) (defmacro url-set-host (urlobj host) `(aset ,urlobj 3 ,host)) (defmacro url-set-port (urlobj port) `(aset ,urlobj 4 ,port)) (defmacro url-set-filename (urlobj file) `(aset ,urlobj 5 ,file)) (defmacro url-set-target (urlobj targ) `(aset ,urlobj 6 ,targ)) (defmacro url-set-attributes (urlobj targ) `(aset ,urlobj 7 ,targ)) (defmacro url-set-full (urlobj val) `(aset ,urlobj 8 ,val)) ;;;###autoload (defun url-recreate-url (urlobj) "Recreate a URL string from the parsed URLOBJ." (concat (url-type urlobj) ":" (if (url-host urlobj) "//" "") (if (url-user urlobj) (concat (url-user urlobj) (if (url-password urlobj) (concat ":" (url-password urlobj))) "@")) (url-host urlobj) (if (and (url-port urlobj) (not (equal (url-port urlobj) (url-scheme-get-property (url-type urlobj) 'default-port)))) (format ":%d" (url-port urlobj))) (or (url-filename urlobj) "/") (url-recreate-url-attributes urlobj) (if (url-target urlobj) (concat "#" (url-target urlobj))))) (defun url-recreate-url-attributes (urlobj) "Recreate the attributes of an URL string from the parsed URLOBJ." (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 a vector of the parts of URL. Format is: \[TYPE USER PASSWORD HOST PORT FILE TARGET ATTRIBUTES FULL\]" (cond ((null url) (make-vector 9 nil)) ((or (not (string-match url-nonrelative-link url)) (= ?/ (string-to-char url))) (let ((retval (make-vector 9 nil))) (url-set-filename retval url) (url-set-full retval nil) retval)) (t (save-excursion (set-buffer (get-buffer-create " *urlparse*")) (set-syntax-table url-parse-syntax-table) (let ((save-pos nil) (prot nil) (user nil) (pass nil) (host nil) (port nil) (file nil) (refs nil) (attr nil) (full nil) (inhibit-read-only t)) (erase-buffer) (insert url) (goto-char (point-min)) (setq save-pos (point)) (if (not (looking-at "//")) (progn (skip-chars-forward "a-zA-Z+.\\-") (downcase-region save-pos (point)) (setq prot (buffer-substring save-pos (point))) (skip-chars-forward ":") (setq save-pos (point)))) ;; We are doing a fully specified URL, with hostname and all (if (looking-at "//") (progn (setq full t) (forward-char 2) (setq save-pos (point)) (skip-chars-forward "^/") (setq host (buffer-substring save-pos (point))) (if (string-match "^\\([^@]+\\)@" host) (setq user (match-string 1 host) host (substring host (match-end 0) nil))) (if (and user (string-match "\\([^:]+\\):\\(.*\\)" user)) (setq pass (match-string 2 user) user (match-string 1 user))) (if (string-match ":\\([0-9+]+\\)" host) (setq port (string-to-number (match-string 1 host)) host (substring host 0 (match-beginning 0)))) (if (string-match ":$" host) (setq host (substring host 0 (match-beginning 0)))) (setq host (downcase host) save-pos (point)))) (if (not port) (setq port (url-scheme-get-property prot 'default-port))) ;; Gross hack to preserve ';' in data URLs (setq save-pos (point)) (if (string= "data" prot) (goto-char (point-max)) ;; Now check for references (skip-chars-forward "^#") (if (eobp) nil (delete-region (point) (progn (skip-chars-forward "#") (setq refs (buffer-substring (point) (point-max))) (point-max)))) (goto-char save-pos) (skip-chars-forward "^;") (if (not (eobp)) (setq attr (url-parse-args (buffer-substring (point) (point-max)) t) attr (nreverse attr)))) (setq file (buffer-substring save-pos (point))) (if (and host (string-match "%[0-9][0-9]" host)) (setq host (url-unhex-string host))) (vector prot user pass host port file refs attr full)))))) (provide 'url-parse) ;; arch-tag: f338325f-71ab-4bee-93cc-78fb9a03d403 ;;; url-parse.el ends here