From db2604ad2a5a7c9aed318f7600cb0169cacf71c3 Mon Sep 17 00:00:00 2001
From: Abdulaziz Ghuloum <aghuloum@cs.indiana.edu>
Date: Wed, 29 Oct 2008 14:10:24 -0400
Subject: [PATCH] open-file-input-port and open-file-output-port now signal an
 error when file-options are not enum-sets.

---
 scheme/ikarus.io.ss  | 22 ++++++++++++++--------
 scheme/last-revision |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/scheme/ikarus.io.ss b/scheme/ikarus.io.ss
index 2a74fe1..06103cf 100644
--- a/scheme/ikarus.io.ss
+++ b/scheme/ikarus.io.ss
@@ -1491,7 +1491,10 @@
         (if (enum-set-member? 'no-create x)   1 0)
         (if (enum-set-member? 'no-fail x)     2 0)
         (if (enum-set-member? 'no-truncate x) 4 0)))
-    (let ([opt (opt->num file-options)])
+    (let ([opt (if (enum-set? file-options)
+                   (opt->num file-options)
+                   (die who "file-options is not an enum set" 
+                        file-options))])
       (let ([fh (foreign-call "ikrt_open_output_fd"
                    (string->utf8 filename)
                    opt)])
@@ -1503,24 +1506,27 @@
     (case-lambda
       [(filename) 
        (open-file-input-port filename (file-options) 'block #f)]
-      [(filename file-options) 
+      [(filename file-options)
        (open-file-input-port filename file-options 'block #f)]
-      [(filename file-options buffer-mode) 
+      [(filename file-options buffer-mode)
        (open-file-input-port filename file-options buffer-mode #f)]
       [(filename file-options buffer-mode transcoder)
+       (define who 'open-file-input-port)
        (unless (string? filename)
-         (die 'open-file-input-port "invalid filename" filename))
-       (unless (or (not transcoder) (transcoder? transcoder)) 
-         (die 'open-file-input-port "invalid transcoder" transcoder))
+         (die who "invalid filename" filename))
+       (unless (enum-set? file-options)
+         (die who "file-options is not an enum set" file-options))
+       (unless (or (not transcoder) (transcoder? transcoder))
+         (die who "invalid transcoder" transcoder))
        ; FIXME: file-options ignored
        ; FIXME: buffer-mode ignored
        (fh->input-port 
-         (open-input-file-handle filename 'open-file-input-port)
+         (open-input-file-handle filename who)
          filename
          input-file-buffer-size
          transcoder
          #t
-         'open-file-input-port)]))
+         who)]))
  
   (define open-file-output-port
     (case-lambda
diff --git a/scheme/last-revision b/scheme/last-revision
index b2dffb7..3f894f7 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1652
+1653