Merge fs/msdosfs/ and newfs_msdos/ into msdos/.

17 files changed, 58 insertions, 57 deletions

diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index 13ea8c53011..88c6ece9cb9 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2016/10/18 16:50:55 natano Exp $
+#	$OpenBSD: Makefile,v 1.8 2016/10/18 17:05:30 natano Exp $
 #	$NetBSD: Makefile,v 1.36 2013/08/05 14:41:57 reinoud Exp $
 #
 
@@ -24,13 +24,13 @@ SRCS+=	msdosfs_lookup.c msdosfs_denode.c msdosfs_vnops.c msdosfs_unicode.c
 
 MAN=	makefs.8
 
-CPPFLAGS+=	-I${.CURDIR} -I${.CURDIR}/fs/msdosfs -I${.CURDIR}/newfs_msdos
+CPPFLAGS+=	-I${.CURDIR}
 #CPPFLAGS+=	-DMSDOSFS_DEBUG
 
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil
 
 .PATH:	${.CURDIR}/cd9660 ${.CURDIR}/ffs ${.CURDIR}/ufs/ffs \
-	${.CURDIR}/msdos ${.CURDIR}/fs/msdosfs ${.CURDIR}/newfs_msdos
+	${.CURDIR}/msdos
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c
index 096cdfb0daf..6daed37f5f3 100644
--- a/usr.sbin/makefs/msdos.c
+++ b/usr.sbin/makefs/msdos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdos.c,v 1.5 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: msdos.c,v 1.6 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: msdos.c,v 1.16 2016/01/30 09:59:27 mlelstv Exp $	*/
 
 /*-
@@ -38,11 +38,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ffs/buf.h>
-#include <fs/msdosfs/denode.h>
+#include "ffs/buf.h"
+#include "msdos/denode.h"
 #include "makefs.h"
 #include "msdos.h"
-#include "mkfs_msdos.h"
+#include "msdos/mkfs_msdos.h"
 
 static int msdos_populate_dir(const char *, struct denode *, fsnode *,
     fsnode *, fsinfo_t *);
diff --git a/usr.sbin/makefs/fs/msdosfs/bootsect.h b/usr.sbin/makefs/msdos/bootsect.h
index d59344decfe..071f6e975ce 100644
--- a/usr.sbin/makefs/fs/msdosfs/bootsect.h
+++ b/usr.sbin/makefs/msdos/bootsect.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootsect.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: bootsect.h,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: bootsect.h,v 1.6 2016/01/22 22:48:18 dholland Exp $	*/
 
 /*
diff --git a/usr.sbin/makefs/fs/msdosfs/bpb.h b/usr.sbin/makefs/msdos/bpb.h
index 91bee23cb86..7a1f2b69831 100644
--- a/usr.sbin/makefs/fs/msdosfs/bpb.h
+++ b/usr.sbin/makefs/msdos/bpb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpb.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: bpb.h,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: bpb.h,v 1.8 2016/01/22 22:53:36 dholland Exp $	*/
 
 /*
diff --git a/usr.sbin/makefs/fs/msdosfs/denode.h b/usr.sbin/makefs/msdos/denode.h
index 57612a62ad2..2e947ccfcfa 100644
--- a/usr.sbin/makefs/fs/msdosfs/denode.h
+++ b/usr.sbin/makefs/msdos/denode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: denode.h,v 1.6 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: denode.h,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: denode.h,v 1.24 2014/07/08 09:21:52 hannken Exp $	*/
 
 /*-
diff --git a/usr.sbin/makefs/fs/msdosfs/direntry.h b/usr.sbin/makefs/msdos/direntry.h
index 87857424ad0..1b671ebb30e 100644
--- a/usr.sbin/makefs/fs/msdosfs/direntry.h
+++ b/usr.sbin/makefs/msdos/direntry.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: direntry.h,v 1.2 2016/10/16 18:55:10 natano Exp $	*/
+/*	$OpenBSD: direntry.h,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: direntry.h,v 1.13 1997/10/17 11:23:45 ws Exp $	*/
 
 /*-
diff --git a/usr.sbin/makefs/fs/msdosfs/fat.h b/usr.sbin/makefs/msdos/fat.h
index 75a83367504..2e70b1bbca2 100644
--- a/usr.sbin/makefs/fs/msdosfs/fat.h
+++ b/usr.sbin/makefs/msdos/fat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fat.h,v 1.4 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: fat.h,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: fat.h,v 1.9 2014/10/18 08:33:28 snj Exp $	*/
 
 /*-
diff --git a/usr.sbin/makefs/newfs_msdos/mkfs_msdos.c b/usr.sbin/makefs/msdos/mkfs_msdos.c
index 8090e46ec4b..42037efe06b 100644
--- a/usr.sbin/makefs/newfs_msdos/mkfs_msdos.c
+++ b/usr.sbin/makefs/msdos/mkfs_msdos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs_msdos.c,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: mkfs_msdos.c,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: mkfs_msdos.c,v 1.10 2016/04/03 11:00:13 mlelstv Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 #include <util.h>
 #include <disktab.h>
 
-#include "mkfs_msdos.h"
+#include "msdos/mkfs_msdos.h"
 
 #define MAXU16	  0xffff	/* maximum unsigned 16-bit quantity */
 #define BPN	  4		/* bits per nibble */
