Restored changes accidentally backed out by Dave Dykstra in previous revision.

[rsync/rsync.git] / exclude.c

diff --git a/exclude.c b/exclude.c
index 693babb..e1b2588 100644 (file)
--- 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.