ftsopen now only takes argv structure

SCCS-vsn: usr.sbin/mtree/create.c 5.13
SCCS-vsn: usr.sbin/mtree/verify.c 5.5

diff --git a/usr/src/usr.sbin/mtree/create.c b/usr/src/usr.sbin/mtree/create.c
index 08b6990..40d69ac 100644 (file)
--- a/usr/src/usr.sbin/mtree/create.c
+++ b/usr/src/usr.sbin/mtree/create.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -35,6 +35,7 @@ cwalk()
        gid_t gid;
        mode_t mode;
        int tabs, dsort();
        gid_t gid;
        mode_t mode;
        int tabs, dsort();

+       char *argv[2];

        char curp[MAXPATHLEN], *inotype(), *getlogin(), *rlink();
 
        if (!getwd(curp)) {
        char curp[MAXPATHLEN], *inotype(), *getlogin(), *rlink();
 
        if (!getwd(curp)) {


@@ -45,7 +46,9 @@ cwalk()
        (void)printf("#\t  fs: %s\n#\t  by: %s\n#\tdate: %s\n",
            curp, getlogin(), ctime(&clock));
 
        (void)printf("#\t  fs: %s\n#\t  by: %s\n#\tdate: %s\n",
            curp, getlogin(), ctime(&clock));
 

-       if (!(t = ftsopen(".", ftsoptions, dsort))) {
+       argv[0] = ".";
+       argv[1] = (char *)NULL;
+       if (!(t = ftsopen(argv, ftsoptions, dsort))) {

                (void)fprintf(stderr,
                    "mtree: ftsopen: %s.\n", strerror(errno));
                exit(1);
                (void)fprintf(stderr,
                    "mtree: ftsopen: %s.\n", strerror(errno));
                exit(1);

diff --git a/usr/src/usr.sbin/mtree/verify.c b/usr/src/usr.sbin/mtree/verify.c
index 27ae3dd..f6381df 100644 (file)
--- a/usr/src/usr.sbin/mtree/verify.c
+++ b/usr/src/usr.sbin/mtree/verify.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -34,8 +34,11 @@ vwalk()
        register FTS *t;
        register FTSENT *p;
        register NODE *ep, *level;
        register FTS *t;
        register FTSENT *p;
        register NODE *ep, *level;

+       char *argv[2];

 
 

-       if (!(t = ftsopen(".", ftsoptions, (int (*)())NULL))) {
+       argv[0] = ".";
+       argv[1] = (char *)NULL;
+       if (!(t = ftsopen(argv, ftsoptions, (int (*)())NULL))) {

                (void)fprintf(stderr,
                    "mtree: ftsopen: %s.\n", strerror(errno));
                exit(1);
                (void)fprintf(stderr,
                    "mtree: ftsopen: %s.\n", strerror(errno));
                exit(1);