Add rcsid. Remove unused #includes. Use err(3) and check spelling. Reorganize

man page.

2 files changed, 79 insertions, 94 deletions

diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index 4d7da18..d7946e1 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -1,40 +1,31 @@
-.\"	$Id: nextboot.8,v 1.6 1997/02/22 14:32:31 peter Exp $
+.\"	$Id: nextboot.8,v 1.7 1997/04/23 04:46:38 danny Exp $
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
 .Sh NAME
 .Nm nextboot
-.Nd Install a default bootstring block on the boot disk
+.Nd install a default bootstring block on the boot disk
 .Sh SYNOPSIS
-.Nm
+.Nm nextboot
 .Op Fl b
-.Ar filename bootstring ...
-.Pp
-.Nm
+.Ar filename bootstring
+.Ar
+.Nm nextboot
 .Op Fl ed
 .Ar filename
-.Bl -tag -width time
-.It Fl b
-Is used for bootstrapping (initially configuring) the nameblock. Without
-this, 
-.Nm
-will refuse to write to a block that does not already contain the magic
-number.
-.It Fl d
-temporarily disables an existing name block by changing a bit
-in the magic number.
-.It Fl e
-restores the good magic number on a block disabled by -d.
-.El
-.Sh PROLOGUE
-The FreeBSD program
+.Sh DESCRIPTION
+The
+.Bx Free
+program
 .Nm
 controls the actions of the boot blocks at the time of the next boot.
 If compiled with the correct option,
 the boot blocks will check the nameblock for a magic number and a 
 default name to use for booting. If compiled to do so they will also 
 delete the name from the block, ensuring that if the boot should fail,
-then it will not be tried again. It is the job of /etc/rc to use 
+then it will not be tried again. It is the job of
+.Pa /etc/rc
+to use 
 .Nm
 to re-install the string if that boot is found to have succeeded.
 This allows a one-time only boot string to be used for such applications
@@ -42,8 +33,29 @@ as remote debugging, and installation of new, untrusted kernels.
 The nameblock is defined at compile time to be the second physical block
 on the disk.
 .Pp
-.Sh DESCRIPTION
+The following options are available:
+.Bl -tag -width indent
+.It Fl b
+Is used for bootstrapping (initially configuring) the nameblock. Without
+this, 
 .Nm
+will refuse to write to a block that does not already contain the magic
+number.
+.It Fl d
+Disable (temporarily) an existing name block by changing a bit
+in the magic number.
+.It Fl e
+Restore the good magic number on a block disabled by
+.Fl d .
+.El
+.Pp
+The
+.Fl e
+and
+.Fl d
+flags are mutually exclusive.
+.Sh DESCRIPTION
+.Nm Nextboot
 first checks that the disk has an fdisk table and checks that none of the 
 partitions defined in that table include the nameblock. If the name block is 
 shown to be unused, it will install the bootstrings given as arguments,
@@ -61,18 +73,20 @@ An example of usage might be:
 .Ed
 .Pp
 Which would instruct the boot blocks at the next boot,
-to try boot the experimental kernel off the scsi disk.
+to try boot the experimental kernel off the SCSI disk.
 If for any reason this failed, the next boot attempt would 
 boot the kernel
-.Em /kernel.old
-off the IDE drive.  (assuming the write-back option were enabled) If this
-in turn failed. the compiled in default would be used.
+.Pa /kernel.old
+off the IDE drive.  (Assuming the write-back option were enabled) If this
+in turn failed. The compiled in default would be used.
 .Pp
 If the write-back feature is disabled, the nextboot program is a convenient way
 to change the default boot string. Note, that should the file specified in
 the nameblock be non-existent, then the name compiled into the boot blocks
 will be used for the boot rather than the next name in the nameblock. The 
-nameblock is only consulted ONCE per boot.
+nameblock is only consulted
+.Em once
+per boot.
 .Sh SEE ALSO
 .Xr boot 8 ,
 .Xr disklabel 8 ,
diff --git a/sbin/i386/nextboot/nextboot.c b/sbin/i386/nextboot/nextboot.c
index 5461884..b74c429 100644
--- a/sbin/i386/nextboot/nextboot.c
+++ b/sbin/i386/nextboot/nextboot.c
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1996 Whistle Communications
  * All Rights Reserved.
