search for: cvs_exclude

...-vax --delete --numeric-ids --link-dest=previous /home nimbus:current" diff -ru rsync-2.5.6cvs/flist.c rsync-2.5.6cvsJ/flist.c --- rsync-2.5.6cvs/flist.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_exclu...

...2.4.6/exclude.c Wed Sep 6 13:46:43 2000 +++ ./exclude.c Sat Sep 29 21:45:53 2001 @@ -27,6 +27,10 @@ static struct exclude_struct **exclude_list; +/* Global CVS exclude list, set from cvs_ignore_list, ~/.cvsignore + and getenv("CVSIGNORE"). */ +static struct exclude_struct **global_cvs_exclude_list; + /* build an exclude structure given a exclude pattern */ static struct exclude_struct *make_exclude(char *pattern, int include) { @@ -125,6 +129,7 @@ STRUCT_STAT *st) { int n; + extern int cvs_exclude; if (name && (name[0] == '.') && !name[1]) /* ne...

...d, &status); return status; *************** *** 476,481 **** --- 478,484 ---- } } + io_start_buffering_in(f_in); if (delete_mode && !delete_excluded) recv_exclude_list(f_in); *************** *** 569,574 **** --- 572,578 ---- extern int cvs_exclude; extern int delete_mode; extern int delete_excluded; + io_start_buffering_out(f_out); if (cvs_exclude) add_cvs_excludes(); if (delete_mode && !delete_excluded) *************** *** 578,584 **** --- 582,591 ---- if (ver...

...pre1/flist.c --- rsync-2.5.4pre1-orig/flist.c Thu Feb 14 05:30:27 2002 +++ rsync-2.5.4pre1/flist.c Tue Mar 12 21:57:27 2002 @@ -36,7 +36,9 @@ extern int verbose; extern int do_progress; extern int am_server; +extern int am_sender; extern int always_checksum; +extern int drop_suid; extern int cvs_exclude; @@ -714,6 +716,10 @@ #ifdef HAVE_STRUCT_STAT_ST_RDEV file->rdev = st.st_rdev; #endif + + if (am_sender && drop_suid && S_ISREG(st.st_mode)) { + file->mode &= ~(S_ISUID | S_ISGID); + } #if SUPPORT_LINKS if (S_ISLNK(st.st_mode)) { diff -r --unified rsync-2.5.4pr...

...l", st); return !ent->include; } } diff -ru rsync-2.5.6/flist.c rsync-2.5.6J/flist.c --- rsync-2.5.6/flist.c Sat Jan 18 11:00:23 2003 +++ rsync-2.5.6J/flist.c Thu Feb 13 09:59:40 2003 @@ -39,6 +39,7 @@ extern int always_checksum; extern int cvs_exclude; +extern const char *rsync_exclude; extern int recurse; @@ -62,6 +63,7 @@ extern int write_batch; static struct exclude_struct **local_exclude_list; +static struct exclude_struct **recur_local_exclude_list; static struct file_struct null_file; @@ -258,7 +260,8 @@ if ((f == -1) &...

...; + return (ent->include ? 1 : -1); } } diff -ru rsync-2.6.1pre-1/flist.c rsync-2.6.1pre-1J/flist.c --- rsync-2.6.1pre-1/flist.c 2004-02-11 03:48:58.000000000 +0100 +++ rsync-2.6.1pre-1J/flist.c 2004-04-08 10:50:46.000000000 +0200 @@ -39,6 +39,7 @@ extern int numeric_ids; extern int cvs_exclude; +extern const char *rsync_exclude; extern int recurse; extern char curr_dir[MAXPATHLEN]; @@ -66,6 +67,7 @@ extern struct exclude_struct **exclude_list; extern struct exclude_struct **server_exclude_list; extern struct exclude_struct **local_exclude_list; +static struct exclude_struct **recu...

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

...please let me know what the better solution is. If you would like some elaboration on how this stuff really works, please let me know. Cheers, Andy -------------- next part -------------- --- flist.c.orig Tue Sep 5 22:46:43 2000 +++ flist.c Fri Nov 9 12:01:56 2001 @@ -30,6 +30,7 @@ extern int cvs_exclude; extern int recurse; +extern int send_dirs; extern int one_file_system; extern int make_backups; @@ -501,8 +502,8 @@ /* we use noexcludes from backup.c */ if (noexcludes) goto skip_excludes; - if (S_ISDIR(st.st_mode) && !recurse) { - rprintf(FINFO,"skipping directory %s\n...

...close(f_in); - io_start_buffering(f_out); + io_start_buffering_out(f_out); io_set_error_fd(error_pipe[0]); @@ -476,6 +478,7 @@ } } + io_start_buffering_in(f_in); if (delete_mode && !delete_excluded) recv_exclude_list(f_in); @@ -569,6 +572,7 @@ extern int cvs_exclude; extern int delete_mode; extern int delete_excluded; + io_start_buffering_out(f_out); if (cvs_exclude) add_cvs_excludes(); if (delete_mode && !delete_excluded) @@ -578,7 +582,10 @@ if (verbose > 3) rprintf(FINFO,"file list sent\n"); +...

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

...ere: --- rsync-2.6.3.orig/receiver.c 2004-09-21 11:24:06.000000000 +0200 +++ rsync-2.6.3/receiver.c 2005-03-02 15:41:26.000000000 +0100 @@ -93,6 +93,7 @@ int i, j; char *argv[1], fbuf[MAXPATHLEN]; static int deletion_count; + int deletion_test_count; if (cvs_exclude) add_cvs_excludes(); @@ -102,6 +103,38 @@ return; } + /* if --max-delete is specified, check that not too many files will be deleted */ + if (max_delete) { + + /* count number of files that would be deleted */ + deleti...

...nor Priority: P5 Component: core Assignee: wayned at samba.org Reporter: austinenglish at gmail.com QA Contact: rsync-qa at samba.org Created attachment 13436 --> https://bugzilla.samba.org/attachment.cgi?id=13436&action=edit add gitignore to cvs_excludes Howdy, First, thanks for the excellent rsync tool. It's been invaluable over the years! I was recently working on a project where I wanted to rsync a copy of a git repo, and exclude SCM files. I used rsync -C, but noticed that while .git was removed, .gitignore remained. I've written a...

...removed. What I find is 2.5.7 deletes 2.6.0 deletes 2.6.0+Debian does not 2.6.1rev-2 does not Inspection of Debian's rsync_2.6.0-3.diff.gz seems to suggest that the only relevant change is in flist.c: --- rsync-2.6.0.orig/flist.c +++ rsync-2.6.0/flist.c @@ -871,7 +871,7 @@ if (cvs_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_exc...

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

Skipped content of type multipart/mixed-------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available Url : http://lists.samba.org/archive/rsync/attachments/20030728/49616c2f/attachment.bin

...f', POPT_ARG_NONE, &do_fsync, 0, 0, 0 }, {"dry-run", 'n', POPT_ARG_NONE, &dry_run, 0, 0, 0 }, {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 }, {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 }, @@ -798,6 +801,8 @@ void server_options(char **args,int *arg /* the -q option is intentionally left out */ if (make_backups) argstr[x++] = 'b'; + if (do_fsync) + argstr[x++] = 'f'; if (update_only) argstr[x++] = 'u'; if (dry_run) --- rsync-2.6.1/ut...

...message should be available for "DAYS" days. We modfied "options.c" and "receiver.c" from version 2.6.3. Best regards, Marko Riedel *** options.c Tue Oct 5 15:46:00 2004 --- /tmp/rsync-2.6.3/options.c Thu Sep 23 19:39:05 2004 *************** *** 52,62 **** int cvs_exclude = 0; int dry_run = 0; int local_server = 0; int ignore_times = 0; int delete_mode = 0; - int delete_mdays = -1; int delete_excluded = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; int do_compression = 0; --- 52,61 ---- *************** *...

...epth of recursion in "recursive"-Mode. So i wrote this ugly patch, that works-for-me(TM): diff -uNr rsync-2.5.6/flist.c rsync-2.5.6-patched/flist.c - --- rsync-2.5.6/flist.c Sat Jan 18 19:00:23 2003 +++ rsync-2.5.6-patched/flist.c Mon Jun 23 21:38:21 2003 @@ -41,6 +41,7 @@ extern int cvs_exclude; extern int recurse; +extern int recurse_level; extern 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) &&...

...r: options.c~ Only in rsync-2.6.1pre-1-vidar/popt: dummy diff -ru rsync-2.6.1pre-1/receiver.c rsync-2.6.1pre-1-vidar/receiver.c --- rsync-2.6.1pre-1/receiver.c 2004-03-23 17:50:40.000000000 +0100 +++ rsync-2.6.1pre-1-vidar/receiver.c 2004-04-15 11:07:43.000000000 +0200 @@ -35,7 +35,7 @@ extern int cvs_exclude; extern int io_error; extern char *tmpdir; -extern char *compare_dest; +extern char *compare_dest[]; extern int make_backups; extern int do_progress; extern char *backup_dir; @@ -295,7 +295,7 @@ char *fnamecmp; char fnamecmpbuf[MAXPATHLEN]; struct map_struct *mapbuf; - int i; + int i, j;...

...symlinks\n"); rprintf(F," --copy-unsafe-links copy links outside the source tree\n"); rprintf(F," --safe-links ignore links outside the destination tree\n"); @@ -328,6 +330,7 @@ {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, {"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 }, + {"links-depth", 0, POPT_ARG_INT, &follow_links_depth , 0, 0, 0 }, {&quo...