Import Upstream version 3a1upstream/3a1

1 files changed, 85 insertions, 2 deletions

diff --git a/uri.txi b/uri.txi
index 096ff83..8e785a7 100644
--- a/uri.txi
+++ b/uri.txi
@@ -22,6 +22,11 @@ described in RFC 2396.
 Returns a Uniform Resource Identifier string from component arguments.
 @end defun
 
+@defun uri:make-path path
+
+Returns a URI string combining the components of list @var{path}.
+@end defun
+
 @defun html:anchor name
 Returns a string which defines this location in the (HTML) file
 as @var{name}.  The hypertext @samp{<A HREF="#@var{name}">} will link to this point.
@@ -54,13 +59,19 @@ Returns a string specifying the search @var{prompt} of a document, for
 inclusion in the HEAD of the document (@pxref{HTML, head}).
 @end defun
 
-@defun uri->tree uri-reference base-tree @dots{}
+@defun uri->tree uri-reference base-tree
+
+
+@defunx uri->tree uri-reference
+
 Returns a list of 5 elements corresponding to the parts
 (@var{scheme} @var{authority} @var{path} @var{query} @var{fragment})
 of string @var{uri-reference}.  Elements corresponding to absent parts are #f.
 
 The @var{path} is a list of strings.  If the first string is empty,
-then the path is absolute; otherwise relative.
+then the path is absolute; otherwise relative.  The optional @var{base-tree} is a
+tree as returned by @code{uri->tree}; and is used as the base address for relative
+URIs.
 
 If the @var{authority} component is a
 @dfn{Server-based Naming Authority}, then it is a list of the
@@ -76,6 +87,17 @@ string.
 @end example
 @end defun
 
+@defun uri:split-fields txt chr
+
+Returns a list of @var{txt} split at each occurrence of @var{chr}.  @var{chr} does not
+appear in the returned list of strings.
+@end defun
+
+@defun uri:decode-query query-string
+Converts a @dfn{URI} encoded @var{query-string} to a query-alist.
+@cindex URI
+@end defun
+
 @noindent @code{uric:} prefixes indicate procedures dealing with
 URI-components.
 
@@ -93,3 +115,64 @@ Returns a copy of the string @var{uri-component} in which each @samp{%} escaped
 characters in @var{uri-component} is replaced with the character it encodes.  This
 routine is useful for showing URI contents on error pages.
 @end defun
+
+@defun uri:path->keys path-list ptypes
+@var{path-list} is a path-list as returned by @code{uri:split-fields}.  @code{uri:path->keys}
+returns a list of items returned by @code{uri:decode-path}, coerced
+to types @var{ptypes}.
+@end defun
+@subheading File-system Locators and Predicates
+
+
+@defun path->uri path
+Returns a URI-string for @var{path} on the local host.
+@end defun
+
+@defun absolute-uri? str
+Returns #t if @var{str} is an absolute-URI as indicated by a
+syntactically valid (per RFC 2396) @dfn{scheme}; otherwise returns
+@cindex scheme
+#f.
+@end defun
+
+@defun absolute-path? file-name
+Returns #t if @var{file-name} is a fully specified pathname (does not
+depend on the current working directory); otherwise returns #f.
+@end defun
+
+@defun null-directory? str
+Returns #t if changing directory to @var{str} would leave the current
+directory unchanged; otherwise returns #f.
+@end defun
+
+@defun glob-pattern? str
+Returns #t if the string @var{str} contains characters used for
+specifying glob patterns, namely @samp{*}, @samp{?}, or @samp{[}.
+@end defun
+@noindent
+Before RFC 2396, the @dfn{File Transfer Protocol} (FTP) served a
+@cindex File Transfer Protocol
+similar purpose.
+
+
+@defun parse-ftp-address uri
+
+Returns a list of the decoded FTP @var{uri}; or #f if indecipherable.  FTP
+@dfn{Uniform Resource Locator}, @dfn{ange-ftp}, and @dfn{getit}
+@cindex Uniform Resource Locator
+@cindex ange-ftp
+@cindex getit
+formats are handled.  The returned list has four elements which are
+strings or #f:
+
+@enumerate 0
+@item
+username
+@item
+password
+@item
+remote-site
+@item
+remote-directory
+@end enumerate
+@end defun