search for: local_exclude_list

...S_ISDIR(st->st_mode) ? "directory" : "file", - name, ent->pattern, + name, type, ent->pattern, ent->directory ? "/" : ""); } @@ -147,6 +148,7 @@ * LOCAL_EXCLUDE_LIST or the globals EXCLUDE_LIST. */ int check_exclude(char *name, struct exclude_struct **local_exclude_list, + struct exclude_struct **recur_local_exclude_list, STRUCT_STAT *st) { int n; @@ -156,21 +158,37 @@ /* never exclude '.', even if somebody does --exclude '*' */...

...lude(char *pattern, int include) { @@ -125,6 +129,7 @@ STRUCT_STAT *st) { int n; + extern int cvs_exclude; if (name && (name[0] == '.') && !name[1]) /* never exclude '.', even if somebody does --exclude '*' */ @@ -142,6 +147,18 @@ return !local_exclude_list[n]->include; } + /* The global CVS exclude list must be checked last, since the user may + have files under CVS control (eg directories called "core" or + "tags") that should not be excluded if cvs_exclude is set. CVS + controlled files and directories will be s...

...list.c Tue Dec 24 00:42:04 2002 +++ rsync-2.5.6cvsJ/flist.c Sat Jan 11 03:47:14 2003 @@ -39,6 +39,7 @@ extern int always_checksum; extern int cvs_exclude; +extern int rsync_exclude; extern int recurse; @@ -64,6 +65,7 @@ static char topsrcname[MAXPATHLEN]; static struct exclude_struct **local_exclude_list; +static struct exclude_struct **recur_local_exclude_list; static struct file_struct null_file; @@ -260,6 +262,9 @@ if (check_exclude(fname, local_exclude_list, st)) { return 1; } + if (check_exclude(fname, recur_local_exclude_list, st)) { + return 1; + } return 0; } @@ -799,8 +80...

...he 0 return code from check_exclude in the include case is now simply ignored in check_exclude_file (rather than preventing lists with lower precedence to be examined, as was the case in earlier versions): ... if (exclude_list && check_exclude(exclude_list, fname, is_dir)) return 1; if (local_exclude_list && check_exclude(local_exclude_list, fname, is_dir)) return 1; ... If you look at the equivalent section of code in 2.5.7, the behaviour is different (in the case of an included pattern, local_exclude list is not examined): if (exclude_list) { for (n=0; exclude_list[n]; n++) {...

...ke_backups; @@ -797,11 +798,20 @@ send_file_entry(file, f, base_flags); } - - if (S_ISDIR(file->mode) && recursive) { + if (S_ISDIR(file->mode) && recursive ) { struct exclude_struct **last_exclude_list = local_exclude_list; - - send_directory(f, flist, f_name(file)); - - local_exclude_list = last_exclude_list; + + if ( recurse_level>1 || !recurse_level) { + if (recurse_level) + recurse_level--; + + s...

...== '\0'))) continue; strlcpy(p, dname, MAXPATHLEN - l); send_file_name(f, flist, fname, recurse, 0); + } + if ( errno ) { + io_error = 1; + rprintf(FERROR, "readdir(%s): %s\n", dir, strerror(errno)); + /* Don't return yet; we want to clean up first */ } if (local_exclude_list) Index: rsync.c =================================================================== RCS file: /cvsroot/rsync/rsync.c,v retrieving revision 1.120 diff -u -r1.120 rsync.c --- rsync.c 18 Feb 2003 18:07:36 -0000 1.120 +++ rsync.c 23 Aug 2003 23:03:02 -0000 @@ -86,7 +86,7 @@ return -1; } - for (d...

.....wayne.. -------------- next part -------------- --- exclude.c 20 Jan 2004 04:53:59 -0000 1.58 +++ exclude.c 27 Jan 2004 07:36:35 -0000 @@ -27,6 +27,7 @@ #include "rsync.h" extern int verbose; +extern char *who_am_i; struct exclude_struct **exclude_list; struct exclude_struct **local_exclude_list; @@ -102,7 +103,7 @@ void free_exclude_list(struct exclude_st struct exclude_struct **list = *listp; if (verbose > 2) - rprintf(FINFO,"clearing exclude list\n"); + rprintf(FINFO, "[%c] clearing exclude list\n", *who_am_i); if (!list) return; @@ -203,12 +204,14...

I just received this bug report on Debian's rsync package. I've verified it. The entry from the manpage: -C [...] Finally, any file is ignored if it is in the same directory as a .cvsignore file and matches one of the patterns listed therein. Here the patterns of a .cvsignore file is apparently used to exclude file outside the directory where the .cvsignore file is found. Any

...s_exclude) { if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN - 1) { strcpy(p, ".cvsignore"); - add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCL UDE); + add_exclude_file(&local_exclude_list,fname,MISSING_OK,AD D_EXCLUDE); // PS XXX } else { io_error |= IOERR_GENERAL; rprintf(FINFO, And in fact, reverting this change seems to "fix" the problem. (The code in 2.6.1 is slightly different, but to the same effect.)...

Hi! This problem gave me quite a headache tonight... I more or less have this source directory: hop@krautesel:/var/tmp$ ls -laR from/ from/: total 12 drwxrwxr-x 3 hop hop 4096 Feb 8 03:34 . drwxrwxrwt 6 root root 4096 Feb 8 03:34 .. drwxrwxr-x 2 hop hop 4096 Feb 8 03:18 CVS -rw-rw-r-- 1 hop hop 0 Feb 8

...t_mode) != 0, exclude_level)) return NULL; @@ -825,6 +794,8 @@ void send_file_name(int f, struct file_l } if (S_ISDIR(file->mode) && recursive) { + if (one_file_system && file->dev != filesystem_dev) + return; struct exclude_struct **last_exclude_list = local_exclude_list; send_directory(f, flist, f_name(file));

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.

...2.5.5.mod/popt diff -u rsync-2.5.5/proto.h rsync-2.5.5.mod/proto.h --- rsync-2.5.5/proto.h Sun Mar 24 22:51:17 2002 +++ rsync-2.5.5.mod/proto.h Mon Nov 11 01:22:41 2002 @@ -57,17 +57,17 @@ int claim_connection(char *fname,int max_connections); int check_exclude(char *name, struct exclude_struct **local_exclude_list, STRUCT_STAT *st); -void add_exclude_list(const char *pattern, struct exclude_struct ***list, int include); -void add_exclude(const char *pattern, int include); +void add_exclude_list(const char *pattern, struct exclude_struct ***list, int include, int regexp); +void add_exclude(const char *pa...

...truct *file; extern int delete_excluded; + struct file_struct *file_hfsrf; + extern char *hfs_mode; + /* f is set to -1 when calculating deletion file list */ file = make_file(fname, &flist->string_area, f == -1 && delete_excluded? SERVER_EXCLUDES @@ -831,8 +834,77 @@ local_exclude_list = last_exclude_list; return; } + + if ( file->basename[0] && S_ISREG(file->mode) && hfs_mode ) { + /** check for rsrc fork, and add if found */ + file_hfsrf = hfs_rsrc_fork(f,flist,file,fname); + if ( file_hfsrf ) { + flist->files[flist->count++] = file_hfsrf;...