Merge ufs/{ufs,ffs}/ into ffs/.

13 files changed, 36 insertions, 38 deletions

diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index 88c6ece9cb9..522b92fc3d0 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2016/10/18 17:05:30 natano Exp $
+#	$OpenBSD: Makefile,v 1.9 2016/10/18 17:23:21 natano Exp $
 #	$NetBSD: Makefile,v 1.36 2013/08/05 14:41:57 reinoud Exp $
 #
 
@@ -30,7 +30,6 @@ CPPFLAGS+=	-I${.CURDIR}
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil
 
-.PATH:	${.CURDIR}/cd9660 ${.CURDIR}/ffs ${.CURDIR}/ufs/ffs \
-	${.CURDIR}/msdos
+.PATH:	${.CURDIR}/cd9660 ${.CURDIR}/ffs ${.CURDIR}/msdos
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index c15331d13dd..ee4932ef31b 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.c,v 1.9 2016/10/17 07:54:17 natano Exp $	*/
+/*	$OpenBSD: ffs.c,v 1.10 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $	*/
 
 /*
@@ -81,10 +81,10 @@
 #include "makefs.h"
 #include "ffs.h"
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ffs/fs.h>
-#include <ufs/ufs/ufs_bswap.h>
+#include "ffs/dinode.h"
+#include "ffs/dir.h"
+#include "ffs/fs.h"
+#include "ffs/ufs_bswap.h"
 
 #include "ffs/ufs_inode.h"
 #include "ffs/newfs_extern.h"
diff --git a/usr.sbin/makefs/ffs.h b/usr.sbin/makefs/ffs.h
index 590e477ffed..344dfcfec7a 100644
--- a/usr.sbin/makefs/ffs.h
+++ b/usr.sbin/makefs/ffs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: ffs.h,v 1.3 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: ffs.h,v 1.2 2011/10/09 21:33:43 christos Exp $	*/
 
 /*
@@ -39,8 +39,8 @@
 #ifndef _FFS_H
 #define _FFS_H
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include "ffs/dinode.h"
+#include "ffs/fs.h"
 
 typedef struct {
 	char	label[MAXVOLLEN];	/* volume name/label */
diff --git a/usr.sbin/makefs/ufs/ufs/dinode.h b/usr.sbin/makefs/ffs/dinode.h
index d32fd09b370..67116582a87 100644
--- a/usr.sbin/makefs/ufs/ufs/dinode.h
+++ b/usr.sbin/makefs/ffs/dinode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dinode.h,v 1.3 2016/10/17 14:06:32 natano Exp $	*/
+/*	$OpenBSD: dinode.h,v 1.1 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: dinode.h,v 1.25 2016/01/22 23:06:10 dholland Exp $	*/
 
 /*
diff --git a/usr.sbin/makefs/ufs/ufs/dir.h b/usr.sbin/makefs/ffs/dir.h
index fd849fddf13..760c915cfc6 100644
--- a/usr.sbin/makefs/ufs/ufs/dir.h
+++ b/usr.sbin/makefs/ffs/dir.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.h,v 1.4 2016/10/17 14:06:32 natano Exp $	*/
+/*	$OpenBSD: dir.h,v 1.1 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: dir.h,v 1.25 2015/09/01 06:16:03 dholland Exp $	*/
 
 /*
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index cdff6ae5c2b..4a6ea51df7c 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_alloc.c,v 1.7 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: ffs_alloc.c,v 1.8 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: ffs_alloc.c,v 1.29 2016/06/24 19:24:11 christos Exp $	*/
 /* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
 
@@ -46,9 +46,9 @@
 
 #include <errno.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ffs/fs.h>
+#include "ffs/dinode.h"
+#include "ffs/ufs_bswap.h"
+#include "ffs/fs.h"
 
 #include "ffs/buf.h"
 #include "ffs/ufs_inode.h"
diff --git a/usr.sbin/makefs/ffs/ffs_balloc.c b/usr.sbin/makefs/ffs/ffs_balloc.c
index 15b143026aa..be13c24a3a9 100644
--- a/usr.sbin/makefs/ffs/ffs_balloc.c
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_balloc.c,v 1.5 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: ffs_balloc.c,v 1.6 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: ffs_balloc.c,v 1.21 2015/03/29 05:52:59 agc Exp $	*/
 /* From NetBSD: ffs_balloc.c,v 1.25 2001/08/08 08:36:36 lukem Exp */
 
