- Moved get_cvs_excludes() up above its only use and made it static.

[rsync/rsync.git] / exclude.c

diff --git a/exclude.c b/exclude.c
index 9fdae3e..6ea9767 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -33,6 +33,7 @@ extern int eol_nulls;
 extern int list_only;
 extern int recurse;
 extern int io_error;
+extern int local_server;
 extern int delete_mode;
 extern int delete_excluded;
 extern int cvs_exclude;
@@ -755,6 +756,35 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
 }
 
 
+static char default_cvsignore[] = 
+       /* These default ignored items come from the CVS manual. */
+       "RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS"
+       " .make.state .nse_depinfo *~ #* .#* ,* _$* *$"
+       " *.old *.bak *.BAK *.orig *.rej .del-*"
+       " *.a *.olb *.o *.obj *.so *.exe"
+       " *.Z *.elc *.ln core"
+       /* The rest we added to suit ourself. */
+       " .svn/";
+
+static void get_cvs_excludes(uint32 mflags)
+{
+       char *p, fname[MAXPATHLEN];
+       static int initialized = 0;
+
+       if (initialized)
+               return;
+       initialized = 1;
+
+       parse_rule(&cvs_filter_list, default_cvsignore, mflags, 0);
+
+       p = module_id >= 0 && lp_use_chroot(module_id) ? "/" : getenv("HOME");
+       if (p && pathjoin(fname, MAXPATHLEN, p, ".cvsignore") < MAXPATHLEN)
+               parse_filter_file(&cvs_filter_list, fname, mflags, 0);
+
+       parse_rule(&cvs_filter_list, getenv("CVSIGNORE"), mflags, 0);
+}
+
+
 void parse_rule(struct filter_list_struct *listp, const char *pattern,
                uint32 mflags, int xflags)
 {
@@ -826,7 +856,7 @@ void parse_rule(struct filter_list_struct *listp, const char *pattern,
 
                if (new_mflags & MATCHFLG_CVS_IGNORE
                    && !(new_mflags & MATCHFLG_MERGE_FILE))
-                       get_cvs_excludes();
+                       get_cvs_excludes(new_mflags);
        }
 }
 
@@ -927,15 +957,13 @@ char *get_rule_prefix(int match_flags, const char *pat, int sending,
        else
                legal_len = 0;
 
-       if (match_flags & MATCHFLG_EXCLUDE_SELF)
-               *op++ = 'e';
        if (match_flags & MATCHFLG_CVS_IGNORE)
                *op++ = 'C';
        else {
-               if (match_flags & MATCHFLG_WORD_SPLIT)
-                       *op++ = 's';
                if (match_flags & MATCHFLG_NO_INHERIT)
                        *op++ = 'n';
+               if (match_flags & MATCHFLG_WORD_SPLIT)
+                       *op++ = 'w';
                if (match_flags & MATCHFLG_NO_PREFIXES) {
                        if (match_flags & MATCHFLG_INCLUDE)
                                *op++ = '+';
@@ -943,6 +971,8 @@ char *get_rule_prefix(int match_flags, const char *pat, int sending,
                                *op++ = '-';
                }
        }
+       if (match_flags & MATCHFLG_EXCLUDE_SELF)
+               *op++ = 'e';
        if (op - buf > legal_len)
                return NULL;
        if (legal_len)
@@ -992,7 +1022,7 @@ static void send_rules(int f_out, struct filter_list_struct *flp)
 /* This is only called by the client. */
 void send_filter_list(int f_out)
 {
-       if (am_sender && (!delete_mode || delete_excluded))
+       if (local_server || (am_sender && (!delete_mode || delete_excluded)))
                f_out = -1;
        if (cvs_exclude && am_sender) {
                if (protocol_version >= 29)
@@ -1025,7 +1055,7 @@ void recv_filter_list(int f_in)
        int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
        unsigned int len;
 
-       if (am_sender || (delete_mode && !delete_excluded)) {
+       if (!local_server && (am_sender || (delete_mode && !delete_excluded))) {
                while ((len = read_int(f_in)) != 0) {
                        if (len >= sizeof line)
                                overflow("recv_rules");
@@ -1035,39 +1065,9 @@ void recv_filter_list(int f_in)
        }
 
        if (cvs_exclude) {
-               if (am_sender || protocol_version < 29)
+               if (local_server || am_sender || protocol_version < 29)
                        parse_rule(&filter_list, ":C", 0, 0);
-               if (am_sender)
+               if (local_server || am_sender)
                        parse_rule(&filter_list, "-C", 0, 0);
        }
 }
-
-
-static char default_cvsignore[] = 
-       /* These default ignored items come from the CVS manual. */
-       "RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS"
-       " .make.state .nse_depinfo *~ #* .#* ,* _$* *$"
-       " *.old *.bak *.BAK *.orig *.rej .del-*"
-       " *.a *.olb *.o *.obj *.so *.exe"
-       " *.Z *.elc *.ln core"
-       /* The rest we added to suit ourself. */
-       " .svn/";
-
-void get_cvs_excludes(void)
-{
-       static unsigned cvs_mflags = MATCHFLG_WORD_SPLIT|MATCHFLG_NO_PREFIXES;
-       char *p, fname[MAXPATHLEN];
-       static int initialized = 0;
-
-       if (initialized)
-               return;
-       initialized = 1;
-
-       parse_rule(&cvs_filter_list, default_cvsignore, cvs_mflags, 0);
-
-       p = module_id >= 0 && lp_use_chroot(module_id) ? "/" : getenv("HOME");
-       if (p && pathjoin(fname, MAXPATHLEN, p, ".cvsignore") < MAXPATHLEN)
-               parse_filter_file(&cvs_filter_list, fname, cvs_mflags, 0);
-
-       parse_rule(&cvs_filter_list, getenv("CVSIGNORE"), cvs_mflags, 0);
-}