 @@ -1,14 +1,14 @@
-/*	$NetBSD: mkfs_msdos.c,v 1.4 2013/01/24 00:10:09 christos Exp $	*/
+/*	$NetBSD: mkfs_msdos.c,v 1.5 2013/01/24 19:24:56 christos Exp $	*/
 /*
  * Copyright (c) 1998 Robert Nordier
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
 @@ -17,59 +17,67 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char rcsid[] =
   "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $";
 #else
-__RCSID("$NetBSD: mkfs_msdos.c,v 1.4 2013/01/24 00:10:09 christos Exp $");
+__RCSID("$NetBSD: mkfs_msdos.c,v 1.5 2013/01/24 19:24:56 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #ifndef MAKEFS
 #include <sys/disk.h>
 #endif
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <signal.h>
 #include <util.h>
 #include <disktab.h>
 #ifndef MAKEFS
 #include "partutil.h"
 #endif
 #include "mkfs_msdos.h"
 #define MAXU16	  0xffff	/* maximum unsigned 16-bit quantity */
 #define BPN	  4		/* bits per nibble */
 #define NPB	  2		/* nibbles per byte */
 #define DOSMAGIC  0xaa55	/* DOS magic number */
 #define MINBPS	  512		/* minimum bytes per sector */
 #define MAXSPC	  128		/* maximum sectors per cluster */
 #define MAXNFT	  16		/* maximum number of FATs */
 #define DEFBLK	  4096		/* default block size */
 #define DEFBLK16  2048		/* default block size FAT16 */
 #define DEFRDE	  512		/* default root directory entries */
 @@ -213,27 +221,29 @@ static u_int8_t bootcode[] = {
 x0d, 0x0a,
     'N', 'o', 'n', '-', 's', 'y', 's', 't',
     'e', 'm', ' ', 'd', 'i', 's', 'k',
 x0d, 0x0a,
     'P', 'r', 'e', 's', 's', ' ', 'a', 'n',
     'y', ' ', 'k', 'e', 'y', ' ', 't', 'o',
     ' ', 'r', 'e', 'b', 'o', 'o', 't',
 x0d, 0x0a,
 };
 static int got_siginfo = 0; /* received a SIGINFO */
 #ifndef MAKEFS
 static int check_mounted(const char *, mode_t);
 #endif
 static int getstdfmt(const char *, struct bpb *);
 static int getbpbinfo(int, const char *, const char *, int, struct bpb *, int);
 static void print_bpb(struct bpb *);
 static int ckgeom(const char *, u_int, const char *);
 static int oklabel(const char *);
 static void mklabel(u_int8_t *, const char *);
 static void setstr(u_int8_t *, const char *, size_t);
 static void infohandler(int sig);
 int
 mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op)