@@ -38,9 +38,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ffs/fs.h>
+#include "ffs/dinode.h"
+#include "ffs/ufs_bswap.h"
+#include "ffs/fs.h"
 
 #include "ffs/buf.h"
 #include "ffs/ufs_inode.h"
diff --git a/usr.sbin/makefs/ufs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c
index 34bb5957867..20103af864b 100644
--- a/usr.sbin/makefs/ufs/ffs/ffs_subr.c
+++ b/usr.sbin/makefs/ffs/ffs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_subr.c,v 1.6 2016/10/17 13:45:38 natano Exp $	*/
+/*	$OpenBSD: ffs_subr.c,v 1.1 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: ffs_subr.c,v 1.49 2016/05/07 11:59:08 maxv Exp $	*/
 
 /*
@@ -38,10 +38,9 @@
 extern const int inside[], around[];
 extern const u_char * const fragtbl[];
 
-#include <ufs/ffs/fs.h>
-#include <ufs/ufs/ufs_bswap.h>
-
-#include <ufs/ufs/dinode.h>
+#include "ffs/fs.h"
+#include "ffs/ufs_bswap.h"
+#include "ffs/dinode.h"
 
 #include "ffs/ffs_extern.h"
 
diff --git a/usr.sbin/makefs/ufs/ffs/ffs_tables.c b/usr.sbin/makefs/ffs/ffs_tables.c
index ebbfb9c095f..2daa2c6537d 100644
--- a/usr.sbin/makefs/ufs/ffs/ffs_tables.c
+++ b/usr.sbin/makefs/ffs/ffs_tables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_tables.c,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: ffs_tables.c,v 1.1 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: ffs_tables.c,v 1.9 2005/12/11 12:25:25 christos Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 
 #include <sys/param.h>
 
-#include <ufs/ffs/fs.h>
+#include "ffs/fs.h"
 
 /*
  * Bit patterns for identifying fragments in the block map
diff --git a/usr.sbin/makefs/ufs/ffs/fs.h b/usr.sbin/makefs/ffs/fs.h
index 5f12f5448d7..0f4223e6f8d 100644
--- a/usr.sbin/makefs/ufs/ffs/fs.h
+++ b/usr.sbin/makefs/ffs/fs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fs.h,v 1.3 2016/10/17 14:06:32 natano Exp $	*/
+/*	$OpenBSD: fs.h,v 1.1 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: fs.h,v 1.66 2015/02/14 09:06:11 maxv Exp $	*/
 
 /*
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index d8a7f3e4084..a5166b11abd 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs.c,v 1.3 2016/10/16 21:59:28 tedu Exp $	*/
+/*	$OpenBSD: mkfs.c,v 1.4 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: mkfs.c,v 1.34 2016/06/24 19:24:11 christos Exp $	*/
 
 /*
@@ -53,9 +53,9 @@
 #include "makefs.h"
 #include "ffs.h"
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ffs/fs.h>
+#include "ffs/dinode.h"
+#include "ffs/ufs_bswap.h"
+#include "ffs/fs.h"
 
 #include "ffs/ufs_inode.h"
 #include "ffs/ffs_extern.h"
diff --git a/usr.sbin/makefs/ffs/ufs_bmap.c b/usr.sbin/makefs/ffs/ufs_bmap.c
index 804e4ac4ae4..c738b361492 100644
--- a/usr.sbin/makefs/ffs/ufs_bmap.c
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_bmap.c,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: ufs_bmap.c,v 1.3 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: ufs_bmap.c,v 1.18 2013/06/19 17:51:27 dholland Exp $	*/
 /* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */
 
@@ -47,9 +47,9 @@
 
 #include "makefs.h"
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ffs/fs.h>
+#include "ffs/dinode.h"
+#include "ffs/ufs_bswap.h"
+#include "ffs/fs.h"
 
 #include "ffs/ufs_inode.h"
 #include "ffs/ffs_extern.h"
diff --git a/usr.sbin/makefs/ufs/ufs/ufs_bswap.h b/usr.sbin/makefs/ffs/ufs_bswap.h
index a05135afca0..4c8aa1af5fa 100644
--- a/usr.sbin/makefs/ufs/ufs/ufs_bswap.h
+++ b/usr.sbin/makefs/ffs/ufs_bswap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_bswap.h,v 1.5 2016/10/16 22:26:34 tedu Exp $	*/
+/*	$OpenBSD: ufs_bswap.h,v 1.1 2016/10/18 17:23:21 natano Exp $	*/
 /*	$NetBSD: ufs_bswap.h,v 1.21 2016/04/29 03:05:04 christos Exp $	*/
 
 /*