Very basic operations now work; need to handle line-oriented

versus character-oriented input

1 files changed, 7 insertions, 8 deletions

diff --git a/com32/lib/sys/close.c b/com32/lib/sys/close.c
index b81d77ef..7af7ff13 100644
--- a/com32/lib/sys/close.c
+++ b/com32/lib/sys/close.c
@@ -37,21 +37,20 @@
 
 int close(int fd)
 {
-  com32sys_t regs;
   struct file_info *fp = &__file_info[fd];
+  int rv = 0;
 
-  if ( fd >= NFILES || fp->blocklg2 == 0 ) {
+  if ( fd >= NFILES || !fp->ops ) {
     errno = EBADF;
     return -1;
   }
 
-  if ( fp->filedes ) {
-    memset(&regs, 0, sizeof regs);
-    regs.eax.w[0] = 0x0008;	/* Close file */
-    regs.esi.w[0] = fp->filedes;
-
-    __com32.cs_intcall(0x22, &regs, NULL);
+  if ( fp->ops->close ) {
+    rv = fp->ops->close(fp);
+    if ( rv )
+      return rv;
   }
 
+  fp->ops = NULL;		/* File structure unused */
   return 0;
 }