[Midnightbsd-cvs] src [11105] trunk/sbin/newfs_msdos/newfs_msdos.c: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jun 19 14:29:21 EDT 2018
Revision: 11105
http://svnweb.midnightbsd.org/src/?rev=11105
Author: laffer1
Date: 2018-06-19 14:29:20 -0400 (Tue, 19 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/sbin/newfs_msdos/Makefile
trunk/sbin/newfs_msdos/newfs_msdos.8
trunk/sbin/newfs_msdos/newfs_msdos.c
Property Changed:
----------------
trunk/sbin/newfs_msdos/newfs_msdos.8
Modified: trunk/sbin/newfs_msdos/Makefile
===================================================================
--- trunk/sbin/newfs_msdos/Makefile 2018-06-19 18:20:44 UTC (rev 11104)
+++ trunk/sbin/newfs_msdos/Makefile 2018-06-19 18:29:20 UTC (rev 11105)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/newfs_msdos/Makefile 211725 2010-08-23 22:24:11Z imp $
PROG= newfs_msdos
MAN= newfs_msdos.8
Modified: trunk/sbin/newfs_msdos/newfs_msdos.8
===================================================================
--- trunk/sbin/newfs_msdos/newfs_msdos.8 2018-06-19 18:20:44 UTC (rev 11104)
+++ trunk/sbin/newfs_msdos/newfs_msdos.8 2018-06-19 18:29:20 UTC (rev 11105)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1998 Robert Nordier
.\" All rights reserved.
.\"
@@ -23,9 +24,9 @@
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/sbin/newfs_msdos/newfs_msdos.8 307403 2016-10-16 22:02:50Z sevan $
.\"
-.Dd July 25, 2010
+.Dd April 9, 2015
.Dt NEWFS_MSDOS 8
.Os
.Sh NAME
@@ -112,7 +113,7 @@
.It Fl O Ar OEM
OEM string (up to 8 characters).
The default is
-.Qq Li "BSD 4.4" .
+.Qq Li "BSD4.4 " .
.It Fl S Ar sector-size
Number of bytes per sector.
Acceptable values are powers of 2
@@ -180,27 +181,27 @@
below.
.Bd -literal
struct bsbpb {
- u_int16_t bpbBytesPerSec; /* [-S] bytes per sector */
- u_int8_t bpbSecPerClust; /* [-c] sectors per cluster */
- u_int16_t bpbResSectors; /* [-r] reserved sectors */
- u_int8_t bpbFATs; /* [-n] number of FATs */
- u_int16_t bpbRootDirEnts; /* [-e] root directory entries */
- u_int16_t bpbSectors; /* [-s] total sectors */
- u_int8_t bpbMedia; /* [-m] media descriptor */
- u_int16_t bpbFATsecs; /* [-a] sectors per FAT */
- u_int16_t bpbSecPerTrack; /* [-u] sectors per track */
- u_int16_t bpbHeads; /* [-h] drive heads */
- u_int32_t bpbHiddenSecs; /* [-o] hidden sectors */
- u_int32_t bpbHugeSectors; /* [-s] big total sectors */
+ uint16_t bpbBytesPerSec; /* [-S] bytes per sector */
+ uint8_t bpbSecPerClust; /* [-c] sectors per cluster */
+ uint16_t bpbResSectors; /* [-r] reserved sectors */
+ uint8_t bpbFATs; /* [-n] number of FATs */
+ uint16_t bpbRootDirEnts; /* [-e] root directory entries */
+ uint16_t bpbSectors; /* [-s] total sectors */
+ uint8_t bpbMedia; /* [-m] media descriptor */
+ uint16_t bpbFATsecs; /* [-a] sectors per FAT */
+ uint16_t bpbSecPerTrack; /* [-u] sectors per track */
+ uint16_t bpbHeads; /* [-h] drive heads */
+ uint32_t bpbHiddenSecs; /* [-o] hidden sectors */
+ uint32_t bpbHugeSectors; /* [-s] big total sectors */
};
/* FAT32 extensions */
struct bsxbpb {
- u_int32_t bpbBigFATsecs; /* [-a] big sectors per FAT */
- u_int16_t bpbExtFlags; /* control flags */
- u_int16_t bpbFSVers; /* file system version */
- u_int32_t bpbRootClust; /* root directory start cluster */
- u_int16_t bpbFSInfo; /* [-i] file system info sector */
- u_int16_t bpbBackup; /* [-k] backup boot sector */
+ uint32_t bpbBigFATsecs; /* [-a] big sectors per FAT */
+ uint16_t bpbExtFlags; /* control flags */
+ uint16_t bpbFSVers; /* file system version */
+ uint32_t bpbRootClust; /* root directory start cluster */
+ uint16_t bpbFSInfo; /* [-i] file system info sector */
+ uint16_t bpbBackup; /* [-k] backup boot sector */
};
.Ed
.Sh LIMITATION
@@ -209,9 +210,9 @@
Exit status is 0 on success and 1 on error.
.Sh EXAMPLES
Create a file system, using default parameters, on
-.Pa /dev/ad0s1 :
+.Pa /dev/ada0s1 :
.Bd -literal -offset indent
-newfs_msdos /dev/ad0s1
+newfs_msdos /dev/ada0s1
.Ed
.Pp
Create a standard 1.44M file system, with volume label
@@ -228,9 +229,7 @@
newfs_msdos -C 30M - at 63s ./somefile
.Ed
.Sh SEE ALSO
-.Xr disktab 5 ,
-.Xr disklabel 8 ,
-.Xr fdisk 8 ,
+.Xr gpart 8 ,
.Xr newfs 8
.Sh HISTORY
The
@@ -238,4 +237,4 @@
utility first appeared in
.Fx 3.0 .
.Sh AUTHORS
-.An Robert Nordier Aq rnordier at FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier at FreeBSD.org
Property changes on: trunk/sbin/newfs_msdos/newfs_msdos.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/newfs_msdos/newfs_msdos.c
===================================================================
--- trunk/sbin/newfs_msdos/newfs_msdos.c 2018-06-19 18:20:44 UTC (rev 11104)
+++ trunk/sbin/newfs_msdos/newfs_msdos.c 2018-06-19 18:29:20 UTC (rev 11105)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
@@ -27,7 +28,7 @@
#ifndef lint
static const char rcsid[] =
- "$MidnightBSD$";
+ "$FreeBSD: stable/10/sbin/newfs_msdos/newfs_msdos.c 322860 2017-08-24 21:44:23Z mckusick $";
#endif /* not lint */
#include <sys/param.h>
@@ -51,50 +52,50 @@
#include <time.h>
#include <unistd.h>
-#define MAXU16 0xffff /* maximum unsigned 16-bit quantity */
-#define BPN 4 /* bits per nibble */
-#define NPB 2 /* nibbles per byte */
+#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 */
-#define RESFTE 2 /* reserved FAT entries */
-#define MINCLS12 1U /* minimum FAT12 clusters */
-#define MINCLS16 0x1000U /* minimum FAT16 clusters */
-#define MINCLS32 2U /* minimum FAT32 clusters */
-#define MAXCLS12 0xfedU /* maximum FAT12 clusters */
-#define MAXCLS16 0xfff5U /* maximum FAT16 clusters */
-#define MAXCLS32 0xffffff5U /* maximum FAT32 clusters */
+#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 */
+#define RESFTE 2 /* reserved FAT entries */
+#define MINCLS12 1U /* minimum FAT12 clusters */
+#define MINCLS16 0xff5U /* minimum FAT16 clusters */
+#define MINCLS32 0xfff5U /* minimum FAT32 clusters */
+#define MAXCLS12 0xff4U /* maximum FAT12 clusters */
+#define MAXCLS16 0xfff4U /* maximum FAT16 clusters */
+#define MAXCLS32 0xffffff4U /* maximum FAT32 clusters */
-#define mincls(fat) ((fat) == 12 ? MINCLS12 : \
+#define mincls(fat) ((fat) == 12 ? MINCLS12 : \
(fat) == 16 ? MINCLS16 : \
MINCLS32)
-#define maxcls(fat) ((fat) == 12 ? MAXCLS12 : \
+#define maxcls(fat) ((fat) == 12 ? MAXCLS12 : \
(fat) == 16 ? MAXCLS16 : \
MAXCLS32)
-#define mk1(p, x) \
+#define mk1(p, x) \
(p) = (u_int8_t)(x)
-#define mk2(p, x) \
+#define mk2(p, x) \
(p)[0] = (u_int8_t)(x), \
(p)[1] = (u_int8_t)((x) >> 010)
-#define mk4(p, x) \
+#define mk4(p, x) \
(p)[0] = (u_int8_t)(x), \
(p)[1] = (u_int8_t)((x) >> 010), \
(p)[2] = (u_int8_t)((x) >> 020), \
(p)[3] = (u_int8_t)((x) >> 030)
-#define argto1(arg, lo, msg) argtou(arg, lo, 0xff, msg)
-#define argto2(arg, lo, msg) argtou(arg, lo, 0xffff, msg)
-#define argto4(arg, lo, msg) argtou(arg, lo, 0xffffffff, msg)
-#define argtox(arg, lo, msg) argtou(arg, lo, UINT_MAX, msg)
+#define argto1(arg, lo, msg) argtou(arg, lo, 0xff, msg)
+#define argto2(arg, lo, msg) argtou(arg, lo, 0xffff, msg)
+#define argto4(arg, lo, msg) argtou(arg, lo, 0xffffffff, msg)
+#define argtox(arg, lo, msg) argtou(arg, lo, UINT_MAX, msg)
struct bs {
u_int8_t bsJump[3]; /* bootstrap entry point */
@@ -131,7 +132,7 @@
u_int8_t exReserved1; /* reserved */
u_int8_t exBootSignature; /* extended boot signature */
u_int8_t exVolumeID[4]; /* volume ID number */
- u_int8_t exVolumeLabel[11]; /* volume label */
+ u_int8_t exVolumeLabel[11]; /* volume label */
u_int8_t exFileSysType[8]; /* file system type */
} __packed;
@@ -139,8 +140,8 @@
u_int8_t deName[11]; /* name and extension */
u_int8_t deAttributes; /* attributes */
u_int8_t rsvd[10]; /* reserved */
- u_int8_t deMTime[2]; /* creation time */
- u_int8_t deMDate[2]; /* creation date */
+ u_int8_t deMTime[2]; /* last-modified time */
+ u_int8_t deMDate[2]; /* last-modified date */
u_int8_t deStartCluster[2]; /* starting cluster */
u_int8_t deFileSize[4]; /* size */
} __packed;
@@ -164,7 +165,7 @@
u_int bpbBackup; /* backup boot sector */
};
-#define BPBGAP 0, 0, 0, 0, 0, 0
+#define BPBGAP 0, 0, 0, 0, 0, 0
static struct {
const char *name;
@@ -174,10 +175,10 @@
{"180", {512, 1, 1, 2, 64, 360, 0xfc, 2, 9, 1, BPBGAP}},
{"320", {512, 2, 1, 2, 112, 640, 0xff, 1, 8, 2, BPBGAP}},
{"360", {512, 2, 1, 2, 112, 720, 0xfd, 2, 9, 2, BPBGAP}},
- {"640", {512, 2, 1, 2, 112, 1280, 0xfb, 2, 8, 2, BPBGAP}},
+ {"640", {512, 2, 1, 2, 112, 1280, 0xfb, 2, 8, 2, BPBGAP}},
{"720", {512, 2, 1, 2, 112, 1440, 0xf9, 3, 9, 2, BPBGAP}},
{"1200", {512, 1, 1, 2, 224, 2400, 0xf9, 7, 15, 2, BPBGAP}},
- {"1232", {1024,1, 1, 2, 192, 1232, 0xfe, 2, 8, 2, BPBGAP}},
+ {"1232", {1024,1, 1, 2, 192, 1232, 0xfe, 2, 8, 2, BPBGAP}},
{"1440", {512, 1, 1, 2, 224, 2880, 0xf0, 9, 18, 2, BPBGAP}},
{"2880", {512, 2, 1, 2, 240, 5760, 0xf0, 9, 36, 2, BPBGAP}}
};
@@ -689,7 +690,7 @@
((u_int)tm->tm_hour << 8 |
(u_int)tm->tm_min));
mk4(bsx->exVolumeID, x);
- mklabel(bsx->exVolumeLabel, opt_L ? opt_L : "NO_NAME");
+ mklabel(bsx->exVolumeLabel, opt_L ? opt_L : "NO NAME");
sprintf(buf, "FAT%u", fat);
setstr(bsx->exFileSysType, buf, sizeof(bsx->exFileSysType));
if (!opt_B) {
@@ -829,29 +830,27 @@
if (lp == NULL) {
if (bpb->bpbBytesPerSec)
dlp.d_secsize = bpb->bpbBytesPerSec;
- if (ioctl(fd, DIOCGDINFO, &dlp) == -1) {
- if (bpb->bpbBytesPerSec == 0 && ioctl(fd, DIOCGSECTORSIZE,
- &dlp.d_secsize) == -1)
- err(1, "cannot get sector size");
+ if (bpb->bpbBytesPerSec == 0 && ioctl(fd, DIOCGSECTORSIZE,
+ &dlp.d_secsize) == -1)
+ err(1, "cannot get sector size");
- dlp.d_secperunit = ms / dlp.d_secsize;
+ dlp.d_secperunit = ms / dlp.d_secsize;
- if (bpb->bpbSecPerTrack == 0 && ioctl(fd, DIOCGFWSECTORS,
- &dlp.d_nsectors) == -1) {
- warn("cannot get number of sectors per track");
- dlp.d_nsectors = 63;
- }
- if (bpb->bpbHeads == 0 &&
- ioctl(fd, DIOCGFWHEADS, &dlp.d_ntracks) == -1) {
- warn("cannot get number of heads");
- if (dlp.d_secperunit <= 63*1*1024)
- dlp.d_ntracks = 1;
- else if (dlp.d_secperunit <= 63*16*1024)
- dlp.d_ntracks = 16;
- else
- dlp.d_ntracks = 255;
- }
+ if (bpb->bpbSecPerTrack == 0 && ioctl(fd, DIOCGFWSECTORS,
+ &dlp.d_nsectors) == -1) {
+ warn("cannot get number of sectors per track");
+ dlp.d_nsectors = 63;
}
+ if (bpb->bpbHeads == 0 &&
+ ioctl(fd, DIOCGFWHEADS, &dlp.d_ntracks) == -1) {
+ warn("cannot get number of heads");
+ if (dlp.d_secperunit <= 63*1*1024)
+ dlp.d_ntracks = 1;
+ else if (dlp.d_secperunit <= 63*16*1024)
+ dlp.d_ntracks = 16;
+ else
+ dlp.d_ntracks = 255;
+ }
hs = (ms / dlp.d_secsize) - dlp.d_secperunit;
lp = &dlp;
@@ -1029,7 +1028,7 @@
fprintf(stderr,
"usage: newfs_msdos [ -options ] special [disktype]\n"
"where the options are:\n"
- "\t-@ create file system at specified offset\n"
+ "\t-@ create file system at specified offset\n"
"\t-B get bootstrap from file\n"
"\t-C create image file with specified size\n"
"\t-F FAT type (12, 16, or 32)\n"
More information about the Midnightbsd-cvs
mailing list