include fiox

SCCS-vsn: sbin/newfs/newfs.c 4.8
SCCS-vsn: sbin/newfs/mkfs.c 2.13

diff --git a/usr/src/sbin/newfs/mkfs.c b/usr/src/sbin/newfs/mkfs.c
index 7cad662..e9c19a3 100644 (file)
--- a/usr/src/sbin/newfs/mkfs.c
+++ b/usr/src/sbin/newfs/mkfs.c
@@ -1,4 +1,6 @@
-static char *sccsid = "@(#)mkfs.c      2.12 (Berkeley) %G%";
+#ifndef lint
+static char *sccsid = "@(#)mkfs.c      2.13 (Berkeley) %G%";
+#endif

 
 /*
  * make file system for cylinder-group style file systems
 
 /*
  * make file system for cylinder-group style file systems


@@ -82,16 +84,10 @@ static      char *sccsid = "@(#)mkfs.c      2.12 (Berkeley) %G%";
 #include <a.out.h>
 #endif
 
 #include <a.out.h>
 #endif
 

-#ifndef SIMFS

 #include <sys/param.h>
 #include <sys/inode.h>
 #include <sys/fs.h>
 #include <sys/param.h>
 #include <sys/inode.h>
 #include <sys/fs.h>

-#else
-#include "../h/param.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#endif
-#include <dir.h>
+#include <sys/dir.h>

 
 #define UMASK          0755
 #define MAXINOPB       (MAXBSIZE / sizeof(struct dinode))
 
 #define UMASK          0755
 #define MAXINOPB       (MAXBSIZE / sizeof(struct dinode))

diff --git a/usr/src/sbin/newfs/newfs.c b/usr/src/sbin/newfs/newfs.c
index 5ba59d0..3f13e88 100644 (file)
--- a/usr/src/sbin/newfs/newfs.c
+++ b/usr/src/sbin/newfs/newfs.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)newfs.c    4.7 %G%";
+static char sccsid[] = "@(#)newfs.c    4.8 %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -8,9 +8,9 @@ static char sccsid[] = "@(#)newfs.c     4.7 %G%";
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/fs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/fs.h>

+#include <sys/dir.h>

 
 #include <stdio.h>
 
 #include <stdio.h>

-#include <dir.h>

 #include <disktab.h>
 
 #define        BOOTDIR "/usr/mdec"     /* directory for boot blocks */
 #include <disktab.h>
 
 #define        BOOTDIR "/usr/mdec"     /* directory for boot blocks */