diff --git a/usr.sbin/makefs/newfs_msdos/mkfs_msdos.h b/usr.sbin/makefs/msdos/mkfs_msdos.h
index 8f61c4243ca..6ee2406f7a6 100644
--- a/usr.sbin/makefs/newfs_msdos/mkfs_msdos.h
+++ b/usr.sbin/makefs/msdos/mkfs_msdos.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs_msdos.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: mkfs_msdos.h,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: mkfs_msdos.h,v 1.3 2015/10/16 17:38:17 christos Exp $	*/
 
 /*-
diff --git a/usr.sbin/makefs/fs/msdosfs/msdosfs_conv.c b/usr.sbin/makefs/msdos/msdosfs_conv.c
index d606b6e73b4..ce904ebf157 100644
--- a/usr.sbin/makefs/fs/msdosfs/msdosfs_conv.c
+++ b/usr.sbin/makefs/msdos/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_conv.c,v 1.3 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: msdosfs_conv.c,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: msdosfs_conv.c,v 1.24 1997/10/17 11:23:54 ws Exp $	*/
 
 /*-
@@ -59,8 +59,8 @@
 /*
  * MSDOSFS include files.
  */
-#include <fs/msdosfs/direntry.h>
-#include <fs/msdosfs/denode.h>
+#include "msdos/direntry.h"
+#include "msdos/denode.h"
 
 /*
  * Days in each month in a regular year.
diff --git a/usr.sbin/makefs/msdos/msdosfs_denode.c b/usr.sbin/makefs/msdos/msdosfs_denode.c
index b57e812b452..4e10961f289 100644
--- a/usr.sbin/makefs/msdos/msdosfs_denode.c
+++ b/usr.sbin/makefs/msdos/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_denode.c,v 1.4 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: msdosfs_denode.c,v 1.5 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: msdosfs_denode.c,v 1.7 2015/03/29 05:52:59 agc Exp $	*/
 
 /*-
@@ -50,13 +50,13 @@
 
 #include <sys/param.h>
 
-#include <ffs/buf.h>
+#include "ffs/buf.h"
 
-#include <fs/msdosfs/bpb.h>
-#include <fs/msdosfs/msdosfsmount.h>
-#include <fs/msdosfs/direntry.h>
-#include <fs/msdosfs/denode.h>
-#include <fs/msdosfs/fat.h>
+#include "msdos/bpb.h"
+#include "msdos/msdosfsmount.h"
+#include "msdos/direntry.h"
+#include "msdos/denode.h"
+#include "msdos/fat.h"
 
 #include <util.h>
 
diff --git a/usr.sbin/makefs/fs/msdosfs/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c
index a68d2905ed1..86e25a5b7c7 100644
--- a/usr.sbin/makefs/fs/msdosfs/msdosfs_fat.c
+++ b/usr.sbin/makefs/msdos/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_fat.c,v 1.3 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: msdosfs_fat.c,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: msdosfs_fat.c,v 1.31 2016/05/07 16:43:02 mlelstv Exp $	*/
 
 /*-
@@ -53,16 +53,17 @@
  */
 #include <sys/param.h>
 #include <sys/file.h>
-#include <ffs/buf.h>
+
+#include "ffs/buf.h"
 
 /*
  * msdosfs include files.
  */
