X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f8a94f0de88c5cbf24ef4d5a7d5cba1ead86afff..2cda2560883268627b997daee6d0c677093b26d2:/exclude.c

diff --git a/exclude.c b/exclude.c
index 23ee743d..e1b25886 100644
--- a/exclude.c
+++ b/exclude.c
@@ -241,7 +241,7 @@ struct exclude_struct **make_exclude_list(const char *fname,
 
 	while (fgets(line,MAXPATHLEN,f)) {
 		int l = strlen(line);
-		if (l && line[l-1] == '\n') l--;
+		while (l && (line[l-1] == '\n' || line[l-1] == '\r')) l--;
 		line[l] = 0;
 		if (line[0] && (line[0] != ';') && (line[0] != '#')) {
 			/* Skip lines starting with semicolon or pound.
@@ -393,12 +393,11 @@ void add_include_line(char *p)
 
 
 static char *cvs_ignore_list[] = {
-  "RCS","SCCS","CVS","CVS.adm","RCSLOG","cvslog.*",
-  "tags","TAGS",".make.state",".nse_depinfo",
-  "*~", "#*", ".#*", ",*", "*.old", "*.bak", "*.BAK", "*.orig",
+  "RCS/", "SCCS/", "CVS/", ".svn/", "CVS.adm", "RCSLOG", "cvslog.*",
+  "tags", "TAGS", ".make.state", ".nse_depinfo",
+  "*~", "#*", ".#*", ", *", "*.old", "*.bak", "*.BAK", "*.orig",
   "*.rej", ".del-*", "*.a", "*.o", "*.obj", "*.so", "*.Z", "*.elc", "*.ln",
-  "core",NULL};
-
+  "core", NULL};
 
 
 void add_cvs_excludes(void)