From d94afcf332a312f90261c526e83609bb2b26c6d2 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 5 Oct 2001 15:58:18 +0000
Subject: [PATCH] Add URL-encoding support.

---
 v7/src/runtime/Makefile.in  |  4 ++--
 v7/src/runtime/ed-ffi.scm   |  4 +++-
 v7/src/runtime/optiondb.scm |  3 ++-
 v7/src/runtime/runtime.pkg  | 32 ++++++++++++++++++++++++++++++--
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/v7/src/runtime/Makefile.in b/v7/src/runtime/Makefile.in
index 0c39e347e..eaa3fab3a 100644
--- a/v7/src/runtime/Makefile.in
+++ b/v7/src/runtime/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.4 2001/10/05 15:43:38 cph Exp $
+# $Id: Makefile.in,v 1.5 2001/10/05 15:58:10 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -63,7 +63,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 AUXDIR = @AUXDIR@
 RODIR = $(AUXDIR)/options
 RUNOPTS = chrsyn cpress format gdbm hashtb krypt mime-codec numint optiondb \
-	  ordvec process rbtree regexp rexp rgxcmp syncproc wttree ystep
+	  ordvec process rbtree regexp rexp rgxcmp syncproc url wttree ystep
 
 all:
 	echo "No ALL action"
diff --git a/v7/src/runtime/ed-ffi.scm b/v7/src/runtime/ed-ffi.scm
index fee331df1..091a38672 100644
--- a/v7/src/runtime/ed-ffi.scm
+++ b/v7/src/runtime/ed-ffi.scm
@@ -1,6 +1,6 @@
 #| -*- Scheme -*-
 
-$Id: ed-ffi.scm,v 1.26 2001/10/05 15:48:10 cph Exp $
+$Id: ed-ffi.scm,v 1.27 2001/10/05 15:58:12 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -296,6 +296,8 @@ USA.
 		syntax-table/system-internal)
     ("uproc"	(runtime procedure)
 		syntax-table/system-internal)
+    ("url"	(runtime url)
+		syntax-table/system-internal)
     ("urtrap"	(runtime reference-trap)
 		syntax-table/system-internal)
     ("usrint"	(runtime user-interface)
diff --git a/v7/src/runtime/optiondb.scm b/v7/src/runtime/optiondb.scm
index 31b27d059..5df514ce7 100644
--- a/v7/src/runtime/optiondb.scm
+++ b/v7/src/runtime/optiondb.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: optiondb.scm,v 1.10 2001/10/05 15:43:43 cph Exp $
+$Id: optiondb.scm,v 1.11 2001/10/05 15:58:15 cph Exp $
 
 Copyright (c) 1994-2001 Massachusetts Institute of Technology
 
@@ -71,6 +71,7 @@ USA.
    (STEPPER	(RUNTIME STEPPER)	#F			"ystep")
    (SUBPROCESS	(RUNTIME SUBPROCESS)	(INITIALIZE-PACKAGE!)	"process")
    (SYNCHRONOUS-SUBPROCESS (RUNTIME SYNCHRONOUS-SUBPROCESS) #F	"syncproc")
+   (URL		(RUNTIME url)		#F			"url")
    (WT-TREE	(RUNTIME WT-TREE)	#F			"wttree")
    ))
 
diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 802c345ab..d5bda88e7 100644
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.377 2001/10/05 15:43:46 cph Exp $
+$Id: runtime.pkg,v 14.378 2001/10/05 15:58:18 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -3753,4 +3753,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 	  encode-quoted-printable:update
 	  make-decode-base64-port
 	  make-decode-binhex40-port
-	  make-decode-quoted-printable-port))
\ No newline at end of file
+	  make-decode-quoted-printable-port))
+
+(define-package (runtime url)
+  (file-case options
+    ((load) "url")
+    (else))
+  (parent ())
+  (export ()
+	  url:char-set:escaped
+	  url:char-set:extra
+	  url:char-set:national
+	  url:char-set:punctuation
+	  url:char-set:reserved
+	  url:char-set:safe
+	  url:char-set:unescaped
+	  url:char-set:unreserved
+	  url:decode-string
+	  url:decode-substring
+	  url:encode-string
+	  url:encode-substring
+	  url:rexp:escape
+	  url:rexp:host
+	  url:rexp:hostname
+	  url:rexp:hostnumber
+	  url:rexp:hostport
+	  url:rexp:uchar
+	  url:rexp:xchar
+	  url:string-encoded?
+	  url:substring-encoded?))
\ No newline at end of file
-- 
2.25.1