search for: last_exclude_list

...tern int one_file_system; extern int make_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) + rec...

...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 +804,11 @@ if (S_ISDIR(file->mode) && recursive) { struct exclude_struct **last_exclude_list = local_exclude_list; + struct exclude_struct **recur_last_exclude_list = + recur_local_exclude_list; send_directory(f, flist, f_name(file)); local_exclude_list = last_exclude_list; + recur_local_exclude_list = recur_last_exclude_list; return; } } @@ -840,6 +848,29 @@...

...rn) out_of_memory("copy_exclude_list"); + } + to[len]=NULL; + return to; +} void send_file_name(int f, struct file_list *flist, char *fname, int recursive, unsigned base_flags) @@ -800,8 +828,11 @@ if (S_ISDIR(file->mode) && recursive) { struct exclude_struct **last_exclude_list = local_exclude_list; + struct exclude_struct **recur_last_exclude_list = + recur_local_exclude_list; send_directory(f, flist, f_name(file)); local_exclude_list = last_exclude_list; + recur_local_exclude_list = recur_last_exclude_list; return; } } @@ -840,6 +871,7 @@ p =...

...de_file(fname, S_ISDIR(st.st_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));

...en]=NULL; + return to; +} void receive_file_entry(struct file_struct **fptr, unsigned short flags, struct file_list *flist, int f) @@ -925,8 +961,11 @@ if (recursive && S_ISDIR(file->mode) && !(file->flags & FLAG_MOUNT_POINT)) { struct exclude_struct **last_exclude_list = local_exclude_list; + struct exclude_struct **recur_last_exclude_list = + recur_local_exclude_list; send_directory(f, flist, f_name_to(file, fbuf)); local_exclude_list = last_exclude_list; + recur_local_exclude_list = recur_last_exclude_list; return; } } @@ -963,6 +1002,7 @@...

> 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.

...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; + send_file_entry(...