From 8e7cfa8a006ba1e1616d8f88767666e4dda96de2 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Fri, 17 Aug 2001 04:48:03 +0000
Subject: 2001-08-16  Roland McGrath  <roland@frob.com>

	* Makefile (OBJS): Add userland-boot.o here.
	Add a vpath to find userland-boot.c in boot/ too.
	* bootstrap.c (parse_script): Pass new arg to boot_script_parse_line.
	* load.c: Include <stddef.h> before "boot_script.h".
---
 serverboot/Makefile    | 11 +++++++----
 serverboot/bootstrap.c |  2 +-
 serverboot/load.c      |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'serverboot')

diff --git a/serverboot/Makefile b/serverboot/Makefile
index b274717e..b6b16c99 100644
--- a/serverboot/Makefile
+++ b/serverboot/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1997,99,2001 Free Software Foundation, Inc.
 # This file is part of the GNU Hurd.
 #
 # The GNU Hurd is free software; you can redistribute it and/or modify
@@ -30,11 +30,14 @@ HURDLIBS = threads
 installationdir = $(prefix)/boot
 
 UNZIP_OBJS = unzip.o inflate.o util.o do-bunzip2.o
-OBJS = $(subst .c,.o,$(SRCS)) boot_script.o memory_objectServer.o \
-	default_pagerServer.o excServer.o bootstrapServer.o \
-	memory_object_defaultServer.o $(UNZIP_OBJS)
+OBJS = $(subst .c,.o,$(SRCS)) \
+       boot_script.o userland-boot.o \
+       memory_objectServer.o \
+       default_pagerServer.o excServer.o bootstrapServer.o \
+       memory_object_defaultServer.o $(UNZIP_OBJS)
 
 vpath boot_script.c $(srcdir)/../boot
+vpath userland-boot.c $(srcdir)/../boot
 
 # Look for zip stuff
 VPATH += $(srcdir)/../exec
diff --git a/serverboot/bootstrap.c b/serverboot/bootstrap.c
index 46935a26..3d298a5a 100644
--- a/serverboot/bootstrap.c
+++ b/serverboot/bootstrap.c
@@ -474,7 +474,7 @@ parse_script (struct file *f)
       while (p < buf + f->f_size && *p != '\n')
 	p++;
       *p = '\0';
-      err = boot_script_parse_line (line);
+      err = boot_script_parse_line (0, line);
       if (err)
 	boot_panic (err);
       if (p == buf + f->f_size)
diff --git a/serverboot/load.c b/serverboot/load.c
index 1665868b..21289bf1 100644
--- a/serverboot/load.c
+++ b/serverboot/load.c
@@ -24,6 +24,7 @@
  * the rights to redistribute these changes.
  */
 
+#include <stddef.h>
 #include <assert.h>
 #include <mach/mach_interface.h>
 #include <varargs.h>
@@ -237,7 +238,8 @@ mach_port_t boot_script_read_file (const char *file)
 { return MACH_PORT_NULL; }	/* XXX */
 
 int
-boot_script_exec_cmd (task_t user_task,
+boot_script_exec_cmd (void *hook,
+		      task_t user_task,
 		      char *file_name,
 		      int arg_count, char **argv,
 		      char *argstrings, int argslen)
-- 
cgit v1.2.3