Change initialization sequence so that OS/2 can start up its console

window before the first `outf' call occurs.

diff --git a/v7/src/microcode/boot.c b/v7/src/microcode/boot.c
index 3092b15d292b3e23eb982ae9150ac266adba14b2..5a676e915cf92a89078d86fafe48a580f871a802 100644 (file)
--- a/v7/src/microcode/boot.c
+++ b/v7/src/microcode/boot.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: boot.c,v 9.91 1994/11/28 03:49:45 cph Exp $
+$Id: boot.c,v 9.92 1994/12/02 20:38:40 cph Exp $
 
 Copyright (c) 1988-94 Massachusetts Institute of Technology
 
@@ -51,6 +51,7 @@ extern void EXFUN (Clear_Memory, (int, int, int));
 extern void EXFUN (Setup_Memory, (int, int, int));
 extern void EXFUN (compiler_initialize, (long fasl_p));
 extern SCHEME_OBJECT EXFUN (make_primitive, (char *, int));
+extern void EXFUN (OS_announcement, (void));
 \f
 static void EXFUN (Start_Scheme, (int, CONST char *));
 static void EXFUN (Enter_Interpreter, (void));
@@ -383,12 +384,14 @@ DEFUN (Start_Scheme, (Start_Prim, File_Name),
   /* fast long i; */
   /* Parallel processor test */
   Boolean I_Am_Master = (Start_Prim != BOOT_GET_WORK);
+  OS_initialize ();
   if (I_Am_Master)
     {
       outf_console ("Scheme Microcode Version %d.%d\n",  VERSION, SUBVERSION);
+      outf_console ("MIT Scheme running under %s\n", OS_Variant);
+      OS_announcement ();
       outf_flush_console ();
     }
-  OS_initialize ();
   if (I_Am_Master)
   {
     Current_State_Point = SHARP_F;

diff --git a/v7/src/microcode/dostop.c b/v7/src/microcode/dostop.c
index 08b1b2afb074a71c5bcc817359ad363d34b1e37c..b9beb66950498757e0f9795cdd1ff20a375087e0 100644 (file)
--- a/v7/src/microcode/dostop.c
+++ b/v7/src/microcode/dostop.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: dostop.c,v 1.10 1994/11/28 03:50:47 cph Exp $
+$Id: dostop.c,v 1.11 1994/12/02 20:39:36 cph Exp $
 
 Copyright (c) 1992-94 Massachusetts Institute of Technology
 
@@ -89,21 +89,24 @@ DEFUN_VOID (OS_initialize)
   DOS_initialize_conio();
   DOS_initialize_real_mode ();
   OS_Name = SYSTEM_NAME;
-  OS_Variant = SYSTEM_VARIANT;
-
-  { version_t version_number;
-
+  {
+    version_t version_number;
     dos_get_version(&version_number);
-    fprintf (stdout, "MIT Scheme running under %s %d.%d 386/486\n",
-                    OS_Variant,
-                    (int) version_number.major, (int) version_number.minor);
-    /* To make our compiler vendors happy. */             
-    fprintf(stdout,
-           "Copyright (c) 1992-1993 Massachusetts Institute of Technology\n");
+    OS_Variant = (malloc ((strlen (SYSTEM_VARIANT)) + 19));
+    sprintf (((char *) OS_Variant), "%s %d.%d 386/486",
+            SYSTEM_VARIANT,
+            (int) version_number.major,
+            (int) version_number.minor);
   }
+}
 
+void
+DEFUN_VOID (OS_announcement)
+{
+  /* To make our compiler vendors happy. */               
+  fprintf(stdout,
+         "Copyright (c) 1992-1994 Massachusetts Institute of Technology\n");
   fputs ("", stdout);
-  fflush (stdout);
 }
 
 void

diff --git a/v7/src/microcode/nttop.c b/v7/src/microcode/nttop.c
index 0f4ac5aa002bf5b186632948d0ac1ca72d925c26..639b1749912420c7b61fca92d38ff5bd39b14515 100644 (file)
--- a/v7/src/microcode/nttop.c
+++ b/v7/src/microcode/nttop.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: nttop.c,v 1.13 1994/11/28 03:50:32 cph Exp $
+$Id: nttop.c,v 1.14 1994/12/02 20:39:16 cph Exp $
 
 Copyright (c) 1993-94 Massachusetts Institute of Technology
 
@@ -81,28 +81,27 @@ DEFUN_VOID (OS_initialize)
   NT_initialize_directory_reader ();
 
   OS_Name = SYSTEM_NAME;
-  OS_Variant = SYSTEM_VARIANT;
-
   {
     version_t version_number;
+    const char * variant;
 
     nt_get_version (&version_number);
-    OS_Variant = ((version_number.platform == 0)
-                 ? "Windows-NT"
-                 : "MS Windows");
-
-    outf_console ("MIT Scheme running under %s %d.%d 386/486\n",
-                 OS_Variant,
-                 ((int) version_number.major),
-                 ((int) version_number.minor));
-    /* To make our compiler vendors happy. */
-    outf_console
-      ("Copyright (c) 1993 Massachusetts Institute of Technology\n");
+    variant = ((version_number.platform == 0) ? "Windows-NT" : "MS Windows");
+    OS_Variant = (malloc ((strlen (variant)) + 19));
+    sprintf (OS_Variant, "MIT Scheme running under %s %d.%d 386/486\n",
+            variant,
+            ((int) version_number.major),
+            ((int) version_number.minor));
   }
+}
 
+void
+DEFUN_VOID (OS_announcement)
+{
+  /* To make our compiler vendors happy. */
+  outf_console
+    ("Copyright (c) 1993-1994 Massachusetts Institute of Technology\n");
   outf_console ("\n");
-  outf_flush_console ();
-  return;
 }
 
 void

diff --git a/v7/src/microcode/uxtop.c b/v7/src/microcode/uxtop.c
index d1af792dd399009731089a4e1c1af05a140f0935..c1baa53d19445ded0f004ecd4cc207835f6303b3 100644 (file)
--- a/v7/src/microcode/uxtop.c
+++ b/v7/src/microcode/uxtop.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxtop.c,v 1.15 1994/11/28 03:51:01 cph Exp $
+$Id: uxtop.c,v 1.16 1994/12/02 20:38:54 cph Exp $
 
 Copyright (c) 1990-94 Massachusetts Institute of Technology
 
@@ -106,19 +106,21 @@ DEFUN_VOID (OS_initialize)
   UX_initialize_directory_reader ();
   OS_Name = SYSTEM_NAME;
   OS_Variant = SYSTEM_VARIANT;
-  fprintf (stdout, "MIT Scheme running under %s\n", OS_Variant);
-  if ((!option_emacs_subprocess) && (OS_ctty_interrupt_control ()))
-    {
-      fputs ("", stdout);
-      fprintf (stdout, "Type %s followed by `H' to obtain information about interrupts.\n",
-              (char_description ((OS_ctty_quit_char ()), 1)));
-    }
-  fflush (stdout);
 #ifdef _SUNOS
   vadvise (VA_ANOM);           /* Anomolous paging, don't try to guess. */
 #endif
 }
 
+void
+DEFUN_VOID (OS_announcement)
+{
+  if ((!option_emacs_subprocess) && (OS_ctty_interrupt_control ()))
+    fprintf
+      (stdout,
+       "Type %s followed by `H' to obtain information about interrupts.\n",
+       (char_description ((OS_ctty_quit_char ()), 1)));
+}
+
 void
 DEFUN_VOID (OS_reset)
 {