2001-08-16 Roland McGrath <roland@frob.com>

	* userland-boot.c (boot_script_insert_right): New function.
	* boot_script.h: Declare it.
	* boot_script.c (boot_script_exec): Use that instead of
	mach_port_insert_right.

1 files changed, 5 insertions, 15 deletions

diff --git a/boot/boot_script.c b/boot/boot_script.c
index 205fcce4..75152b3e 100644
--- a/boot/boot_script.c
+++ b/boot/boot_script.c
@@ -2,15 +2,10 @@
 
 /* Written by Shantanu Goel (goel@cs.columbia.edu).  */
 
-#include <mach.h>
+#include <mach/mach_types.h>
 #include <string.h>
 #include "boot_script.h"
 
-/*
-#include <stdio.h>
-#include <stdlib.h>
-*/
-
 
 /* This structure describes a symbol.  */
 struct sym
@@ -576,15 +571,10 @@ boot_script_exec ()
 
 		case VAL_PORT:
 		  /* Insert send right.  */
-		  if ((mach_port_insert_right
-		       (cmd->task, (mach_port_t) arg->val,
-			(mach_port_t) arg->val, MACH_MSG_TYPE_COPY_SEND)))
-		    {
-		      printf ("(bootstrap): %s: Cannot insert port right %d\n",
-			      cmd->path, arg->val);
-		      error = BOOT_SCRIPT_MACH_ERROR;
-		      goto done;
-		    }
+		  error = boot_script_insert_right (cmd,
+						    (mach_port_t) arg->val);
+		  if (error)
+		    goto done;
 
 		  i = arg->val;
 		  p = buf + sizeof (buf);