guile/guile-core/guile-readline ChangeLog readl...

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  01/01/25 09:57:29

Modified files:
        guile-core/guile-readline: ChangeLog readline.scm 

Log message:
        * Make sure that only open file ports are used as readline ports.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/guile-readline/ChangeLog.diff?r1=1.47&r2=1.48
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/guile-readline/readline.scm.diff?r1=1.8&r2=1.9

Patches:
Index: guile/guile-core/guile-readline/ChangeLog
diff -u guile/guile-core/guile-readline/ChangeLog:1.47 
guile/guile-core/guile-readline/ChangeLog:1.48
--- guile/guile-core/guile-readline/ChangeLog:1.47      Fri Jan 19 01:00:05 2001
+++ guile/guile-core/guile-readline/ChangeLog   Thu Jan 25 09:57:29 2001
@@ -1,3 +1,10 @@
+2001-01-25  Dirk Herrmann  <address@hidden>
+
+       * readline.scm (set-readline-input-port!,
+       set-readline-output-port!):  Make sure that only valid port
+       parameters are passed.  Thanks to Martin Grabmueller for sending
+       a patch that formed the basis for this change.
+
 2001-01-18  Neil Jerram  <address@hidden>
 
        * readline.scm (make-readline-port): Make readline port
Index: guile/guile-core/guile-readline/readline.scm
diff -u guile/guile-core/guile-readline/readline.scm:1.8 
guile/guile-core/guile-readline/readline.scm:1.9
--- guile/guile-core/guile-readline/readline.scm:1.8    Fri Jan 19 01:00:05 2001
+++ guile/guile-core/guile-readline/readline.scm        Thu Jan 25 09:57:29 2001
@@ -140,10 +140,24 @@
       (set! prompt2 (car rest))))
 
 (define-public (set-readline-input-port! p)
-  (set! input-port p))
+  (cond ((or (not (file-port? p)) (not (input-port? p)))
+        (scm-error 'wrong-type-arg "set-readline-input-port!"
+                   "Not a file input port: ~S" (list p) #f))
+       ((port-closed? p)
+        (scm-error 'misc-error "set-readline-input-port!"
+                   "Port not open: ~S" (list p) #f))
+       (else
+        (set! input-port p))))
 
 (define-public (set-readline-output-port! p)
-  (set! output-port p))
+  (cond ((or (not (file-port? p)) (not (output-port? p)))
+        (scm-error 'wrong-type-arg "set-readline-input-port!"
+                   "Not a file output port: ~S" (list p) #f))
+       ((port-closed? p)
+        (scm-error 'misc-error "set-readline-output-port!"
+                   "Port not open: ~S" (list p) #f))
+       (else
+        (set! output-port p))))
 
 (define-public (set-readline-read-hook! h)
   (set! read-hook h))