2002-06-25 Roland McGrath <roland@frob.com>

	* term.h (struct bottomhalf): New member `fini'.
	* hurdio.c (hurdio_fini): New function.
	(hurdio_bottom): Use it.
	* devio.c (devio_fini): New function.
	(devio_bottom): Use it.
	* ptyio.c (ptyio_bottom): Add 0 entry for `fini'.
	* main.c (trivfs_runtime_argp): New variable.
	(options): Add --name/-N and --type/-T options.
	(parse_opt): Collect parsed options in temporary storage and apply
	them only at final success.  For T_HURDIO, allow absent arg.
	For non-startup parsing call, allow any missing args.
	(tty_type_names): New const variable.
	(trivfs_append_args): New function.
	(main): Open underlying node with O_RDWR.
	* hurdio.c (wait_for_dtr): If tty_arg is null, use termctl->underlying
	instead of opening a node by name.
	(hurdio_desert_dtr): If tty_arg is null, don't deallocate ioport.

1 files changed, 48 insertions, 29 deletions

diff --git a/term/hurdio.c b/term/hurdio.c
index b9afa33d..ce5e169b 100644
--- a/term/hurdio.c
+++ b/term/hurdio.c
@@ -98,6 +98,14 @@ hurdio_init (void)
   return 0;
 }
 
+static error_t
+hurdio_fini (void)
+{
+  hurdio_desert_dtr ();
+  writer_thread = MACH_PORT_NULL;
+  /* XXX destroy reader thread too */
+  return 0;
+}
 
 static error_t
 hurdio_gwinsz (struct winsize *size)
@@ -124,33 +132,40 @@ wait_for_dtr (void)
     hurd_condition_wait (&hurdio_assert_dtr_condition, &global_lock);
   assert_dtr = 0;
 
-  /* Open the file in blocking mode, so that the carrier is
-     established as well.  */
-  ioport = file_name_lookup (tty_arg, O_READ|O_WRITE, 0);
-  if (ioport == MACH_PORT_NULL)
-    report_carrier_error (errno);
+  if (tty_arg == 0)
+    ioport = termctl->underlying;
   else
     {
-      error_t err;
-      struct termios state = termstate;
+      /* Open the file in blocking mode, so that the carrier is
+	 established as well.  */
+      ioport = file_name_lookup (tty_arg, O_READ|O_WRITE, 0);
+      if (ioport == MACH_PORT_NULL)
+	{
+	  report_carrier_error (errno);
+	  return;
+	}
+    }
 
-      /* Assume that we have a full blown terminal initially.  */
-      tioc_caps = ~0;
 
-      /* Set terminal in raw mode etc.  */
-      err = hurdio_set_bits (&state);
-      if (err)
-	report_carrier_error (err);
-      else
-	{
-	  termstate = state;
+  error_t err;
+  struct termios state = termstate;
 
-	  /* Signal that we have a carrier.  */
-	  report_carrier_on ();
+  /* Assume that we have a full blown terminal initially.  */
+  tioc_caps = ~0;
 
-	  /* Signal that the writer thread should resume its work.  */
-	  condition_broadcast (&hurdio_writer_condition);
-	}
+  /* Set terminal in raw mode etc.  */
+  err = hurdio_set_bits (&state);
+  if (err)
+    report_carrier_error (err);
+  else
+    {
+      termstate = state;
+
+      /* Signal that we have a carrier.  */
+      report_carrier_on ();
+
+      /* Signal that the writer thread should resume its work.  */
+      condition_broadcast (&hurdio_writer_condition);
     }
 }
 
@@ -173,7 +188,7 @@ hurdio_reader_loop (any_t arg)
   while (1)
     {
       /* We can only start when the DTR has been asserted.  */
-      while (!ioport)
+      while (ioport == MACH_PORT_NULL)
 	wait_for_dtr ();
       mutex_unlock (&global_lock);
 
@@ -226,9 +241,12 @@ hurdio_writer_loop (any_t arg)
 
   while (1)
     {
-      while (!ioport || !qsize (outputq)
-	     || (termflags & USER_OUTPUT_SUSP))
+      while (writer_thread != MACH_PORT_NULL
+	     && (ioport == MACH_PORT_NULL || !qsize (outputq)
+		 || (termflags & USER_OUTPUT_SUSP)))
 	hurd_condition_wait (&hurdio_writer_condition, &global_lock);
+      if (writer_thread == MACH_PORT_NULL) /* A sign to die.  */
+	return 0;
 
       /* If the output was suspended earlier, we have to tell the
 	 underlying port to resume it.  */
@@ -429,14 +447,14 @@ hurdio_pending_output_size ()
 static error_t
 hurdio_desert_dtr ()
 {
-  if (ioport)
+  if (writer_thread != MACH_PORT_NULL)
+    hurd_thread_cancel (writer_thread);
+  if (reader_thread != MACH_PORT_NULL)
+    hurd_thread_cancel (reader_thread);
+  if (ioport != MACH_PORT_NULL && tty_arg)
     {
       mach_port_deallocate (mach_task_self (), ioport);
       ioport = MACH_PORT_NULL;
-      if (writer_thread != MACH_PORT_NULL)
-	hurd_thread_cancel (writer_thread);
-      if (reader_thread != MACH_PORT_NULL)
-	hurd_thread_cancel (reader_thread);
     }
   /* If we are called after hurdio_assert_dtr before the reader thread
      had a chance to wake up and open the port, we can prevent it from
@@ -597,6 +615,7 @@ const struct bottomhalf hurdio_bottom =
 {
   TERM_ON_HURDIO,
   hurdio_init,
+  hurdio_fini,
   hurdio_gwinsz,
   hurdio_start_output,
   hurdio_set_break,