[src/trunk]: src/bin/pax PR/21253: Manuel Bouyer: cpio should never descend o...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f076c6061922
branches:  trunk
changeset: 546176:f076c6061922
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Apr 21 22:10:10 2003 +0000

description:
PR/21253: Manuel Bouyer: cpio should never descend on a directory; even on
the first one.

diffstat:

 bin/pax/ftree.c |  26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diffs (60 lines):

diff -r 682217dce2c1 -r f076c6061922 bin/pax/ftree.c
--- a/bin/pax/ftree.c   Mon Apr 21 22:00:42 2003 +0000
+++ b/bin/pax/ftree.c   Mon Apr 21 22:10:10 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftree.c,v 1.23 2002/10/19 20:33:18 provos Exp $        */
+/*     $NetBSD: ftree.c,v 1.24 2003/04/21 22:10:10 christos Exp $      */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -78,7 +78,7 @@
 #if 0
 static char sccsid[] = "@(#)ftree.c    8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: ftree.c,v 1.23 2002/10/19 20:33:18 provos Exp $");
+__RCSID("$NetBSD: ftree.c,v 1.24 2003/04/21 22:10:10 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -573,6 +573,8 @@
                        return(-1);
        }
 
+       if (ftsp == NULL)
+               return -1;
        /*
         * loop until we get a valid file to process
         */
@@ -592,15 +594,6 @@
                 */
                switch(ftent->fts_info) {
                case FTS_D:
-                       /*
-                        * cpio does *not* decend directories listed in the
-                        * arguments, unlike pax/tar, so needs special handling
-                        * here.  failure to do so results in massive amounts
-                        * of duplicated files in the output.
-                        */
-                       if (strcmp(NM_CPIO, argv0) == 0)
-                               continue;
-                       /* FALLTHROUGH */
                case FTS_DEFAULT:
                case FTS_F:
                case FTS_SL:
@@ -744,5 +737,16 @@
         */
        arcn->nlen = strlcpy(arcn->name, ftent->fts_path, sizeof(arcn->name));
        arcn->org_name = ftent->fts_path;
+       if (strcmp(NM_CPIO, argv0) == 0) {
+               /*
+                * cpio does *not* descend directories listed in the
+                * arguments, unlike pax/tar, so needs special handling
+                * here.  failure to do so results in massive amounts
+                * of duplicated files in the output. We kill fts after
+                * the first name is extracted, what a waste.
+                */
+               ftcur->refcnt = 1;
+               (void)ftree_arg();
+       }
        return(0);
 }