@@ -14,22 +13,22 @@
  * any damages whatsoever resulting from the use of this software.
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
+#include <fcntl.h>
+#include <err.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 struct mboot
 {
-	unsigned char padding[2]; /* force the longs to be long alligned */
+	unsigned char padding[2]; /* force the longs to be long aligned */
 	unsigned char bootinst[DOSPARTOFF];
 	struct	dos_partition parts[4];
 	unsigned short int	signature;
@@ -43,20 +42,18 @@ struct mboot mboot;
 static int	bflag;
 static int	eflag;
 static int	dflag;
-static int	nameblock = NAMEBLOCK;
 
 #define BOOT_MAGIC 0xAA55
 
-extern char	*__progname;
-
-static void usage(void) {
-	fprintf (stderr, " usage: %s [-b] device bootstring [bootstring] ...\n"
-			, __progname);
-	fprintf (stderr, "    or: %s {-e,-d} device \n" , __progname);
-	fprintf (stderr, "The -e and -d flags are mutually exclusive\n");
+static void
+usage(void) {
+	fprintf (stderr, "%s\n%s\n",
+	"usage: nextboot [-b] device bootstring [bootstring] ...",
+	"       nextboot {-e,-d} device");
 	exit(1);
 }
 
+int
 main (int argc, char** argv)
 {
 	int 	fd = -1;
@@ -97,11 +94,8 @@ main (int argc, char** argv)
 			usage();
 		}
 	}
-        if ((fd = open(argv[0], O_RDWR, 0)) < 0) {
-		perror("open");
-		printf ("file: %s\n",argv[0]);
-		usage();
-        }
+        if ((fd = open(argv[0], O_RDWR, 0)) < 0)
+		errx(1, "can't open %s", argv[0]);
 
 	argc--;
 	argv++;
@@ -109,18 +103,12 @@ main (int argc, char** argv)
 	/*******************************************
 	 * Check that we have an MBR
 	 */
-	if (lseek(fd,0,0) == -1) {
-		perror("lseek");
-		exit(1);
-	}
-	if (read (fd,&mboot.bootinst[0],BLOCKSIZE ) != BLOCKSIZE) {
-		perror("read0");
-		exit(1);
-	}
-	if(mboot.signature != (unsigned short)BOOT_MAGIC) {
-		printf(" no fdisk part.. not touching block 1\n");
-		exit(1);
-	} 
+	if (lseek(fd,0,0) == -1)
+		err(1, "lseek");
+	if (read (fd,&mboot.bootinst[0],BLOCKSIZE ) != BLOCKSIZE)
+		err(1, "read0");
+	if (mboot.signature != (unsigned short)BOOT_MAGIC)
+		errx(1, "no fdisk part.. not touching block 1");
 
 	/*******************************************
 	 * And check that none of the partitions in it cover the name block;
@@ -129,28 +117,22 @@ main (int argc, char** argv)
 		if( mboot.parts[part].dp_size
 		 && (mboot.parts[part].dp_start <= NAMEBLOCK)
 		 && (mboot.parts[part].dp_start
-			+ mboot.parts[part].dp_size > NAMEBLOCK)) {
-			printf(" Name sector lies within a Bios partition.\n");
-			printf(" Aborting write.\n");
-			exit(1);
-		}
+			+ mboot.parts[part].dp_size > NAMEBLOCK))
+			errx(1,
+		"name sector lies within a Bios partition: aborting write");
 	}
 
 
 	/*******************************************
-	 *  Now check the  name sector itself to see if it's been initialised.
+	 *  Now check the  name sector itself to see if it's been initialized.
 	 */
-	if (lseek(fd,NAMEBLOCK * BLOCKSIZE,0) == -1) {
-		perror("lseek");
-		exit(1);
-	}
-	if ( read (fd,namebuf,BLOCKSIZE ) != BLOCKSIZE) {
-		perror("read1");
-		exit(1);
-	}
+	if (lseek(fd,NAMEBLOCK * BLOCKSIZE,0) == -1)
+		err(1, "lseek");
+	if (read(fd,namebuf,BLOCKSIZE) != BLOCKSIZE)
+		err(1, "read1");
 	/*******************************************
 	 * check if we are just enabling or disabling
-	 * Remember the flags are exlusive..
+	 * Remember the flags are exclusive..
 	 */
 	if(!bflag) { /* don't care what's there if bflag is set */
 		switch(*(unsigned long *)cp)
@@ -159,10 +141,7 @@ main (int argc, char** argv)
 		case	ENABLE_MAGIC:
 			break;
 		default:
-			fprintf(stderr,
-				"namesector not  initialised.."
-				"use the -b flag..\n");
-			exit(1);
+			errx(1, "namesector not initialized, use the -b flag");
 		}
 	}
 
@@ -199,24 +178,18 @@ main (int argc, char** argv)
 	/*******************************************
 	 *  write it to disk.
 	 */
-	if (lseek(fd,NAMEBLOCK * BLOCKSIZE,0) == -1) {
-		perror("lseek");
-		exit(1);
-	}
-	if(write (fd,namebuf,BLOCKSIZE ) != BLOCKSIZE) {
-		perror("write");
-		exit(1);
-	}
+	if (lseek(fd,NAMEBLOCK * BLOCKSIZE,0) == -1)
+		err(1, "lseek");
+	if(write (fd,namebuf,BLOCKSIZE ) != BLOCKSIZE)
+		err(1, "write");
 
 #if 0
 	/*******************************************
 	 * just to be safe/paranoid.. read it back..
 	 * and print it..
 	 */
-	if (lseek(fd,NAMEBLOCK * BLOCKSIZE,0) == -1) {
-		perror("lseek (second) ");
-		exit(1);
-	}
+	if (lseek(fd,NAMEBLOCK * BLOCKSIZE,0) == -1)
+		err(1, "lseek (second)");
 	read (fd,namebuf,512);
 	for (i = 0;i< 16;i++) {
 		for ( j = 0; j < 16; j++) {
@@ -227,5 +200,3 @@ main (int argc, char** argv)
 #endif
 	exit(0);
 }
-
-