From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 12 Jan 2017 09:30:15 +0000 (-0800)
Subject: Update calls of read-string to read-delimited-string.
X-Git-Tag: mit-scheme-pucked-9.2.12~227^2~140
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=84e9e378543138a0e23e59ba33aab6516692a6cb;p=mit-scheme.git

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

diff --git a/src/6001/pic-read.scm b/src/6001/pic-read.scm
index ee5b2c3c4..635312b93 100644
--- 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 16da88edc..79fa9e9ef 100644
--- 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 298a8bfd7..5d9b3fe25 100644
--- 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))))))
 
diff --git a/src/edwin/webster.scm b/src/edwin/webster.scm
index bb894c7dd..f89e570d7 100644
--- 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 98fdad6fd..ee1eb2047 100644
--- 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 87ec74ce5..9726fa1ce 100644
--- 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 7f3c7f7ce..a304269f8 100644
--- 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*)