Use err(3). Add usage()s.

9 files changed, 146 insertions, 111 deletions

diff --git a/usr.sbin/pccard/pccardc/dumpcis.c b/usr.sbin/pccard/pccardc/dumpcis.c
index 8d08e10..805199e 100644
--- a/usr.sbin/pccard/pccardc/dumpcis.c
+++ b/usr.sbin/pccard/pccardc/dumpcis.c
@@ -22,14 +22,19 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <fcntl.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 
 #include <pccard/card.h>
@@ -91,10 +96,8 @@ xmalloc(int sz)
 	p = malloc(sz);
 	if (p)
 		bzero(p, sz);
-	else {
-		perror("malloc");
-		exit(1);
-	}
+	else
+		errx(1, "malloc");
 	return (p);
 }
 
diff --git a/usr.sbin/pccard/pccardc/enabler.c b/usr.sbin/pccard/pccardc/enabler.c
index dee948a..c0b6049 100644
--- a/usr.sbin/pccard/pccardc/enabler.c
+++ b/usr.sbin/pccard/pccardc/enabler.c
@@ -22,20 +22,25 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 
 #include <pccard/card.h>
 #include <pccard/cis.h>
 
-void    usage();
+static void    usage __P((char *));
 
 int
 enabler_main(argc, argv)
@@ -54,12 +59,12 @@ enabler_main(argc, argv)
 		usage("arg count");
 	slot = atoi(argv[1]);
 	if (slot < 0 || slot >= MAXSLOT)
-		usage("Illegal slot number");
+		usage("illegal slot number");
 	p = argv[2];
 	while (*p && (*p < '0' || *p > '9'))
 		p++;
 	if (*p == 0)
-		usage("No unit on device name");
+		usage("no unit on device name");
 	drv.unit = atoi(p);
 	*p = 0;
 	strcpy(drv.name, argv[2]);
@@ -68,25 +73,25 @@ enabler_main(argc, argv)
 	while (argc > 1) {
 		if (strcmp(argv[0], "-m") == 0) {
 			if (argc < 4)
-				usage("Memory argument error");
+				usage("memory argument error");
 			if (sscanf(argv[1], "%x", &card_addr) != 1)
-				usage("Bad card address");
+				usage("bad card address");
 			if (sscanf(argv[2], "%lx", &drv.mem) != 1)
-				usage("Bad memory address");
+				usage("bad memory address");
 			if (sscanf(argv[3], "%d", &i) != 1)
-				usage("Bad memory size");
+				usage("bad memory size");
 			drv.memsize = i * 1024;
 			argc -= 2;
 			argv += 2;
 		} else if (strcmp(argv[0], "-f") == 0) {
 			if (sscanf(argv[1], "%x", &drv.flags) != 1)
-				usage("Bad driver flags");
+				usage("bad driver flags");
 		} else if (strcmp(argv[0], "-a") == 0) {
 			if (sscanf(argv[1], "%x", &drv.iobase) != 1)
-				usage("Bad I/O address");
+				usage("bad I/O address");
 		} else if (strcmp(argv[0], "-i") == 0) {
 			if (sscanf(argv[1], "%d", &i) != 1 || i < 1 || i > 15)
-				usage("Illegal IRQ");
+				usage("illegal IRQ");
 			drv.irqmask = 1 << i;
 		}
 		argc -= 2;
@@ -99,10 +104,8 @@ enabler_main(argc, argv)
 		drv.irqmask, drv.flags);
 	sprintf(name, CARD_DEVICE, slot);
 	fd = open(name, 2);
-	if (fd < 0) {
-		perror(name);
-		exit(1);
-	}
+	if (fd < 0)
+		err(1, "%s", name);
 
 	/* Map the memory and I/O contexts. */
 	if (drv.mem) {
@@ -111,23 +114,19 @@ enabler_main(argc, argv)
 		mem.start = (caddr_t)drv.mem;
 		mem.size = drv.memsize;
 		mem.card = card_addr;
-		if (ioctl(fd, PIOCSMEM, &mem)) {
-			perror("Set memory context");
-			exit(1);
-		}
+		if (ioctl(fd, PIOCSMEM, &mem))
+			err(1, "set memory context");
 	}
 	if (drv.iobase) {
 		io.window = 0;
 		io.flags = IODF_ACTIVE | IODF_CS16;
 		io.start = drv.iobase;
 		io.size = 32;	/* Blah... */
-		if (ioctl(fd, PIOCSIO, &io)) {
-			perror("Set I/O context");
-			exit(1);
-		}
+		if (ioctl(fd, PIOCSIO, &io))
+			err(1, "set I/O context");
 	}
 	if (ioctl(fd, PIOCSDRV, &drv))
-		perror("set driver");
+		warn("set driver");
 	close(fd);
 	return 0;
 }
