1 files changed, 45 insertions, 25 deletions

diff --git a/proc/main.c b/proc/main.c
index 1292cea0..f2cdfdf5 100644
--- a/proc/main.c
+++ b/proc/main.c
@@ -1,5 +1,5 @@
 /* Initialization of the proc server
-   Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation
+   Copyright (C) 1993,94,95,96,97,99,2000,01 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -23,11 +23,16 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <hurd/hurd_types.h>
 #include <hurd.h>
 #include <hurd/startup.h>
+#include <device/device.h>
 #include <assert.h>
-#include <wire.h>
+#include <argp.h>
+#include <error.h>
+#include <version.h>
 
 #include "proc.h"
 
+const char *argp_program_version = STANDARD_HURD_VERSION (proc);
+
 int
 message_demuxer (mach_msg_header_t *inp,
 		 mach_msg_header_t *outp)
@@ -56,64 +61,79 @@ main (int argc, char **argv, char **envp)
   mach_port_t pset, psetcntl;
   void *genport;
   process_t startup_port;
-  volatile int hold = 0;
-  
-  while (hold);
-  
+  struct argp argp = { 0, 0, 0, "Hurd process server" };
+
+  argp_parse (&argp, argc, argv, 0, 0, 0);
 
   initialize_version_info ();
 
-  task_get_bootstrap_port (mach_task_self (), &boot);
+  err = task_get_bootstrap_port (mach_task_self (), &boot);
+  assert_perror (err);
+  if (boot == MACH_PORT_NULL)
+    error (2, 0, "proc server can only be run by init during boot");
 
   proc_bucket = ports_create_bucket ();
   proc_class = ports_create_class (0, 0);
   generic_port_class = ports_create_class (0, 0);
   exc_class = ports_create_class (exc_clean, 0);
-  ports_create_port (generic_port_class, proc_bucket, 
+  ports_create_port (generic_port_class, proc_bucket,
 		     sizeof (struct port_info), &genport);
   generic_port = ports_get_right (genport);
 
-  /* new_proc depends on these assignments which must occur in this order. */
-  self_proc = new_proc (mach_task_self ()); /* proc 0 is the procserver */
-  startup_proc = new_proc (MACH_PORT_NULL); /* proc 1 is init */
+  /* Create the initial proc object for init (PID 1).  */
+  startup_proc = create_startup_proc ();
+
+  /* Create our own proc object (we are PID 0).  */
+  self_proc = allocate_proc (mach_task_self ());
+  assert (self_proc);
+
+  complete_proc (self_proc, 0);
 
-  startup_port = ports_get_right (startup_proc);
-  mach_port_insert_right (mach_task_self (), startup_port,
-			  startup_port, MACH_MSG_TYPE_MAKE_SEND);
+  startup_port = ports_get_send_right (startup_proc);
   err = startup_procinit (boot, startup_port, &startup_proc->p_task,
 			  &authserver, &master_host_port, &master_device_port);
-  assert (!err);
+  assert_perror (err);
   mach_port_deallocate (mach_task_self (), startup_port);
 
   mach_port_mod_refs (mach_task_self (), authserver, MACH_PORT_RIGHT_SEND, 1);
   _hurd_port_set (&_hurd_ports[INIT_PORT_AUTH], authserver);
   mach_port_deallocate (mach_task_self (), boot);
 
-  add_proc_to_hash (self_proc);
-  add_proc_to_hash (startup_proc);
+  proc_death_notify (startup_proc);
+  add_proc_to_hash (startup_proc); /* Now that we have the task port.  */
 
   /* Set our own argv and envp locations.  */
-  self_proc->p_argv = (int) argv;
-  self_proc->p_envp = (int) envp;
+  self_proc->p_argv = (vm_address_t) argv;
+  self_proc->p_envp = (vm_address_t) envp;
 
   /* Give ourselves good scheduling performance, because we are so
      important. */
   err = thread_get_assignment (mach_thread_self (), &pset);
-  assert (!err);
+  assert_perror (err);
   err = host_processor_set_priv (master_host_port, pset, &psetcntl);
-  assert (!err);
+  assert_perror (err);
   thread_max_priority (mach_thread_self (), psetcntl, 0);
-  assert (!err);
+  assert_perror (err);
   err = task_priority (mach_task_self (), 2, 1);
-  assert (!err);
+  assert_perror (err);
 
   mach_port_deallocate (mach_task_self (), pset);
   mach_port_deallocate (mach_task_self (), psetcntl);
 
-/*  wire_task_self (); */
+  {
+    /* Get our stderr set up to print on the console, in case we have
+       to panic or something.  */
+    mach_port_t cons;
+    error_t err;
+    err = device_open (master_device_port, D_READ|D_WRITE, "console", &cons);
+    assert_perror (err);
+    stdin = mach_open_devstream (cons, "r");
+    stdout = stderr = mach_open_devstream (cons, "w");
+    mach_port_deallocate (mach_task_self (), cons);
+  }
 
   while (1)
     ports_manage_port_operations_multithread (proc_bucket,
 					      message_demuxer,
-					      0, 0, 0, 0);
+					      0, 0, 0);
 }