* cygheap.h (struct init_cygheap): Add mt_h member.

	* fhandler_tape.cc (mt_h): Drop in favor of cygheap based handle.
	(mtinfo_init): Use cygheap->mt_h handle.  Protect it.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2d6d838..3fd05d9 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-12  Corinna Vinschen  <corinna@vinschen.de>
+
+       * cygheap.h (struct init_cygheap): Add mt_h member.
+       * fhandler_tape.cc (mt_h): Drop in favor of cygheap based handle.
+       (mtinfo_init): Use cygheap->mt_h handle.  Protect it.
+
 2004-05-12  Pierre Humblet <pierre.humblet@ieee.org>
 
        * tty.h: Remove the %d or %x from all cygtty strings.
@@ -13,7 +19,7 @@
        (tty::open_input_mutex): Ditto.
        (tty::open_mutex): New method.
 
-2004-05-10  Corinna Vinschen  <corinna@vinschen.de>
+2004-05-11  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler.cc (fhandler_base::open): Set file attributes to correct
        value when creating files.

diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
index 8d065fe..a32e0d5 100644 (file)
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/cygheap.h
@@ -253,6 +253,7 @@ struct init_cygheap
   mode_t umask;
   HANDLE shared_h;
   HANDLE console_h;
+  HANDLE mt_h;
   char *cygwin_regname;
   cwdstuff cwd;
   dtable fdtab;

diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc
index 1309b3b..a8d0f32 100644 (file)
--- a/winsup/cygwin/fhandler_tape.cc
+++ b/winsup/cygwin/fhandler_tape.cc
@@ -1169,13 +1169,13 @@ mtinfo::initialize (void)
     }
 }
 
-HANDLE mt_h;
 mtinfo *mt;
 
 void __stdcall
 mtinfo_init ()
 {
-  mt = (mtinfo *) open_shared ("mtinfo", MTINFO_VERSION, mt_h, sizeof (mtinfo), SH_MTINFO);
+  mt = (mtinfo *) open_shared ("mtinfo", MTINFO_VERSION, cygheap->mt_h, sizeof (mtinfo), SH_MTINFO);
+  ProtectHandleINH (cygheap->mt_h);
   mt->initialize ();
 }