From 0e32d64e56a10617d06b5fdf44df6266b3fadb21 Mon Sep 17 00:00:00 2001
From: Brian Somers <brian@FreeBSD.org>
Date: Wed, 12 Jan 2005 03:25:55 +0000
Subject: [PATCH] Don't decend into directories when -d is set and the
 directory itself doesn't match.

PR:		28095
Submitted by:	bill at twwells dot com
MFC after:	7 days
---
 bin/pax/ar_subs.c |  8 ++++++--
 bin/pax/extern.h  |  1 +
 bin/pax/ftree.c   | 12 ++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index f16facf98d5..da275c2dacb 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -400,8 +400,10 @@ wr_archive(ARCHD *arcn, int is_app)
 		/*
 		 * check if this file meets user specified options match.
 		 */
-		if (sel_chk(arcn) != 0)
+		if (sel_chk(arcn) != 0) {
+			ftree_notsel();
 			continue;
+		}
 		fd = -1;
 		if (uflag) {
 			/*
@@ -785,8 +787,10 @@ copy(void)
 		/*
 		 * check if this file meets user specified options
 		 */
-		if (sel_chk(arcn) != 0)
+		if (sel_chk(arcn) != 0) {
+			ftree_notsel();
 			continue;
+		}
 
 		/*
 		 * if there is already a file in the destination directory with
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index b0d0237280b..e7167928e2f 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -155,6 +155,7 @@ int set_crc(ARCHD *, int);
 int ftree_start(void);
 int ftree_add(char *, int);
 void ftree_sel(ARCHD *);
+void ftree_notsel(void);
 void ftree_chk(void);
 int next_file(ARCHD *);
 
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 36c0de51c69..f402c568ddf 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -213,6 +213,18 @@ ftree_sel(ARCHD *arcn)
 		(void)fts_set(ftsp, ftent, FTS_SKIP);
 }
 
+/*
+ * ftree_notsel()
+ *	this entry has not been selected by pax.
+ */
+
+void
+ftree_notsel()
+{
+	if (ftent != NULL)
+		(void)fts_set(ftsp, ftent, FTS_SKIP);
+}
+
 /*
  * ftree_chk()
  *	called at end on pax execution. Prints all those file args that did not