--- src/usr.bin/mkfifo/mkfifo.c	2005/03/02 19:27:39	1.6
+++ src/usr.bin/mkfifo/mkfifo.c	2005/03/16 07:16:14	1.7
@@ -62,8 +62,8 @@ main(int argc, char **argv)
 
 	modestr = modep = NULL;
 
-	while ((ch = getopt(argc, argv, "m:")) != -1)
-		switch(ch) {
+	while ((ch = getopt(argc, argv, "m:")) != -1) {
+		switch (ch) {
 		case 'm':
 			f_mode = 1;
 			modestr = optarg;
@@ -72,6 +72,7 @@ main(int argc, char **argv)
 		default:
 			usage();
 		}
+	}
 	argc -= optind;
 	argv += optind;
 	if (argv[0] == NULL)
@@ -81,20 +82,22 @@ main(int argc, char **argv)
 		umask(0);
 		errno = 0;
 		if ((modep = setmode(modestr)) == NULL) {
-			if (errno)
+			if (errno != 0)
 				err(1, "malloc failed");
 			errx(1, "invalid file mode: %s", modestr);
 		}
 		fifomode = getmode(modep, BASEMODE);
+		/* No need to free() modep here, as we'll be exiting soon. */
 	} else {
 		fifomode = BASEMODE;
 	}
 
-	for (exitval = 0; *argv != NULL; ++argv)
+	for (exitval = 0; *argv != NULL; ++argv) {
 		if (mkfifo(*argv, fifomode) < 0) {
 			warn("%s", *argv);
 			exitval = 1;
 		}
+	}
 	exit(exitval);
 }