From owner-svn-src-projects@FreeBSD.ORG  Fri Oct  5 19:02:08 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4A29A1065670;
	Fri,  5 Oct 2012 19:02:08 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C5EE8FC12;
	Fri,  5 Oct 2012 19:02:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q95J27RW024986;
	Fri, 5 Oct 2012 19:02:07 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q95J27ks024983;
	Fri, 5 Oct 2012 19:02:07 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201210051902.q95J27ks024983@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 5 Oct 2012 19:02:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241232 - projects/mtree/usr.sbin/makefs
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2012 19:02:08 -0000

Author: brooks
Date: Fri Oct  5 19:02:07 2012
New Revision: 241232
URL: http://svn.freebsd.org/changeset/base/241232

Log:
  Teach makefs about netbsd's mtree.  This makes the -F option usable in
  practice.

Modified:
  projects/mtree/usr.sbin/makefs/Makefile
  projects/mtree/usr.sbin/makefs/walk.c

Modified: projects/mtree/usr.sbin/makefs/Makefile
==============================================================================
--- projects/mtree/usr.sbin/makefs/Makefile	Fri Oct  5 18:42:50 2012	(r241231)
+++ projects/mtree/usr.sbin/makefs/Makefile	Fri Oct  5 19:02:07 2012	(r241232)
@@ -20,14 +20,22 @@ WARNS?=	2
 CFLAGS+=-DHAVE_STRUCT_STAT_ST_FLAGS=1
 CFLAGS+=-DHAVE_STRUCT_STAT_ST_GEN=1
 
-.PATH:	${.CURDIR}/../mtree
-CFLAGS+=-I${.CURDIR}/../mtree
+.PATH:	${.CURDIR}/../../contrib/mtree
+CFLAGS+=-I${.CURDIR}/../../contrib/mtree
 SRCS+=	misc.c spec.c
 
+.PATH:	${.CURDIR}/../nmtree
+CFLAGS+=-I${.CURDIR}/../nmtree
+SRCS+=	util.c
+
+.PATH:	${.CURDIR}/../../contrib/mknod
+CFLAGS+=-I${.CURDIR}/../../contrib/mknod
+SRCS+=	pack_dev.c
+
 .PATH:	${.CURDIR}/../../sys/ufs/ffs
 SRCS+=	ffs_tables.c
 
 DPADD=  ${LIBSBUF}
-LDADD=  -lsbuf
+LDADD=  -lsbuf -lutil
 
 .include <bsd.prog.mk>

Modified: projects/mtree/usr.sbin/makefs/walk.c
==============================================================================
--- projects/mtree/usr.sbin/makefs/walk.c	Fri Oct  5 18:42:50 2012	(r241231)
+++ projects/mtree/usr.sbin/makefs/walk.c	Fri Oct  5 19:02:07 2012	(r241232)
@@ -305,7 +305,7 @@ apply_specfile(const char *specfile, con
 	if ((fp = fopen(specfile, "r")) == NULL)
 		err(1, "Can't open `%s'", specfile);
 	TIMER_START(start);
-	root = mtree_readspec(fp);
+	root = spec(fp);
 	TIMER_RESULTS(start, "spec");
 	if (fclose(fp) == EOF)
 		err(1, "Can't close `%s'", specfile);
@@ -321,33 +321,6 @@ apply_specfile(const char *specfile, con
 
 }
 
-static u_int
-nodetoino(u_int type)
-{
-
-	switch (type) {
-	case F_BLOCK:
-		return S_IFBLK;
-	case F_CHAR:
-		return S_IFCHR;
-	case F_DIR:
-		return S_IFDIR;
-	case F_FIFO:
-		return S_IFIFO;
-	case F_FILE:
-		return S_IFREG;
-	case F_LINK:
-		return S_IFLNK;
-	case F_SOCK:
-		return S_IFSOCK;
-	default:
-		printf("unknown type %d", type);
-		abort();
-	}
-	/* NOTREACHED */
-}
-
-
 static void
 apply_specdir(const char *dir, NODE *specnode, fsnode *dirnode, int speconly)
 {