X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ea2111d10a10a164334eff3b621ed7e630404345..0503f06089b89aa4166d6ced8d5901ad6a112c41:/exclude.c

diff --git a/exclude.c b/exclude.c
index ab01234c..444a2b48 100644
--- a/exclude.c
+++ b/exclude.c
@@ -23,9 +23,54 @@
 #include "rsync.h"
 
 extern int verbose;
+extern int delete_mode;
 
 static struct exclude_struct **exclude_list;
 
+/*
+ * Optimization for special case when all included files are explicitly
+ *   listed without wildcards in the "exclude" list followed by a "- *"
+ *   to exclude the rest.
+ * Contributed by Dave Dykstra <dwd@bell-labs.com>
+ */
+static int only_included_files = 1;
+static struct exclude_struct *exclude_the_rest;
+
+int send_included_file_names(int f,struct file_list *flist)
+{
+	struct exclude_struct *ex, **ex_list;
+	int n;
+	char *p;
+
+	if (!only_included_files || (exclude_the_rest == NULL) || delete_mode)
+		return 0;
+
+	if (verbose > 1) {
+		rprintf(FINFO,"(using include-only optimization) ");
+	}
+
+	/* set exclude_list to NULL temporarily so check_exclude */
+	/*   will always return true */
+	ex_list = exclude_list;
+	exclude_list = NULL;
+	for (n=0; (ex = ex_list[n]) != NULL; n++) {
+		if (ex == exclude_the_rest)
+			break;
+		p = ex->pattern;
+		while (*p == '/') {
+			/* skip the allowed beginning slashes */
+			p++;
+		}
+		/* 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;
+	
+	return 1;
+}
+
 /* build an exclude structure given a exclude pattern */
 static struct exclude_struct *make_exclude(char *pattern, int include)
 {
@@ -36,8 +81,6 @@ static struct exclude_struct *make_exclude(char *pattern, int include)
 
 	memset(ret, 0, sizeof(*ret));
 
-	ret->orig = strdup(pattern);
-
 	if (strncmp(pattern,"- ",2) == 0) {
 		pattern += 2;
 	} else if (strncmp(pattern,"+ ",2) == 0) {
@@ -49,9 +92,19 @@ static struct exclude_struct *make_exclude(char *pattern, int include)
 
 	ret->pattern = strdup(pattern);
 
-	if (!ret->orig || !ret->pattern) out_of_memory("make_exclude");
-
-	if (strpbrk(pattern, "*[?")) ret->regular_exp = 1;
+	if (!ret->pattern) out_of_memory("make_exclude");
+
+	if (strpbrk(pattern, "*[?")) {
+	    if (!ret->include && (*pattern == '*') && (*(pattern+1) == '\0')) {
+		    exclude_the_rest = ret;
+	    } else {
+		    only_included_files = 0;
+	    }
+	    ret->regular_exp = 1;
+	    ret->fnmatch_flags = strstr(pattern, "**") ? 0 : FNM_PATHNAME;
+	} else if (!ret->include) {
+		only_included_files = 0;
+	}
 
 	if (strlen(pattern) > 1 && pattern[strlen(pattern)-1] == '/') {
 		ret->pattern[strlen(pattern)-1] = 0;
@@ -67,7 +120,6 @@ static struct exclude_struct *make_exclude(char *pattern, int include)
 
 static void free_exclude(struct exclude_struct *ex)
 {
-	free(ex->orig);
 	free(ex->pattern);
 	memset(ex,0,sizeof(*ex));
 	free(ex);
@@ -93,7 +145,7 @@ static int check_one_exclude(char *name,struct exclude_struct *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);
@@ -113,6 +165,10 @@ int check_exclude(char *name,struct exclude_struct **local_exclude_list,
 {
 	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))
@@ -143,14 +199,12 @@ void add_exclude_list(char *pattern,struct exclude_struct ***list, int include)
 		}
 		free((*list));
 		*list = NULL;
+		only_included_files = 1;
+		exclude_the_rest = NULL;
 		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");
@@ -176,7 +230,7 @@ struct exclude_struct **make_exclude_list(char *fname,
 	if (!f) {
 		if (fatal) {
 			rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
-			exit_cleanup(1);
+			exit_cleanup(RERR_FILEIO);
 		}
 		return list;
 	}
@@ -185,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;
-		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;
@@ -211,23 +270,21 @@ void send_exclude_list(int f)
 	}
 
 	for (i=0;exclude_list[i];i++) {
-		char *pattern = exclude_list[i]->orig; 
+		char *pattern = exclude_list[i]->pattern; 
 		int l;
 
-		if (remote_version < 19) {
-			if (strncmp(pattern,"+ ", 2)==0) {
+		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);
 	}    
 
@@ -246,18 +303,77 @@ void recv_exclude_list(int f)
 	}
 }
 
+/* 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.*",
@@ -278,7 +394,7 @@ void add_cvs_excludes(void)
 		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);
 	}