2001-04-18 Jeff Johnston <jjohnstn@redhat.com>

        * gloss.cxx (gloss32::reset): Move check for std streams into
        hostops::close.
        * hostops.cxx (hostops::close): Don't close host std streams.

diff --git a/sid/component/gloss/ChangeLog b/sid/component/gloss/ChangeLog
index 93786da..7ddd944 100644 (file)
--- a/sid/component/gloss/ChangeLog
+++ b/sid/component/gloss/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * gloss.cxx (gloss32::reset): Move check for std streams into
+        hostops::close.
+        * hostops.cxx (hostops::close): Don't close host std streams.
+
 2001-01-26  Nicholas Duffek  <nsd@redhat.com>
 
        * gloss.cxx (gloss32::do_sys_exit): Pass exit value in bits 8..15

diff --git a/sid/component/gloss/gloss.cxx b/sid/component/gloss/gloss.cxx
index 3215618..a633ff3 100644 (file)
--- a/sid/component/gloss/gloss.cxx
+++ b/sid/component/gloss/gloss.cxx
@@ -95,9 +95,8 @@ gloss32::reset()
       for (int i = 0; i < max_fds; ++i)
        {
          int errcode;
-         if (fd_table[i] > 2)
-           if (! host_ops->close (fd_table[i], errcode))
-             cerr << "*** While resetting, close("
+         if (! host_ops->close (fd_table[i], errcode))
+           cerr << "*** While resetting, close("
                   << fd_table[i]
                   << ") unexpectedly failed." << endl;
        }

diff --git a/sid/component/gloss/hostops.cxx b/sid/component/gloss/hostops.cxx
index 20693f1..917ade0 100644 (file)
--- a/sid/component/gloss/hostops.cxx
+++ b/sid/component/gloss/hostops.cxx
@@ -94,10 +94,14 @@ hostops::open (const char* filename, int flags, int mode, int& result_fd, int& e
 bool
 hostops::close (int fd, int& errcode)
 {
-  if (::close (fd) < 0)
-    {
-      errcode = errno;
-      return false;
+  /* don't close the host's stdin, stdout, and stderr */
+  if (fd > 2)
+    {  
+      if (::close (fd) < 0)
+        {
+          errcode = errno;
+          return false;
+        }
     }
   return true;
 }