Support '#' and ';' comments in exclude files. It would actually not

probably cause any harm if they were treated as normal exclude or include
patterns because they just wouldn't match anything, but it's better to
explicitly ignore them.  Suggested by David Holland <uholld1@lexis-nexis.com>

diff --git a/exclude.c b/exclude.c
index 35fa307a93ad3b9009aef20174213768cb5be599..15dc310987d211e27e98857cfeba650286a27ce0 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -234,7 +234,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;

diff --git a/rsync.yo b/rsync.yo
index db4c2b27b888f2ae328ec7ad701503c657332eff..90599d79ff4c43c98aaaea33570b8dfb92d0bacd 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -465,7 +465,8 @@ this option.
 
 dit(bf(--exclude-from FILE)) This option is similar to the --exclude
 option, but instead it adds all filenames listed in the file FILE to
-the exclude list.
+the exclude list.  Blank lines in FILE and lines starting with ';' or '#'
+are ignored.
 
 dit(bf(--include pattern)) This option tells rsync to not exclude the
 specified pattern of filenames. This is useful as it allows you to