X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/ca5705de2e7f1524343c64edc3fc551b55bde889..38dde0cd11e450645db2b33ce15aabc6bbe7e173:/usr/src/usr.sbin/mtree/create.c diff --git a/usr/src/usr.sbin/mtree/create.c b/usr/src/usr.sbin/mtree/create.c index 2e9b7f0f9e..71003d44b0 100644 --- a/usr/src/usr.sbin/mtree/create.c +++ b/usr/src/usr.sbin/mtree/create.c @@ -16,14 +16,14 @@ */ #ifndef lint -static char sccsid[] = "@(#)create.c 5.2 (Berkeley) %G%"; +static char sccsid[] = "@(#)create.c 5.5 (Berkeley) %G%"; #endif /* not lint */ #include #include #include #include -#include +#include #include "mtree.h" cwalk(parent, tail) @@ -140,7 +140,7 @@ cwalk(parent, tail) extern mode_t dmode; /* default directory mode */ extern mode_t fmode; /* default file mode */ uid_t uid, gid; /* default owner, group */ - +u_int type; pwalk(level, tabs) ENTRY *level; int tabs; @@ -155,7 +155,7 @@ pwalk(level, tabs) (void)putchar('\t'); (void)printf("%s", level->name); label = 0; - if ((ip = &level->info)->type != F_FILE) { + if ((ip = &level->info)->type != type) { LABEL; (void)printf("type=%s", ftype(ip->type)); } @@ -237,6 +237,7 @@ stats(ip) shostats() { + extern int dflag; register ID *p; register mode_t cnt; register u_long max; @@ -266,5 +267,11 @@ shostats() } (void)printf("/set group=%u\n", gid); (void)printf("/set nlink=1\n"); - (void)printf("/set type=%s\n\n", dflag ? "dir" : "file"); + if (dflag) { + type = F_DIR; + (void)printf("/set type=dir\n\n"); + } else { + type = F_FILE; + (void)printf("/set type=file\n\n"); + } }