From eca035db9a3e0c9eba13b3ceb1078442942e5cf9 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 16 Feb 2006 23:08:12 +0000
Subject: r13535: Fix #2353 based on a patch by William Jojo. Jeremy. (This
 used to be commit fe63a6ee06149195032320dd0fb9b6c7dfb460d3)

---
 source3/client/clitar.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index c15d24d619..cd0ce27eb5 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -1698,8 +1698,8 @@ int tar_parseargs(int argc, char *argv[], const char *Optarg, int Optind)
 			return 0;
 		}
 		newOptind++;
-		Optind++;
-		if (! read_inclusion_file(argv[Optind])) {
+		/* Optind points at the tar output file, Optind+1 at the inclusion file. */
+		if (! read_inclusion_file(argv[Optind+1])) {
 			return 0;
 		}
 	} else if (Optind+1<argc && !tar_re_search) { /* For backwards compatibility */
@@ -1738,7 +1738,8 @@ int tar_parseargs(int argc, char *argv[], const char *Optarg, int Optind)
 		newOptind += clipn;
 	}
 
-	if (Optind+1<argc && tar_re_search) {  /* Doing regular expression seaches */
+	if (Optind+1<argc && tar_re_search && tar_clipfl != 'F') {
+		/* Doing regular expression seaches not from an inclusion file. */
 		clipn=argc-Optind-1;
 		cliplist=argv+Optind+1;
 		newOptind += clipn;
-- 
cgit