string.h is ANSI C include file

[unix-history] / 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 2e9b7f0..71003d4 100644 (file)
--- a/usr/src/usr.sbin/mtree/create.c
+++ b/usr/src/usr.sbin/mtree/create.c
@@ -16,14 +16,14 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)create.c   5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)create.c   5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <stdio.h>
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <stdio.h>

-#include <strings.h>
+#include <string.h>

 #include "mtree.h"
 
 cwalk(parent, tail)
 #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 */
 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;
 pwalk(level, tabs)
        ENTRY *level;
        int tabs;


@@ -155,7 +155,7 @@ pwalk(level, tabs)
                        (void)putchar('\t');
                (void)printf("%s", level->name);
                label = 0;
                        (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));
                }
                        LABEL;
                        (void)printf("type=%s", ftype(ip->type));
                }


@@ -237,6 +237,7 @@ stats(ip)
 
 shostats()
 {
 
 shostats()
 {

+       extern int dflag;

        register ID *p;
        register mode_t cnt;
        register u_long max;
        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 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");
+       }

 }
 }