summaryrefslogtreecommitdiff
path: root/module/web
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2021-01-12 11:47:58 +0100
committerAndy Wingo <wingo@pobox.com>2021-01-12 12:09:19 +0100
commit0f42fef11981f38578bbd629a294b2053d258db0 (patch)
treeef383134ad3521c7415b589ebea979fb413f9d5f /module/web
parent9fecf20fcf1bac764b3d812e07ed4a4a56be52a2 (diff)
downloadguile-0f42fef11981f38578bbd629a294b2053d258db0.tar.gz
Add call-with-input-bytevector, call-with-output-bytevector
* module/ice-9/binary-ports.scm (call-with-input-bytevector): (call-with-output-bytevector): New functions. * module/ice-9/iconv.scm: Remove superfluous copies of call-with-output-string* and call-with-output-bytevector*, now that the former closes the port and the latter exists. (call-with-encoded-output-string): Adapt. * module/web/uri.scm: Use (ice-9 iconv) instead of local bytevector/string conversion procedures.
Diffstat (limited to 'module/web')
-rw-r--r--module/web/uri.scm54
1 files changed, 6 insertions, 48 deletions
diff --git a/module/web/uri.scm b/module/web/uri.scm
index 728444afc..8e0b9bee7 100644
--- a/module/web/uri.scm
+++ b/module/web/uri.scm
@@ -1,6 +1,6 @@
;;;; (web uri) --- URI manipulation tools
;;;;
-;;;; Copyright (C) 1997,2001,2002,2010,2011,2012,2013,2014,2019,2020 Free Software Foundation, Inc.
+;;;; Copyright (C) 1997,2001,2002,2010,2011,2012,2013,2014,2019-2021 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -26,6 +26,7 @@
(define-module (web uri)
#:use-module (srfi srfi-9)
+ #:use-module (ice-9 iconv)
#:use-module (ice-9 regex)
#:use-module (ice-9 rdelim)
#:use-module (ice-9 control)
@@ -364,49 +365,6 @@ serialization."
""))))
-;; like call-with-output-string, but actually closes the port (doh)
-(define (call-with-output-string* proc)
- (let ((port (open-output-string)))
- (proc port)
- (let ((str (get-output-string port)))
- (close-port port)
- str)))
-
-(define (call-with-output-bytevector* proc)
- (call-with-values
- (lambda ()
- (open-bytevector-output-port))
- (lambda (port get-bytevector)
- (proc port)
- (let ((bv (get-bytevector)))
- (close-port port)
- bv))))
-
-(define (call-with-encoded-output-string encoding proc)
- (if (string-ci=? encoding "utf-8")
- (string->utf8 (call-with-output-string* proc))
- (call-with-output-bytevector*
- (lambda (port)
- (set-port-encoding! port encoding)
- (proc port)))))
-
-(define (encode-string str encoding)
- (if (string-ci=? encoding "utf-8")
- (string->utf8 str)
- (call-with-encoded-output-string encoding
- (lambda (port)
- (display str port)))))
-
-(define (decode-string bv encoding)
- (if (string-ci=? encoding "utf-8")
- (utf8->string bv)
- (let ((p (open-bytevector-input-port bv)))
- (set-port-encoding! p encoding)
- (let ((res (read-string p)))
- (close-port p)
- res))))
-
-
;; A note on characters and bytes: URIs are defined to be sequences of
;; characters in a subset of ASCII. Those characters may encode a
;; sequence of bytes (octets), which in turn may encode sequences of
@@ -444,7 +402,7 @@ Returns a string of the decoded characters, or a bytevector if
ENCODING was ‘#f’."
(let* ((len (string-length str))
(bv
- (call-with-output-bytevector*
+ (call-with-output-bytevector
(lambda (port)
(let lp ((i 0))
(if (< i len)
@@ -469,7 +427,7 @@ ENCODING was ‘#f’."
(uri-error "Invalid character in encoded URI ~a: ~s"
str ch))))))))))
(if encoding
- (decode-string bv encoding)
+ (bytevector->string bv encoding)
;; Otherwise return raw bytevector
bv)))
@@ -506,13 +464,13 @@ uppercase hexadecimal representation of the byte."
(define (needs-escaped? ch)
(not (char-set-contains? unescaped-chars ch)))
(if (string-index str needs-escaped?)
- (call-with-output-string*
+ (call-with-output-string
(lambda (port)
(string-for-each
(lambda (ch)
(if (char-set-contains? unescaped-chars ch)
(display ch port)
- (let* ((bv (encode-string (string ch) encoding))
+ (let* ((bv (string->bytevector (string ch) encoding))
(len (bytevector-length bv)))
(let lp ((i 0))
(if (< i len)