Date: Thu, 15 Apr 2004 11:13:20 -0700 (PDT) From: Andrew Reisse <areisse@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 51116 for review Message-ID: <200404151813.i3FIDKEb059783@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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++;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404151813.i3FIDKEb059783>