[Emacs-diffs] Changes to emacs/lisp/url/url-parse.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/url/url-parse.el
diff -c /dev/null emacs/lisp/url/url-parse.el:1.6.2.1
*** /dev/null   Thu Oct 14 08:51:04 2004
--- emacs/lisp/url/url-parse.el Thu Oct 14 08:49:52 2004
***************
*** 0 ****
--- 1,210 ----
+ ;;; url-parse.el --- Uniform Resource Locator parser
+ 
+ ;; Copyright (c) 1996,1997,1998,1999,2004  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., 59 Temple Place - Suite 330,
+ ;; Boston, MA 02111-1307, 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) "/")
+         (if (url-target urlobj)
+             (concat "#" (url-target urlobj)))
+         (if (url-attributes urlobj)
+             (concat ";"
+                     (mapconcat
+                      (function
+                       (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 "^\\(address@hidden)@" 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-int (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