@@ -139,16 +138,16 @@ void
 usage(msg)
 	char   *msg;
 {
-	fprintf(stderr, "enabler: %s\n", msg);
+	warnx("enabler: %s", msg);
 	fprintf(stderr,
-	    "Usage: enabler slot driver [ -m addr size ] [ -a iobase ] [ -i irq ]\n");
+"usage: pccardc enabler slot driver [-m addr size] [-a iobase] [-i irq]\n");
 	fprintf(stderr,
-	    "    -m card addr size : Card address (hex), host address (hex) & size (Kb)\n");
+"    -m card addr size : card address (hex), host address (hex) & size (Kb)\n");
 	fprintf(stderr,
-	    "    -a iobase         : I/O port address (hex)\n");
+"    -a iobase         : I/O port address (hex)\n");
 	fprintf(stderr,
-	    "    -i irq            : Interrupt request number (1-15)\n");
+"    -i irq            : interrupt request number (1-15)\n");
 	fprintf(stderr,
-	    "   Example:  enabler 0 ed0 -m 2000 d4000 16 -a 300 -i 3\n");
+"   Example:  enabler 0 ed0 -m 2000 d4000 16 -a 300 -i 3\n");
 	exit(1);
 }
diff --git a/usr.sbin/pccard/pccardc/pccardc.c b/usr.sbin/pccard/pccardc/pccardc.c
index ca6e197..e18d66c 100644
--- a/usr.sbin/pccard/pccardc/pccardc.c
+++ b/usr.sbin/pccard/pccardc/pccardc.c
@@ -22,9 +22,14 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -68,7 +73,7 @@ main(int argc, char **argv)
 		}
 	}
 	if (argc > 1)
-		fprintf(stderr, "Unknown Subcommand.\n");
+		warnx("unknown subcommand");
 	return help_main(argc, argv);
 }
 
