svn commit: r320291 - in head/usr.sbin/makefs: . msdos
Ed Maste
emaste at FreeBSD.org
Fri Jun 23 18:58:30 UTC 2017
Author: emaste
Date: Fri Jun 23 18:58:28 2017
New Revision: 320291
URL: https://svnweb.freebsd.org/changeset/base/320291
Log:
makefs: add copies of NetBSD makefs msdos source files
We do not treat makefs as contrib code. Import copies of makefs msdos
files from NetBSD so that we can track our changes to these files.
These are copied from NetBSD, with only a change to use __FBSDID and
$FreeBSD$ instead of __KERNEL_RCSID and $NetBSD$. A copy of the
original $NetBSD$ tag remains in each source file.
These two files were missed in r320212. Also remove a stray blank line
added in msdosfs_vfsops.c.
Submitted by: Siva Mahadevan
Sponsored by: The FreeBSD Foundation
Added:
head/usr.sbin/makefs/msdos.c (contents, props changed)
head/usr.sbin/makefs/msdos.h (contents, props changed)
Modified:
head/usr.sbin/makefs/msdos/msdosfs_vfsops.c
Added: head/usr.sbin/makefs/msdos.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/makefs/msdos.c Fri Jun 23 18:58:28 2017 (r320291)
@@ -0,0 +1,272 @@
+/* $NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 christos Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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 distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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>
+#if defined(__RCSID) && !defined(__lint)
+__FBSDID("$FreeBSD$");
+#endif /* !__lint */
+
+#include <sys/param.h>
+
+#if !HAVE_NBTOOL_CONFIG_H
+#include <sys/mount.h>
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <util.h>
+
+#include <ffs/buf.h>
+#include <fs/msdosfs/bpb.h>
+#include <fs/msdosfs/denode.h>
+#include <fs/msdosfs/msdosfsmount.h>
+#include "makefs.h"
+#include "msdos.h"
+#include "mkfs_msdos.h"
+
+static int msdos_populate_dir(const char *, struct denode *, fsnode *,
+ fsnode *, fsinfo_t *);
+
+struct msdos_options_ex {
+ struct msdos_options options;
+ bool utf8;
+};
+
+void
+msdos_prep_opts(fsinfo_t *fsopts)
+{
+ struct msdos_options_ex *msdos_opt = ecalloc(1, sizeof(*msdos_opt));
+ const option_t msdos_options[] = {
+#define AOPT(_opt, _type, _name, _min, _desc) { \
+ .letter = _opt, \
+ .name = # _name, \
+ .type = _min == -1 ? OPT_STRPTR : \
+ (_min == -2 ? OPT_BOOL : \
+ (sizeof(_type) == 1 ? OPT_INT8 : \
+ (sizeof(_type) == 2 ? OPT_INT16 : \
+ (sizeof(_type) == 4 ? OPT_INT32 : OPT_INT64)))), \
+ .value = &msdos_opt->options._name, \
+ .minimum = _min, \
+ .maximum = sizeof(_type) == 1 ? 0xff : \
+ (sizeof(_type) == 2 ? 0xffff : \
+ (sizeof(_type) == 4 ? 0xffffffff : 0xffffffffffffffffLL)), \
+ .desc = _desc, \
+},
+ALLOPTS
+#undef AOPT
+ { 'U', "utf8", &msdos_opt->utf8, OPT_BOOL,
+ 0, 1, "Use UTF8 names" },
+ { .name = NULL }
+ };
+
+ fsopts->fs_specific = msdos_opt;
+ fsopts->fs_options = copy_opts(msdos_options);
+}
+
+void
+msdos_cleanup_opts(fsinfo_t *fsopts)
+{
+ free(fsopts->fs_specific);
+ free(fsopts->fs_options);
+}
+
+int
+msdos_parse_opts(const char *option, fsinfo_t *fsopts)
+{
+ struct msdos_options *msdos_opt = fsopts->fs_specific;
+ option_t *msdos_options = fsopts->fs_options;
+
+ int rv;
+
+ assert(option != NULL);
+ assert(fsopts != NULL);
+ assert(msdos_opt != NULL);
+
+ if (debug & DEBUG_FS_PARSE_OPTS)
+ printf("msdos_parse_opts: got `%s'\n", option);
+
+ rv = set_option(msdos_options, option, NULL, 0);
+ if (rv == -1)
+ return rv;
+
+ if (strcmp(msdos_options[rv].name, "volume_id") == 0)
+ msdos_opt->volume_id_set = 1;
+ else if (strcmp(msdos_options[rv].name, "media_descriptor") == 0)
+ msdos_opt->media_descriptor_set = 1;
+ else if (strcmp(msdos_options[rv].name, "hidden_sectors") == 0)
+ msdos_opt->hidden_sectors_set = 1;
+
+ if (stampst.st_ino) {
+ msdos_opt->timestamp_set = 1;
+ msdos_opt->timestamp = stampst.st_mtime;
+ }
+
+ return 1;
+}
+
+
+void
+msdos_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts)
+{
+ struct msdos_options_ex *msdos_opt = fsopts->fs_specific;
+ struct vnode vp, rootvp;
+ struct timeval start;
+ struct msdosfsmount *pmp;
+ uint32_t flags;
+
+ assert(image != NULL);
+ assert(dir != NULL);
+ assert(root != NULL);
+ assert(fsopts != NULL);
+
+ fsopts->size = fsopts->maxsize;
+ msdos_opt->options.create_size = MAX(msdos_opt->options.create_size,
+ fsopts->offset + fsopts->size);
+ msdos_opt->options.offset = fsopts->offset;
+ if (msdos_opt->options.bytes_per_sector == 0) {
+ if (fsopts->sectorsize == -1)
+ fsopts->sectorsize = 512;
+ msdos_opt->options.bytes_per_sector = fsopts->sectorsize;
+ } else if (fsopts->sectorsize == -1) {
+ fsopts->sectorsize = msdos_opt->options.bytes_per_sector;
+ } else if (fsopts->sectorsize != msdos_opt->options.bytes_per_sector) {
+ err(1, "inconsistent sectorsize -S %u"
+ "!= -o bytes_per_sector %u",
+ fsopts->sectorsize, msdos_opt->options.bytes_per_sector);
+ }
+
+ /* create image */
+ printf("Creating `%s'\n", image);
+ TIMER_START(start);
+ if (mkfs_msdos(image, NULL, &msdos_opt->options) == -1)
+ return;
+ TIMER_RESULTS(start, "mkfs_msdos");
+
+ fsopts->fd = open(image, O_RDWR);
+ vp.fs = fsopts;
+
+ flags = 0;
+ if (msdos_opt->utf8)
+ flags |= MSDOSFSMNT_UTF8;
+
+ if ((pmp = msdosfs_mount(&vp, flags)) == NULL)
+ err(1, "msdosfs_mount");
+
+ if (msdosfs_root(pmp, &rootvp) != 0)
+ err(1, "msdosfs_root");
+
+ if (debug & DEBUG_FS_MAKEFS)
+ printf("msdos_makefs: image %s directory %s root %p\n",
+ image, dir, root);
+
+ /* populate image */
+ printf("Populating `%s'\n", image);
+ TIMER_START(start);
+ if (msdos_populate_dir(dir, VTODE(&rootvp), root, root, fsopts) == -1)
+ errx(1, "Image file `%s' not created.", image);
+ TIMER_RESULTS(start, "msdos_populate_dir");
+
+ if (debug & DEBUG_FS_MAKEFS)
+ putchar('\n');
+
+ /* ensure no outstanding buffers remain */
+ if (debug & DEBUG_FS_MAKEFS)
+ bcleanup();
+
+ printf("Image `%s' complete\n", image);
+}
+
+static int
+msdos_populate_dir(const char *path, struct denode *dir, fsnode *root,
+ fsnode *parent, fsinfo_t *fsopts)
+{
+ fsnode *cur;
+ char pbuf[MAXPATHLEN];
+
+ assert(dir != NULL);
+ assert(root != NULL);
+ assert(fsopts != NULL);
+
+ for (cur = root->next; cur != NULL; cur = cur->next) {
+ if ((size_t)snprintf(pbuf, sizeof(pbuf), "%s/%s", path,
+ cur->name) >= sizeof(pbuf)) {
+ warnx("path %s too long", pbuf);
+ return -1;
+ }
+
+ if ((cur->inode->flags & FI_ALLOCATED) == 0) {
+ cur->inode->flags |= FI_ALLOCATED;
+ if (cur != root) {
+ fsopts->curinode++;
+ cur->inode->ino = fsopts->curinode;
+ cur->parent = parent;
+ }
+ }
+
+ if (cur->inode->flags & FI_WRITTEN) {
+ continue; // hard link
+ }
+ cur->inode->flags |= FI_WRITTEN;
+
+ if (cur->child) {
+ struct denode *de;
+ if ((de = msdosfs_mkdire(pbuf, dir, cur)) == NULL) {
+ warn("msdosfs_mkdire %s", pbuf);
+ return -1;
+ }
+ if (msdos_populate_dir(pbuf, de, cur->child, cur,
+ fsopts) == -1) {
+ warn("msdos_populate_dir %s", pbuf);
+ return -1;
+ }
+ continue;
+ } else if (!S_ISREG(cur->type)) {
+ warnx("skipping non-regular file %s/%s", cur->path,
+ cur->name);
+ continue;
+ }
+ if (msdosfs_mkfile(pbuf, dir, cur) == NULL) {
+ warn("msdosfs_mkfile %s", pbuf);
+ return -1;
+ }
+ }
+ return 0;
+}
Added: head/usr.sbin/makefs/msdos.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/makefs/msdos.h Fri Jun 23 18:58:28 2017 (r320291)
@@ -0,0 +1,40 @@
+/* $FreeBSD$ */
+/* $NetBSD: msdos.h,v 1.3 2015/10/16 16:40:02 christos Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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 distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+struct vnode;
+struct denode;
+
+struct msdosfsmount *msdosfs_mount(struct vnode *, int);
+int msdosfs_root(struct msdosfsmount *, struct vnode *);
+
+struct denode *msdosfs_mkfile(const char *, struct denode *, fsnode *);
+struct denode *msdosfs_mkdire(const char *, struct denode *, fsnode *);
Modified: head/usr.sbin/makefs/msdos/msdosfs_vfsops.c
==============================================================================
--- head/usr.sbin/makefs/msdos/msdosfs_vfsops.c Fri Jun 23 18:57:56 2017 (r320290)
+++ head/usr.sbin/makefs/msdos/msdosfs_vfsops.c Fri Jun 23 18:58:28 2017 (r320291)
@@ -1,4 +1,3 @@
-
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1995, 1997 TooLs GmbH.
More information about the svn-src-all
mailing list