Update calls of read-string to read-delimited-string.

diff --git a/src/6001/pic-read.scm b/src/6001/pic-read.scm
index ee5b2c3c4c4a74f4208cd297de82cb013233308b..635312b93de495dd9ced4682137e2b30ca189ba0 100644 (file)
--- a/src/6001/pic-read.scm
+++ b/src/6001/pic-read.scm
@@ -56,7 +56,7 @@ USA.
   (let ((delimiters (char-set #\newline)))
     (lambda (port)
       (let loop ()
-       (let ((line (read-string delimiters port)))
+       (let ((line (read-delimited-string delimiters port)))
          (if (eof-object? line)
              (error "EOF encountered when parsing line."))
          (read-char port)

diff --git a/src/edwin/malias.scm b/src/edwin/malias.scm
index 16da88edcbaa83289d413d8183ca88df65398aad..79fa9e9efd7355e6c102a30a3dc8611e8f02f3af 100644 (file)
--- a/src/edwin/malias.scm
+++ b/src/edwin/malias.scm
@@ -140,7 +140,7 @@ USA.
              '()))))))
 
 (define (read-mailrc-line port)
-  (let ((line (read-string char-set:newline port)))
+  (let ((line (read-delimited-string char-set:newline port)))
     (and (not (eof-object? line))
         (begin
           (read-char port)

diff --git a/src/edwin/unix.scm b/src/edwin/unix.scm
index 298a8bfd7b6701469054144cc35a818844444ffd..5d9b3fe25c665d1b0c55ce0e4cce32536c0f7a4b 100644 (file)
--- a/src/edwin/unix.scm
+++ b/src/edwin/unix.scm
@@ -636,7 +636,8 @@ option, instead taking -P <filename>."
                 (list "-p"
                       (call-with-input-file (cadr password)
                         (lambda (port)
-                          (read-string (char-set #\newline) port))))))
+                          (read-delimited-string (char-set #\newline)
+                                                 port))))))
               (else
                (error "Illegal password:" password))))))
 \f

diff --git a/src/edwin/webster.scm b/src/edwin/webster.scm
index bb894c7ddd7f3df594693cb4064ffedd392ac7f7..f89e570d7719d95ec7b15815c167a9c38e4298ad 100644 (file)
--- a/src/edwin/webster.scm
+++ b/src/edwin/webster.scm
@@ -60,7 +60,7 @@ USA.
           (error "Unrecognized response from Webster server:" line)))))
 
 (define (webster-read-line port)
-  (let ((line (read-string webster-line-delimiters port)))
+  (let ((line (read-delimited-string webster-line-delimiters port)))
     (values line
            (let ((delim (read-char port)))
              (or (eof-object? delim)

diff --git a/src/imail/imail-rmail.scm b/src/imail/imail-rmail.scm
index 98fdad6fdc99734c1c2976a3360078d2534872b7..ee1eb20473c7aaf0b91197b2ea7764035ff306ee 100644 (file)
--- a/src/imail/imail-rmail.scm
+++ b/src/imail/imail-rmail.scm
@@ -361,7 +361,7 @@ USA.
         (read-required-line port)))))
 
 (define (read-to-eom port)
-  (let ((string (read-string rmail-message:end-char-set port)))
+  (let ((string (read-delimited-string rmail-message:end-char-set port)))
     (if (or (eof-object? string)
            (eof-object? (read-char port)))
        (error "EOF while reading RMAIL message body:" port))

diff --git a/src/imail/imap-response.scm b/src/imail/imap-response.scm
index 87ec74ce52ef1765a46cae58151a6b27658a6000..9726fa1cea9fa86d01826f6f38d23167db770cc4 100644 (file)
--- a/src/imail/imap-response.scm
+++ b/src/imail/imap-response.scm
@@ -543,7 +543,7 @@ USA.
     char))
 
 (define (read-string-internal delimiters port)
-  (let ((s (read-string delimiters port)))
+  (let ((s (read-delimited-string delimiters port)))
     (if (and (not (eof-object? s))
              imap-transcript-port)
        (write-string s imap-transcript-port))

diff --git a/src/runtime/dosproc.scm b/src/runtime/dosproc.scm
index 7f3c7f7ce6f3525ad5b8eb1174863199883cebc3..a304269f8f6e5cab87c859c2fab4362012821455 100644 (file)
--- a/src/runtime/dosproc.scm
+++ b/src/runtime/dosproc.scm
@@ -55,7 +55,7 @@ USA.
                        (output-port-channel port*)))))))
             (call-with-input-file fname
               (lambda (input)
-                (let ((string (read-string (char-set) input)))
+                (let ((string (read-delimited-string (char-set) input)))
                   (if (not (eof-object? string))
                       (write-string string
                                     port)))))
@@ -66,7 +66,7 @@ USA.
         (lambda (fname)
           (call-with-output-file fname
             (lambda (output)
-              (write-string (read-string (char-set) port)
+              (write-string (read-delimited-string (char-set) port)
                             output)))
           (call-with-input-file fname
             (lambda (port*)