d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The kernel specified in main() of reboot(8) will be initialized

Browse Source 
with -k option and never be used without kflag.  This confuses
gcc because we set "kflag" at the same time with "kernel", but
the logic is not that apparant for gcc.

Since we can initialize "kernel" to NULL then know if "k" option
is set through determining whether it is still NULL, don't try
to have gcc to guess why we are connecting "kflag" with "kernel"
and use "kernel" directly in place of kflag.

Bump WARNS?= from 2 to 6
This commit is contained in:
Xin LI 2005-01-25 08:14:00 +00:00
parent f93ad95f27
commit faa0ecdd5d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sbin/reboot/Makefile
View File

@ -2,6 +2,7 @@
# $FreeBSD$
PROG= reboot
WARNS?= 6
DPADD= ${LIBUTIL}
LDADD= -lutil
MAN= reboot.8 boot_i386.8 nextboot.8

9
sbin/reboot/reboot.c
View File

@ -65,9 +65,9 @@ int
main(int argc, char *argv[])
{
struct passwd *pw;
int ch, howto, i, fd, kflag, lflag, nflag, qflag, pflag, sverrno;
int ch, howto, i, fd, lflag, nflag, qflag, pflag, sverrno;
u_int pageins;
char *kernel, *p;
char *kernel = NULL, *p;
const char *user;
if (strstr((p = rindex(*argv, '/')) ? p + 1 : *argv, "halt")) {
@ -75,14 +75,13 @@ main(int argc, char *argv[])
howto = RB_HALT;
} else
howto = 0;
kflag = lflag = nflag = qflag = 0;
lflag = nflag = qflag = 0;
while ((ch = getopt(argc, argv, "dk:lnpq")) != -1)
switch(ch) {
case 'd':
howto |= RB_DUMP;
break;
case 'k':
kflag = 1;
kernel = optarg;
break;
case 'l':
@ -118,7 +117,7 @@ main(int argc, char *argv[])
err(1, NULL);
}
if (kflag) {
if (kernel != NULL) {
fd = open("/boot/nextboot.conf", O_WRONLY | O_CREAT, 0444);
if (fd > -1) {
(void)write(fd, "nextboot_enable=\"YES\"\n", 22);