+{
     char buf[MAXPATHLEN];
 @@ -274,29 +284,31 @@ mkfs_msdos(const char *fname, const char
 	    return -1;
+	}
 	pos = lseek(fd, o.create_size - 1, SEEK_SET);
 	if (write(fd, "\0", 1) != 1) {
 	    warn("failed to set file size");
 	    return -1;
+	}
 	pos = lseek(fd, 0, SEEK_SET);
     } else if ((fd = open(fname, o.no_create ? O_RDONLY : O_RDWR)) == -1 ||
 	fstat(fd, &sb)) {
 	warn("%s", fname);
 	return -1;
+    }
 #ifndef MAKEFS
     if (!o.no_create)
 	if (check_mounted(fname, sb.st_mode) == -1)
 	    return -1;
 #endif
     if (!S_ISCHR(sb.st_mode) && !o.create_size) {
 	warnx("warning, %s is not a character device", fname);
 	return -1;
+    }
     if (o.offset && o.offset != lseek(fd, o.offset, SEEK_SET)) {
 	warnx("cannot seek to %jd", (intmax_t)o.offset);
 	return -1;
+    }
     memset(&bpb, 0, sizeof(bpb));
     if (o.floppy) {
 	if (getstdfmt(o.floppy, &bpb) == -1)
 	    return -1;
 	bpb.bsec = bpb.sec;
 @@ -593,27 +605,29 @@ mkfs_msdos(const char *fname, const char
 				 *  ?
 				 */
+    }
     if (ch != 0)
 	printf("MBR type: %d\n", ch);
     print_bpb(&bpb);
     if (!o.no_create) {
 	gettimeofday(&tv, NULL);
 	now = tv.tv_sec;
 	tm = localtime(&now);
 	if (!(img = malloc(bpb.bps)))
 	    err(1, NULL);
 	dir = bpb.res + (bpb.spf ? bpb.spf : bpb.bspf) * bpb.nft;
 #ifdef SIGINFO
 	signal(SIGINFO, infohandler);
 #endif
 	for (lsn = 0; lsn < dir + (o.fat_type == 32 ? bpb.spc : rds); lsn++) {
 	    if (got_siginfo) {
 		fprintf(stderr,"%s: writing sector %u of %u (%u%%)\n",
 		    fname,lsn,(dir + (o.fat_type == 32 ? bpb.spc : rds)),
 		    (lsn*100)/(dir + (o.fat_type == 32 ? bpb.spc : rds)));
 		got_siginfo = 0;
+	    }
 	    x = lsn;
 	    if (o.bootstrap &&
 		o.fat_type == 32 && bpb.bkbs != MAXU16 &&
 		bss <= bpb.bkbs && x >= bpb.bkbs) {
 		x -= bpb.bkbs;
 		if (!x && lseek(fd1, o.offset, SEEK_SET)) {
 @@ -717,26 +731,27 @@ mkfs_msdos(const char *fname, const char
 	    if ((n = write(fd, img, bpb.bps)) == -1) {
 		warn("%s", fname);
 		return -1;
+	    }
 	    if ((size_t)n != bpb.bps) {
 		warnx("%s: can't write sector %u", fname, lsn);
 		return -1;
+	    }
+	}
+    }
     return 0;
+}
 #ifndef MAKEFS
 /*
  * return -1 with error if file system is mounted.
  */
 static int
 check_mounted(const char *fname, mode_t mode)
+{
     struct statvfs *mp;
     const char *s1, *s2;
     size_t len;
     int n, r;
     if (!(n = getmntinfo(&mp, MNT_NOWAIT))) {
 	warn("getmntinfo");
 @@ -749,121 +764,131 @@ check_mounted(const char *fname, mode_t
     r = S_ISCHR(mode) && s1 != fname && *s1 == 'r';
     for (; n--; mp++) {
 	s2 = mp->f_mntfromname;
 	if (!strncmp(s2, _PATH_DEV, len))
 	    s2 += len;
 	if ((r && s2 != mp->f_mntfromname && !strcmp(s1 + 1, s2)) ||
 	    !strcmp(s1, s2)) {
 	    warnx("%s is mounted on %s", fname, mp->f_mntonname);
 	    return -1;
+	}
+    }
     return 0;
+}
 #endif
 /*
  * Get a standard format.
  */
 static int
 getstdfmt(const char *fmt, struct bpb *bpb)
+{
     u_int x, i;
     x = sizeof(stdfmt) / sizeof(stdfmt[0]);
     for (i = 0; i < x && strcmp(fmt, stdfmt[i].name); i++);
     if (i == x) {
 	warnx("%s: unknown standard format", fmt);
 	return -1;
+    }
     *bpb = stdfmt[i].bpb;
     return 0;
+}
 /*
  * Get disk slice, partition, and geometry information.
  */
 static int
 getbpbinfo(int fd, const char *fname, const char *dtype, int iflag,
     struct bpb *bpb, int create)
+{
     struct disk_geom geo;
     struct dkwedge_info dkw;
     const char *s1, *s2;
     int part;
     part = -1;
     s1 = fname;
     if ((s2 = strrchr(s1, '/')))
 	s1 = s2 + 1;
     for (s2 = s1; *s2 && !isdigit((unsigned char)*s2); s2++);
     if (!*s2 || s2 == s1)
 	s2 = NULL;
     else
 	while (isdigit((unsigned char)*++s2));
     s1 = s2;
 #ifndef MAKEFS
     int maxpartitions = getmaxpartitions();
     // XXX: Does not work with wedges
     if (s2 && *s2 >= 'a' && *s2 <= 'a' + maxpartitions - 1) {
 	part = *s2++ - 'a';
+    }
 #endif
     if (((part != -1) && ((!iflag && part != -1) || !bpb->bsec)) ||
 	!bpb->bps || !bpb->spt || !bpb->hds) {
-	if (create
+	u_int sector_size;
 	u_int nsectors;
 	u_int ntracks;
 	u_int size;
 #ifndef MAKEFS
-	|| getdiskinfo(fname, fd, NULL, &geo, &dkw) == -1
+	struct disk_geom geo;
 	struct dkwedge_info dkw;
 	if (!create && getdiskinfo(fname, fd, NULL, &geo, &dkw) != -1) {
 	    sector_size = geo.dg_secsize = 512;
 	    nsectors = geo.dg_nsectors = 63;
 	    ntracks = geo.dg_ntracks = 255;
 	    size = dkw.dkw_size;
 	} else
 #endif
 	) {
 	    struct stat st;
 	    if (fstat(fd, &st) == -1) {
 		warnx("Can't get disk size for `%s'", fname);
 		return -1;
+	    }
 	    /* create a fake geometry for a file image */
-	    geo.dg_secsize = 512;
+	    sector_size = 512;
-	    geo.dg_nsectors = 63;
+	    nsectors = 63;
-	    geo.dg_ntracks = 255;
+	    ntracks = 255;
-	    dkw.dkw_size = st.st_size / geo.dg_secsize;
+	    size = st.st_size / sector_size;
+	}
 	if (!bpb->bps) {
-	    if (ckgeom(fname, geo.dg_secsize, "bytes/sector") == -1)
+	    if (ckgeom(fname, sector_size, "bytes/sector") == -1)
 		return -1;
-	    bpb->bps = geo.dg_secsize;
+	    bpb->bps = sector_size;
+	}
-	if (geo.dg_nsectors > 63) {
+	if (nsectors > 63) {
 		/*
 		 * The kernel doesn't accept BPB with spt > 63.
 		 * (see sys/fs/msdosfs/msdosfs_vfsops.c:msdosfs_mountfs())
 		 * If values taken from disklabel don't match these
 		 * restrictions, use popular BIOS default values instead.
 		 */
-		geo.dg_nsectors = 63;
+		nsectors = 63;
+	}
 	if (!bpb->spt) {
-	    if (ckgeom(fname, geo.dg_nsectors, "sectors/track") == -1)
+	    if (ckgeom(fname, nsectors, "sectors/track") == -1)
 		return -1;
-	    bpb->spt = geo.dg_nsectors;
+	    bpb->spt = nsectors;
+	}
 	if (!bpb->hds)
-	    if (ckgeom(fname, geo.dg_ntracks, "drive heads") == -1)
+	    if (ckgeom(fname, ntracks, "drive heads") == -1)
 		return -1;
-	    bpb->hds = geo.dg_ntracks;
+	    bpb->hds = ntracks;
 	if (!bpb->bsec)
-	    bpb->bsec = dkw.dkw_size;
+	    bpb->bsec = size;
+    }
     return 0;
+}
 /*
  * Print out BPB values.
  */
 static void
 print_bpb(struct bpb *bpb)
+{
     printf("bps=%u spc=%u res=%u nft=%u", bpb->bps, bpb->spc, bpb->res,
 	   bpb->nft);
     if (bpb->rde)