@@ -77,9 +82,8 @@ help_main(int argc, char **argv)
 {
 	int     i;
 
-	fprintf(stderr, "Usage:\n");
-	fprintf(stderr, "\t%s <subcommand> <arg> ...\n", argv[0]);
-	fprintf(stderr, "Subcommands:\n");
+	fprintf(stderr, "usage: pccardc <subcommand> <arg> ...\n");
+	fprintf(stderr, "subcommands:\n");
 	for (i = 0; subcommands[i].name; i++)
 		fprintf(stderr, "\t%s\n\t\t%s\n",
 		    subcommands[i].name, subcommands[i].help);
diff --git a/usr.sbin/pccard/pccardc/pccardmem.c b/usr.sbin/pccard/pccardc/pccardmem.c
index 959db3a..059a571 100644
--- a/usr.sbin/pccard/pccardc/pccardmem.c
+++ b/usr.sbin/pccard/pccardc/pccardmem.c
@@ -22,16 +22,28 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
-#include <stdio.h>
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <err.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
 #include <pccard/card.h>
 
+static void
+usage()
+{
+	fprintf(stderr, "usage: pccardc pccardmem [memory-address]\n");
+	exit(1);
+}
+
 int
 pccardmem_main(argc, argv)
 	int     argc;
@@ -41,24 +53,18 @@ pccardmem_main(argc, argv)
 	int     addr = 0;
 	int     fd;
 
-	if (argc > 2) {
-		fprintf(stderr, "usage: %s [ memory-address ]\n", argv[0]);
-		exit(1);
-	}
+	if (argc > 2)
+		usage();
 	sprintf(name, CARD_DEVICE, 0);
 	fd = open(name, 0);
-	if (fd < 0) {
-		perror(name);
-		exit(1);
-	}
+	if (fd < 0)
+		err(1, "%s", name);
 	if (argc == 2) {
-		if (sscanf(argv[1], "%x", &addr) != 1) {
-			fprintf(stderr, "arg error\n");
-			exit(1);
-		}
+		if (sscanf(argv[1], "%x", &addr) != 1)
+			errx(1, "arg error");
 	}
 	if (ioctl(fd, PIOCRWMEM, &addr))
-		perror("ioctl");
+		warn("ioctl");
 	else
 		printf("PCCARD Memory address set to 0x%x\n", addr);
 	exit(0);
diff --git a/usr.sbin/pccard/pccardc/printcis.c b/usr.sbin/pccard/pccardc/printcis.c
index 544b454..961485c 100644
--- a/usr.sbin/pccard/pccardc/printcis.c
+++ b/usr.sbin/pccard/pccardc/printcis.c
@@ -22,13 +22,17 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 
 #include <pccard/card.h>
diff --git a/usr.sbin/pccard/pccardc/rdmap.c b/usr.sbin/pccard/pccardc/rdmap.c
index d88a84e..5515f22 100644
--- a/usr.sbin/pccard/pccardc/rdmap.c
+++ b/usr.sbin/pccard/pccardc/rdmap.c
@@ -22,14 +22,18 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <fcntl.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 
 #include <pccard/card.h>
diff --git a/usr.sbin/pccard/pccardc/rdreg.c b/usr.sbin/pccard/pccardc/rdreg.c
index 9707e24..57ed072 100644
--- a/usr.sbin/pccard/pccardc/rdreg.c
+++ b/usr.sbin/pccard/pccardc/rdreg.c
@@ -22,13 +22,18 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
@@ -44,13 +49,13 @@ dumpslot(sl)
 	sprintf(name, CARD_DEVICE, sl);
 	fd = open(name, 2);
 	if (fd < 0) {
-		perror(name);
+		warn("%s", name);
 		return;
 	}
 	printf("Registers for slot %d\n", sl);
 	for (r.reg = 0; r.reg < 0x40; r.reg++) {
 		if (ioctl(fd, PIOCGREG, &r)) {
-			perror("ioctl");
+			warn("ioctl");
 			break;
 		}
 		if ((r.reg % 16) == 0)
diff --git a/usr.sbin/pccard/pccardc/wrattr.c b/usr.sbin/pccard/pccardc/wrattr.c
index 45b5abf..ec29bf8 100644
--- a/usr.sbin/pccard/pccardc/wrattr.c
+++ b/usr.sbin/pccard/pccardc/wrattr.c
@@ -22,18 +22,30 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
 #include <pccard/card.h>
 
+static void
+usage()
+{
+	fprintf(stderr, "usage: pccardc wrattr slot offs value\n");
+	exit(1);
+}
+
 int
 wrattr_main(argc, argv)
 	int     argc;
@@ -44,30 +56,22 @@ wrattr_main(argc, argv)
 	int     fd;
 	off_t   offs;
 
-	if (argc != 4) {
-		fprintf(stderr, "usage: %s wrattr slot offs value\n", argv[0]);
-		exit(1);
-	}
+	if (argc != 4)
+		usage();
 	sprintf(name, CARD_DEVICE, atoi(argv[1]));
 	fd = open(name, 2);
-	if (fd < 0) {
-		perror(name);
-		exit(1);
-	}
+	if (fd < 0)
+		err(1, "%s", name);
 	reg = MDF_ATTR;
-	if (ioctl(fd, PIOCRWFLAG, &reg)) {
-		perror("ioctl (PIOCRWFLAG)");
-		exit(1);
-	}
+	if (ioctl(fd, PIOCRWFLAG, &reg))
+		err(1, "ioctl (PIOCRWFLAG)");
 	if (sscanf(argv[2], "%x", &reg) != 1 ||
-	    sscanf(argv[3], "%x", &value) != 1) {
-		fprintf(stderr, "arg error\n");
-		exit(1);
-	}
+	    sscanf(argv[3], "%x", &value) != 1)
+		errx(1, "arg error");
 	offs = reg;
 	c = value;
 	lseek(fd, offs, SEEK_SET);
 	if (write(fd, &c, 1) != 1)
-		perror(name);
+		warn("%s", name);
 	return 0;
 }
diff --git a/usr.sbin/pccard/pccardc/wrreg.c b/usr.sbin/pccard/pccardc/wrreg.c
index 4c2f6bf..963a466 100644
--- a/usr.sbin/pccard/pccardc/wrreg.c
+++ b/usr.sbin/pccard/pccardc/wrreg.c
@@ -22,18 +22,30 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
 #include <pccard/card.h>
 
+static void
+usage()
+{
+	fprintf(stderr, "usage: pccardc wrreg slot reg value\n");
+	exit(1);
+}
+
 int
 wrreg_main(argc, argv)
 	int     argc;
@@ -44,24 +56,18 @@ wrreg_main(argc, argv)
 	int     fd;
 	struct pcic_reg r;
 
-	if (argc != 4) {
-		fprintf(stderr, "usage: wrreg slot reg value\n");
-		exit(1);
-	}
+	if (argc != 4)
+		usage();
 	sprintf(name, CARD_DEVICE, atoi(argv[1]));
 	fd = open(name, 2);
-	if (fd < 0) {
-		perror(name);
-		exit(1);
-	}
+	if (fd < 0)
+		err(1, "%s", name);
 	if (sscanf(argv[2], "%x", &reg) != 1 ||
-	    sscanf(argv[3], "%x", &value) != 1) {
-		fprintf(stderr, "arg error\n");
-		exit(1);
-	}
+	    sscanf(argv[3], "%x", &value) != 1)
+		errx(1, "arg error");
 	r.reg = reg;
 	r.value = value;
 	if (ioctl(fd, PIOCSREG, &r))
-		perror("ioctl");
+		warn("ioctl");
 	return 0;
 }