samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r13535 - in branches/SAMBA_3_0/source/client: .

Subject: svn commit: samba r13535 - in branches/SAMBA_3_0/source/client: .
From:
Date: Thu, 16 Feb 2006 23:08:12 +0000 GMT
Author: jra
Date: 2006-02-16 23:08:12 +0000 (Thu, 16 Feb 2006)
New Revision: 13535

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

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

Modified:
   branches/SAMBA_3_0/source/client/clitar.c


Changeset:
Modified: branches/SAMBA_3_0/source/client/clitar.c
===================================================================
--- branches/SAMBA_3_0/source/client/clitar.c   2006-02-16 23:03:53 UTC (rev 
13534)
+++ branches/SAMBA_3_0/source/client/clitar.c   2006-02-16 23:08:12 UTC (rev 
13535)
@@ -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;

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r13535 - in branches/SAMBA_3_0/source/client: ., jra <=