sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

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

Browse Source 
Jeremy.
(This used to be commit fe63a6ee06149195032320dd0fb9b6c7dfb460d3)
This commit is contained in:
Jeremy Allison 2006-02-16 23:08:12 +00:00 committed by Gerald (Jerry) Carter
parent e9771ae0e0
commit eca035db9a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/client/clitar.c
View File

@ -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;