d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkfs_msdos: sync with NetBSD

Browse Source 
Add a sanity test and clean up whitespace.

Obtained from:	NetBSD
This commit is contained in:
Ed Maste 2015-11-27 14:20:32 +00:00
parent f186a80d8a
commit 937744df07
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=291382
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sbin/newfs_msdos/mkfs_msdos.c
View File

@ -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);