Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When a file cannot be deleted because of ETXTBSY (in particular, when an
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
9b32554
..
ae9f8b1
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-23,6
+23,7
@@
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
+extern int delete_mode;
static struct exclude_struct **exclude_list;
static struct exclude_struct **exclude_list;
@@
-41,7
+42,7
@@
int send_included_file_names(int f,struct file_list *flist)
int n;
char *p;
int n;
char *p;
- if (!only_included_files || (exclude_the_rest == NULL))
+ if (!only_included_files || (exclude_the_rest == NULL)
|| delete_mode
)
return 0;
if (verbose > 1) {
return 0;
if (verbose > 1) {
@@
-60,7
+61,10
@@
int send_included_file_names(int f,struct file_list *flist)
/* skip the allowed beginning slashes */
p++;
}
/* skip the allowed beginning slashes */
p++;
}
- send_file_name(f,flist,p,0,0);
+ /* silently skip files that don't exist to
+ be more like non-optimized case */
+ if (access(p,0) == 0)
+ send_file_name(f,flist,p,0,0);
}
exclude_list = ex_list;
}
exclude_list = ex_list;
@@
-97,6
+101,7
@@
static struct exclude_struct *make_exclude(char *pattern, int include)
only_included_files = 0;
}
ret->regular_exp = 1;
only_included_files = 0;
}
ret->regular_exp = 1;
+ ret->fnmatch_flags = strstr(pattern, "**") ? 0 : FNM_PATHNAME;
} else if (!ret->include) {
only_included_files = 0;
}
} else if (!ret->include) {
only_included_files = 0;
}
@@
-140,7
+145,7
@@
static int check_one_exclude(char *name,struct exclude_struct *ex,
}
if (ex->regular_exp) {
}
if (ex->regular_exp) {
- if (fnmatch(pattern, name,
0
) == 0)
+ if (fnmatch(pattern, name,
ex->fnmatch_flags
) == 0)
return 1;
} else {
int l1 = strlen(name);
return 1;
} else {
int l1 = strlen(name);
@@
-160,6
+165,10
@@
int check_exclude(char *name,struct exclude_struct **local_exclude_list,
{
int n;
{
int n;
+ if (name && (name[0] == '.') && !name[1])
+ /* never exclude '.', even if somebody does --exclude '*' */
+ return 0;
+
if (exclude_list) {
for (n=0; exclude_list[n]; n++)
if (check_one_exclude(name,exclude_list[n],st))
if (exclude_list) {
for (n=0; exclude_list[n]; n++)
if (check_one_exclude(name,exclude_list[n],st))
@@
-230,7
+239,12
@@
struct exclude_struct **make_exclude_list(char *fname,
int l = strlen(line);
if (l && line[l-1] == '\n') l--;
line[l] = 0;
int l = strlen(line);
if (l && line[l-1] == '\n') l--;
line[l] = 0;
- if (line[0]) add_exclude_list(line,&list,include);
+ if (line[0] && (line[0] != ';') && (line[0] != '#')) {
+ /* Skip lines starting with semicolon or pound.
+ It probably wouldn't cause any harm to not skip
+ them but there's no need to save them. */
+ add_exclude_list(line,&list,include);
+ }
}
fclose(f);
return list;
}
fclose(f);
return list;
@@
-301,6
+315,17
@@
void add_exclude_line(char *p)
free(p);
}
free(p);
}
+void add_include_line(char *p)
+{
+ char *tok;
+ if (!p || !*p) return;
+ p = strdup(p);
+ if (!p) out_of_memory("add_include_line");
+ for (tok=strtok(p," "); tok; tok=strtok(NULL," "))
+ add_exclude(tok, 1);
+ free(p);
+}
+
static char *cvs_ignore_list[] = {
"RCS","SCCS","CVS","CVS.adm","RCSLOG","cvslog.*",
static char *cvs_ignore_list[] = {
"RCS","SCCS","CVS","CVS.adm","RCSLOG","cvslog.*",