From owner-p4-projects@FreeBSD.ORG  Thu Apr 15 11:13:21 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7914C16A4D0; Thu, 15 Apr 2004 11:13:21 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4C49316A4CE
	for <perforce@freebsd.org>; Thu, 15 Apr 2004 11:13:21 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4482A43D39
	for <perforce@freebsd.org>; Thu, 15 Apr 2004 11:13:21 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3FIDLGe059786
	for <perforce@freebsd.org>; Thu, 15 Apr 2004 11:13:21 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3FIDKEb059783
	for perforce@freebsd.org; Thu, 15 Apr 2004 11:13:20 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Date: Thu, 15 Apr 2004 11:13:20 -0700 (PDT)
Message-Id: <200404151813.i3FIDKEb059783@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 51116 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Apr 2004 18:13:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=51116

Change 51116 by areisse@areisse_ibook on 2004/04/15 11:12:29

	initialize some memory
	determine the root directory properly

Affected files ...

.. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/main.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/main.c#5 (text+ko) ====

@@ -116,7 +116,6 @@
   Main(ciPtr);
 }
 
-
 static void Main(ClientInterfacePtr ciPtr)
 {
   long ret;
@@ -459,7 +458,7 @@
     sKey = 0;
     vKey = 0;
   }
-  
+
   // if 'cmd-s' or 'cmd-v' was pressed do a text boot.
   if (sKey || vKey) graphicsBoot = 0;
   
@@ -523,7 +522,7 @@
       }
     }
   }
-  
+
   // Add any pressed keys (s, v, shift) to the command line
   keyPos = 0;
   if (sKey || vKey || (gBootMode & kBootModeSafe)) {
@@ -620,6 +619,7 @@
     prevname = propname;
     if (!strncmp (propname, "load_", 5)) {
       char pfilename[255];
+      memset (pfilename, 0, 255);
       size = GetProp(gOptionsPH, propname, pfilename, 255);
 
       if (size > 0 && strlen(propname+4) < sizeof(int) * 4) {
@@ -1041,6 +1041,7 @@
     strcpy(gExtensionsSpec + cnt, "System\\Library\\");
   }
 
+  strcpy (gRootDir, gExtensionsSpec);
   SetProp(gChosenPH, "rootpath", gBootFile, strlen(gBootFile) + 1);
   
   gBootSourceNumber++;