summaryrefslogtreecommitdiffstats
path: root/usr.sbin/makefs/walk.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/makefs/walk.c')
-rw-r--r--usr.sbin/makefs/walk.c29
1 files changed, 1 insertions, 28 deletions
diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index 7af92bb..2fc964a 100644
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -304,7 +304,7 @@ apply_specfile(const char *specfile, const char *dir, fsnode *parent, int specon
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);
@@ -320,33 +320,6 @@ apply_specfile(const char *specfile, const char *dir, fsnode *parent, int specon
}
-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)
{
OpenPOWER on IntegriCloud