svn commit: samba r13536 - in trunk/source/client: .

[jra at samba.org]

Author: jra
Date: 2006-02-16 23:08:14 +0000 (Thu, 16 Feb 2006)
New Revision: 13536

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13536

Log:
Fix #2353 based on a patch by William Jojo.
Jeremy.

Modified:
   trunk/source/client/clitar.c


Changeset:
Modified: trunk/source/client/clitar.c
===================================================================
--- trunk/source/client/clitar.c	2006-02-16 23:08:12 UTC (rev 13535)
+++ trunk/source/client/clitar.c	2006-02-16 23:08:14 UTC (rev 13536)
@@ -1698,8 +1698,8 @@
 			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 @@
 		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;