← Back to branch summary

~vcs-imports/rsync/main

« back to all changes in this revision

Viewing changes to flist.c

  • Committer: wayned
  • Date: 2006-11-11 16:44:22 UTC
  • Revision ID: vcs-imports@canonical.com-20061111164422-02bf5c0c897b3c1e
If ignore_perishable is set, increment a count of all excluded
items found by make_file().

Show diffs side-by-side

added added

removed removed

Lines of Context:
flist.c
48
48
extern int preserve_gid;
49
49
extern int relative_paths;
50
50
extern int implied_dirs;
 
51
extern int ignore_perishable;
 
52
extern int non_perishable_cnt;
51
53
extern int prune_empty_dirs;
52
54
extern int copy_links;
53
55
extern int copy_unsafe_links;
753
755
                /* See if file is excluded before reporting an error. */
754
756
                if (filter_level != NO_FILTERS
755
757
                 && (is_excluded(thisname, 0, filter_level)
756
 
                  || is_excluded(thisname, 1, filter_level)))
 
758
                  || is_excluded(thisname, 1, filter_level))) {
 
759
                        if (ignore_perishable && save_errno != ENOENT)
 
760
                                non_perishable_cnt++;
757
761
                        return NULL;
 
762
                }
758
763
                if (save_errno == ENOENT) {
759
764
#ifdef SUPPORT_LINKS
760
765
                        /* Avoid "vanished" error if symlink points nowhere. */
804
809
                flags |= FLAG_MOUNT_POINT;
805
810
        }
806
811
 
807
 
        if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
 
812
        if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
 
813
                if (ignore_perishable)
 
814
                        non_perishable_cnt++;
808
815
                return NULL;
 
816
        }
809
817
 
810
818
        if (lp_ignore_nonreadable(module_id)) {
811
819
#ifdef SUPPORT_LINKS