diff options
author | Ed Maste <emaste@FreeBSD.org> | 2015-11-27 14:20:32 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2015-11-27 14:20:32 +0000 |
commit | 937744df071361eb411f392d47bf1dada06f49f7 (patch) | |
tree | 457a4c7a97f8a772b79e43958afa57b9e409b973 /sbin/newfs_msdos | |
parent | f186a80d8a92ee5dcd2a8718c447c424730c0286 (diff) | |
download | src-937744df071361eb411f392d47bf1dada06f49f7.tar.gz src-937744df071361eb411f392d47bf1dada06f49f7.zip |
Notes
Diffstat (limited to 'sbin/newfs_msdos')
-rw-r--r-- | sbin/newfs_msdos/mkfs_msdos.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index 7978b06a7d4c..b14896d01144 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -223,8 +223,8 @@ static void mklabel(u_int8_t *, const char *); static int oklabel(const char *); static void setstr(u_int8_t *, const char *, size_t); -int mkfs_msdos(const char *fname, const char *dtype, - const struct msdos_options *op) +int +mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) { char buf[MAXPATHLEN]; struct sigaction si_sa; @@ -245,6 +245,10 @@ int mkfs_msdos(const char *fname, const char *dtype, int fd, fd1; struct msdos_options o = *op; + if (o.block_size && o.sectors_per_cluster) { + warnx("Cannot specify both block size and sectors per cluster"); + return -1; + } if (o.OEM_string && strlen(o.OEM_string) > 8) { warnx("%s: bad OEM string", o.OEM_string); return -1; @@ -304,7 +308,8 @@ int mkfs_msdos(const char *fname, const char *dtype, bpb.bpbHugeSectors = o.size; if (o.hidden_sectors_set) bpb.bpbHiddenSecs = o.hidden_sectors; - if (!(o.floppy || (o.drive_heads && o.sectors_per_track && o.bytes_per_sector && o.size && o.hidden_sectors_set))) { + if (!(o.floppy || (o.drive_heads && o.sectors_per_track && + o.bytes_per_sector && o.size && o.hidden_sectors_set))) { off_t delta; getdiskinfo(fd, fname, dtype, o.hidden_sectors_set, &bpb); bpb.bpbHugeSectors -= (o.offset / bpb.bpbBytesPerSec); |