diff options
| author | Elliott Hughes <enh@google.com> | 2021-01-26 20:05:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 20:05:22 +0000 |
| commit | 4bd115afd24a3303ee9a90566efd1a61a5ef859c (patch) | |
| tree | 2cae0765b948d20714862f3c9f0b8b8b0e8660bd /newfs_msdos.c | |
| parent | b6b432c5a3bd27185d73076b54e28b475a043b57 (diff) | |
| parent | 8c4b3f0afd38c982ffa910b7736796cd33d24389 (diff) | |
| download | newfs_msdos-4bd115afd24a3303ee9a90566efd1a61a5ef859c.tar.gz | |
Update to upstream 6424881cc82a65a833fc6fb79730474caedf6222. am: 8c4b3f0afd
Original change: https://android-review.googlesource.com/c/platform/external/newfs_msdos/+/1555547
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85b8d8e2ce0d8133d877dd624a0c75e84b9149af
Diffstat (limited to 'newfs_msdos.c')
| -rw-r--r-- | newfs_msdos.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/newfs_msdos.c b/newfs_msdos.c index cd03164..bac250e 100644 --- a/newfs_msdos.c +++ b/newfs_msdos.c @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: head/sbin/newfs_msdos/newfs_msdos.c 335189 2018-06-15 06:03:40Z delphij $"; + "$FreeBSD$"; #endif /* not lint */ #include <sys/param.h> @@ -178,18 +178,17 @@ main(int argc, char *argv[]) argv += optind; if (argc < 1 || argc > 2) usage(); - if (o.align) { - if (o.hidden_sectors_set) - errx(1, "align (-A) is incompatible with -r"); - } + if (o.align) { + if (o.reserved_sectors) + errx(1, "align (-A) is incompatible with -r"); + } fname = *argv++; if (!o.create_size && !strchr(fname, '/')) { snprintf(buf, sizeof(buf), "%s%s", _PATH_DEV, fname); - if (!(fname = strdup(buf))) - err(1, NULL); + fname = buf; } dtype = *argv; - return !!mkfs_msdos(fname, dtype, &o); + exit(!!mkfs_msdos(fname, dtype, &o)); } /* |