(ido-enable-prefix): Improve previous doc fix.

[gnu-emacs] / lisp / url / url-parse.el

diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index db85c43a38fe9d2dabde20f716ca39467bb3ebe8..2e4fc8a9f2732f28eb7dcab4219ca5de77275361 100644 (file)
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -1,6 +1,7 @@
 ;;; url-parse.el --- Uniform Resource Locator parser
 
-;; Copyright (c) 1996,1997,1998,1999,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -84,7 +85,7 @@
 
 (defmacro url-set-full (urlobj val)
   `(aset ,urlobj 8 ,val))
-  
+
 ;;;###autoload
 (defun url-recreate-url (urlobj)
   "Recreate a URL string from the parsed URLOBJ."
@@ -99,28 +100,36 @@
                   (not (equal (url-port urlobj)
                               (url-scheme-get-property (url-type urlobj) 'default-port))))
              (format ":%d" (url-port urlobj)))
-         (or (url-filename urlobj) "/")
+         (or (url-filename urlobj) "/")          
+         (url-recreate-url-attributes 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) ";")))))
+             (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\]"
+  ;; See RFC 3986.
   (cond
    ((null url)
     (make-vector 9 nil))
    ((or (not (string-match url-nonrelative-link url))
        (= ?/ (string-to-char url)))
+    ;; This isn't correct, as a relative URL can be a fragment link
+    ;; (e.g. "#foo") and many other things (see section 4.2).
+    ;; However, let's not fix something that isn't broken, especially
+    ;; when close to a release.
     (let ((retval (make-vector 9 nil)))
       (url-set-filename retval url)
       (url-set-full retval nil)
@@ -144,6 +153,8 @@ Format is:
        (insert url)
        (goto-char (point-min))
        (setq save-pos (point))
+
+       ;; 3.1. Scheme
        (if (not (looking-at "//"))
            (progn
              (skip-chars-forward "a-zA-Z+.\\-")
@@ -152,13 +163,13 @@ Format is:
              (skip-chars-forward ":")
              (setq save-pos (point))))
 
-       ;; We are doing a fully specified URL, with hostname and all
+       ;; 3.2. Authority
        (if (looking-at "//")
            (progn
              (setq full t)
              (forward-char 2)
              (setq save-pos (point))
-             (skip-chars-forward "^/")
+             (skip-chars-forward "^/\\?#")
              (setq host (buffer-substring save-pos (point)))
              (if (string-match "^\\([^@]+\\)@" host)
                  (setq user (match-string 1 host)
@@ -166,6 +177,7 @@ Format is:
              (if (and user (string-match "\\([^:]+\\):\\(.*\\)" user))
                  (setq pass (match-string 2 user)
                        user (match-string 1 user)))
+             ;; This gives wrong results for IPv6 literal addresses.
              (if (string-match ":\\([0-9+]+\\)" host)
                  (setq port (string-to-number (match-string 1 host))
                        host (substring host 0 (match-beginning 0))))
@@ -177,29 +189,26 @@ Format is:
        (if (not port)
            (setq port (url-scheme-get-property prot 'default-port)))
 
-       ;; Gross hack to preserve ';' in data URLs
-
+       ;; 3.3. Path
        (setq save-pos (point))
+       (skip-chars-forward "^#?")
+       (setq file (buffer-substring save-pos (point)))
 
-       (if (string= "data" prot)
-           (goto-char (point-max))
-         ;; Now check for references
+       ;; 3.4. Query
+       (when (looking-at "\\?")
+         (forward-char 1)
+         (setq save-pos (point))
          (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))))
+         ;; RFC 3986 specifies no general way of parsing the query
+         ;; string, but `url-parse-args' seems universal enough.
+         (setq attr (url-parse-args (buffer-substring save-pos (point)) t)
+               attr (nreverse attr)))
+
+       ;; 3.5. Fragment
+       (when (looking-at "#")
+         (forward-char 1)
+         (setq refs (buffer-substring (point) (point-max))))
 
-       (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))))))