#include "rsync.h"
extern int verbose;
+extern int delete_mode;
static struct exclude_struct **exclude_list;
memset(ret, 0, sizeof(*ret));
- ret->orig = strdup(pattern);
-
if (strncmp(pattern,"- ",2) == 0) {
pattern += 2;
} else if (strncmp(pattern,"+ ",2) == 0) {
ret->pattern = strdup(pattern);
- if (!ret->orig || !ret->pattern) out_of_memory("make_exclude");
+ if (!ret->pattern) out_of_memory("make_exclude");
- if (strpbrk(pattern, "*[?")) ret->regular_exp = 1;
+ if (strpbrk(pattern, "*[?")) {
+ ret->regular_exp = 1;
+ ret->fnmatch_flags = strstr(pattern, "**") ? 0 : FNM_PATHNAME;
+ }
if (strlen(pattern) > 1 && pattern[strlen(pattern)-1] == '/') {
ret->pattern[strlen(pattern)-1] = 0;
static void free_exclude(struct exclude_struct *ex)
{
- free(ex->orig);
free(ex->pattern);
memset(ex,0,sizeof(*ex));
free(ex);
}
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);
{
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))
return;
}
- if (!*list) {
- *list = (struct exclude_struct **)malloc(sizeof(struct exclude_struct *)*2);
- } else {
- *list = (struct exclude_struct **)realloc(*list,sizeof(struct exclude_struct *)*(len+2));
- }
+ *list = (struct exclude_struct **)Realloc(*list,sizeof(struct exclude_struct *)*(len+2));
if (!*list || !((*list)[len] = make_exclude(pattern, include)))
out_of_memory("add_exclude");
if (!f) {
if (fatal) {
rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_FILEIO);
}
return list;
}
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;
}
for (i=0;exclude_list[i];i++) {
- char *pattern = exclude_list[i]->orig;
int l;
+ char pattern[MAXPATHLEN];
- if (remote_version < 19) {
- if (strncmp(pattern,"+ ", 2)==0) {
+ strlcpy(pattern,exclude_list[i]->pattern,sizeof(pattern));
+ if (exclude_list[i]->directory) strlcat(pattern,"/", sizeof(pattern));
+
+ l = strlen(pattern);
+ if (l == 0) continue;
+ if (exclude_list[i]->include) {
+ if (remote_version < 19) {
rprintf(FERROR,"remote rsync does not support include syntax - aborting\n");
- exit_cleanup(1);
- }
-
- if (strncmp(pattern,"- ", 2) == 0) {
- pattern += 2;
+ exit_cleanup(RERR_UNSUPPORTED);
}
+ write_int(f,l+2);
+ write_buf(f,"+ ",2);
+ } else {
+ write_int(f,l);
}
-
- l = strlen(pattern);
- if (l == 0) continue;
- write_int(f,l);
write_buf(f,pattern,l);
}
}
}
+/* Get the next include/exclude arg from the string. It works in a similar way
+** to strtok - initially an arg is sent over, from then on NULL. This
+** routine takes into account any +/- in the strings and does not
+** consider the space following it as a delimeter.
+*/
+char *get_exclude_tok(char *p)
+{
+ static char *s;
+ static int more;
+ char *t;
+
+ if (p) {
+ s=p;
+ if (*p)
+ more=1;
+ }
+
+ if (!more)
+ return(NULL);
+ /* Skip over any initial spaces */
+ while(isspace(*s))
+ s++;
+
+ /* Are we at the end of the string? */
+ if (*s) {
+ /* remember the beginning of the token */
+ t=s;
+
+ /* Is this a '+' or '-' followed by a space (not whitespace)? */
+ if ((*s=='+' || *s=='-') && *(s+1)==' ')
+ s+=2;
+
+ /* Skip to the next space or the end of the string */
+ while(!isspace(*s) && *s!='\0')
+ s++;
+ } else {
+ t=NULL;
+ }
+
+ /* Have we reached the end of the string? */
+ if (*s)
+ *s++='\0';
+ else
+ more=0;
+ return(t);
+}
+
+
void add_exclude_line(char *p)
{
char *tok;
if (!p || !*p) return;
p = strdup(p);
if (!p) out_of_memory("add_exclude_line");
- for (tok=strtok(p," "); tok; tok=strtok(NULL," "))
+ for (tok=get_exclude_tok(p); tok; tok=get_exclude_tok(NULL))
add_exclude(tok, 0);
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=get_exclude_tok(p); tok; tok=get_exclude_tok(NULL))
+ add_exclude(tok, 1);
+ free(p);
+}
+
static char *cvs_ignore_list[] = {
"RCS","SCCS","CVS","CVS.adm","RCSLOG","cvslog.*",
add_exclude(cvs_ignore_list[i], 0);
if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) {
- slprintf(fname,sizeof(fname)-1, "%s/.cvsignore",p);
+ slprintf(fname,sizeof(fname), "%s/.cvsignore",p);
add_exclude_file(fname,0,0);
}