-#include <fs/msdosfs/bpb.h>
-#include <fs/msdosfs/msdosfsmount.h>
-#include <fs/msdosfs/direntry.h>
-#include <fs/msdosfs/denode.h>
-#include <fs/msdosfs/fat.h>
+#include "msdos/bpb.h"
+#include "msdos/msdosfsmount.h"
+#include "msdos/direntry.h"
+#include "msdos/denode.h"
+#include "msdos/fat.h"
 
 /*
  * Fat cache stats.
diff --git a/usr.sbin/makefs/fs/msdosfs/msdosfs_lookup.c b/usr.sbin/makefs/msdos/msdosfs_lookup.c
index 1aa64fb8394..2711cdd6b84 100644
--- a/usr.sbin/makefs/fs/msdosfs/msdosfs_lookup.c
+++ b/usr.sbin/makefs/msdos/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_lookup.c,v 1.6 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: msdosfs_lookup.c,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: msdosfs_lookup.c,v 1.35 2016/01/30 09:59:27 mlelstv Exp $	*/
 
 /*-
@@ -50,13 +50,13 @@
 
 #include <sys/param.h>
 
-#include <ffs/buf.h>
+#include "ffs/buf.h"
 
-#include <fs/msdosfs/bpb.h>
-#include <fs/msdosfs/direntry.h>
-#include <fs/msdosfs/denode.h>
-#include <fs/msdosfs/msdosfsmount.h>
-#include <fs/msdosfs/fat.h>
+#include "msdos/bpb.h"
+#include "msdos/direntry.h"
+#include "msdos/denode.h"
+#include "msdos/msdosfsmount.h"
+#include "msdos/fat.h"
 
 
 
diff --git a/usr.sbin/makefs/fs/msdosfs/msdosfs_unicode.c b/usr.sbin/makefs/msdos/msdosfs_unicode.c
index 0eba013372b..dec0bb9934c 100644
--- a/usr.sbin/makefs/fs/msdosfs/msdosfs_unicode.c
+++ b/usr.sbin/makefs/msdos/msdosfs_unicode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_unicode.c,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: msdosfs_unicode.c,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: msdosfs_unicode.c,v 1.2 2016/02/06 14:11:58 joerg Exp $	*/
 
 /*
diff --git a/usr.sbin/makefs/msdos/msdosfs_vfsops.c b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
index c84690b05a1..edd4d3273a4 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vfsops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vfsops.c,v 1.7 2016/10/17 14:25:33 natano Exp $	*/
+/*	$OpenBSD: msdosfs_vfsops.c,v 1.8 2016/10/18 17:05:30 natano Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -50,14 +50,14 @@
 #include <sys/param.h>
 #include <sys/time.h>
 
-#include <ffs/buf.h>
+#include "ffs/buf.h"
 
-#include <fs/msdosfs/bpb.h>
-#include <fs/msdosfs/bootsect.h>
-#include <fs/msdosfs/direntry.h>
-#include <fs/msdosfs/denode.h>
-#include <fs/msdosfs/msdosfsmount.h>
-#include <fs/msdosfs/fat.h>
+#include "msdos/bpb.h"
+#include "msdos/bootsect.h"
+#include "msdos/direntry.h"
+#include "msdos/denode.h"
+#include "msdos/msdosfsmount.h"
+#include "msdos/fat.h"
 
 #include <stdio.h>
 #include <errno.h>
@@ -67,7 +67,7 @@
 
 #include "makefs.h"
 #include "msdos.h"
-#include "mkfs_msdos.h"
+#include "msdos/mkfs_msdos.h"
 
 #ifdef MSDOSFS_DEBUG
 #define DPRINTF(a) printf a
diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c
index e7536e9cb59..295ba94f104 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vnops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.5 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.6 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.17 2016/01/30 09:59:27 mlelstv Exp $ */
 
 /*-
@@ -53,13 +53,13 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <ffs/buf.h>
+#include "ffs/buf.h"
 
-#include <fs/msdosfs/bpb.h>
-#include <fs/msdosfs/direntry.h>
-#include <fs/msdosfs/denode.h>
-#include <fs/msdosfs/msdosfsmount.h>
-#include <fs/msdosfs/fat.h>
+#include "msdos/bpb.h"
+#include "msdos/direntry.h"
+#include "msdos/denode.h"
+#include "msdos/msdosfsmount.h"
+#include "msdos/fat.h"
 
 #include "makefs.h"
 #include "msdos.h"
diff --git a/usr.sbin/makefs/fs/msdosfs/msdosfsmount.h b/usr.sbin/makefs/msdos/msdosfsmount.h
index 5c79a1e47ee..e0f3b6a12eb 100644
--- a/usr.sbin/makefs/fs/msdosfs/msdosfsmount.h
+++ b/usr.sbin/makefs/msdos/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfsmount.h,v 1.5 2016/10/17 01:16:22 tedu Exp $	*/
+/*	$OpenBSD: msdosfsmount.h,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
 /*	$NetBSD: msdosfsmount.h,v 1.21 2016/01/30 09:59:27 mlelstv Exp $	*/
 
 /*-