search for: copy_link

I came up with a patch to fix the problem of IO Errors caused by excluded files as did Eugene V. Chupriyanov below. Is there a chance that this change will show up in a future version of rsync? Is there a reason that we should not ignore IO errors when copy_links is off? Just want to make sure that I'm not missing something here that may corrupt my syncs.... Here's the version that I came up with before finding Eugene's patch: --- rsync-2.5.5/flist.c.orig 2002-03-14 15:20:20.000000000 -0600 +++ rsync-2.5.5/flist.c 2002-12-02 19:27:02.0000000...

...1.468 +++ flist.c 10 Nov 2007 17:21:51 -0000 @@ -1026,8 +1026,8 @@ struct file_struct *make_file(const char if (save_errno == ENOENT) { #ifdef SUPPORT_LINKS /* Avoid "vanished" error if symlink points nowhere. */ - if (copy_links && x_lstat(thisname, &st, NULL) == 0 - && S_ISLNK(st.st_mode)) { + if ((copy_links && x_lstat(thisname, &st, NULL) == 0 + && S_ISLNK(st.st_mode)) || x_stat(thisname, &st, NULL) !=...

...n pagefile.sys is however in the exclude-list, so I think rsync shouldn't care that it can't stat the file. The code fragment responsible is if (readlink_stat(fname, &st, linkbuf) != 0) { int save_errno = errno; if ((errno == ENOENT) && copy_links && !noexcludes) { /* symlink pointing nowhere, see if excluded */ memset((char *) &st, 0, sizeof(st)); if (check_exclude_file(f, fname, &st)) { /* file is excluded anyway, ignore...

...(F_IS_HLINKED(file)) diff -pur rsync-3.0.7/options.c rsync-3.0.7.new/options.c --- rsync-3.0.7/options.c 2009-12-21 22:40:41.000000000 +0000 +++ rsync-3.0.7.new/options.c 2010-06-14 10:24:49.329958121 +0100 @@ -48,6 +48,7 @@ int append_mode = 0; int keep_dirlinks = 0; int copy_dirlinks = 0; int copy_links = 0; +int copy_devices = 0; int preserve_links = 0; int preserve_hard_links = 0; int preserve_acls = 0; @@ -349,6 +350,7 @@ void usage(enum logcode F) rprintf(F," -o, --owner preserve owner (super-user only)\n"); rprintf(F," -g, --group prese...

...ptions.c =================================================================== RCS file: /cvsroot/rsync/options.c,v retrieving revision 1.127 diff -u -r1.127 options.c --- options.c 23 Jan 2004 09:32:50 -0000 1.127 +++ options.c 24 Jan 2004 20:30:08 -0000 @@ -38,6 +38,7 @@ int archive_mode = 0; int copy_links = 0; int preserve_links = 0; +int follow_links_depth = 0; int preserve_hard_links = 0; int preserve_perms = 0; int preserve_devices = 0; @@ -224,6 +225,7 @@ rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); rprintf(F," -...

...by patching flist.c. Here is the diff: --- flist.c.orig Mon Jul 8 17:48:12 2002 +++ flist.c Mon Jul 8 17:48:39 2002 @@ -644,7 +644,7 @@ if (readlink_stat(fname, &st, linkbuf) != 0) { int save_errno = errno; - if ((errno == ENOENT) && copy_links && !noexcludes) { + if ((errno == ENOENT) && !noexcludes) { /* symlink pointing nowhere, see if excluded */ memset((char *) &st, 0, sizeof(st)); if (check_exclude_file(f, fname, &st)) { T...

...-------------- Adds an archive mode that includes the delete option. --- orig/options.c 2004-09-23 13:39:05.000000000 -0400 +++ options.c 2004-11-13 09:56:27.000000000 -0500 @@ -39,6 +39,7 @@ int whole_file = -1; int archive_mode = 0; +int archive_delete_mode = 0; int keep_dirlinks = 0; int copy_links = 0; int preserve_links = 0; @@ -233,6 +234,7 @@ rprintf(F," -q, --quiet decrease verbosity\n"); rprintf(F," -c, --checksum always checksum\n"); rprintf(F," -a, --archive archive mode, equivalent to -rlptgoD\n"); +...

...ions-priv-backups && X--- options.c.t Fri Jun 21 08:56:31 2002 X+++ options.c Fri Jun 21 09:41:41 2002 X@@ -21,6 +21,9 @@ X #include "rsync.h" X #include "popt.h" X X+#ifdef HAVE_CHMOD X+int priv_backups = 0; X+#endif X int make_backups = 0; X int whole_file = -1; X int copy_links = 0; X@@ -188,6 +191,7 @@ X rprintf(F," -b, --backup make backups (default %s suffix)\n",BACKUP_SUFFIX); X rprintf(F," --backup-dir make backups into this directory\n"); X rprintf(F," --suffix=SUFFIX override backup suffix\n&...

...statret = -1; diff -ru rsync-3.0.6/options.c rsync-3.0.6-writedev/options.c --- rsync-3.0.6/options.c 2009-04-13 08:01:14.000000000 +1200 +++ rsync-3.0.6-writedev/options.c 2009-10-15 20:56:18.000000000 +1300 @@ -48,6 +48,7 @@ int keep_dirlinks = 0; int copy_dirlinks = 0; int copy_links = 0; +int write_devices = 0; int preserve_links = 0; int preserve_hard_links = 0; int preserve_acls = 0; @@ -350,6 +351,7 @@ rprintf(F," -o, --owner preserve owner (super-user only)\n"); rprintf(F," -g, --group preserve group\n"); rpr...

...of 1 and thus they are copied twice. If, however, the source file accidentally has a link count > 1 (which is not related to the multiple symlinks) rsync will create a hard link on the target host, as supposed. To handle this situation I simply disabled the (st.st_nlink > 1) filter if "copy_links" is true, too. This seems to work for me, but I don't know if this is a sufficient solution for others. May be a special option should be considered to disable the (st.st_nlink > 1) optimization explicitly. Or my situation is too exotic to be considered to fix. Dieter. -------------...

...-direct-write/lib: dummy diff -ru rsync-2.4.6/options.c rsync-2.4.6-direct-write/options.c --- rsync-2.4.6/options.c Tue Sep 5 19:46:43 2000 +++ rsync-2.4.6-direct-write/options.c Sun Nov 11 10:40:01 2001 @@ -22,6 +22,7 @@ int make_backups = 0; +int direct_write = 0; int whole_file = 0; int copy_links = 0; int preserve_links = 0; @@ -147,6 +148,7 @@ rprintf(F," --ignore-errors delete even if there are IO errors\n"); rprintf(F," --max-delete=NUM don't delete more than NUM files\n"); rprintf(F," --partial keep partial...

...FINFO,"renaming %s to %s\n",fnametmp,fname); --- rsync-2.6.1/options.c.bak 2004-04-17 20:07:23.000000000 +0300 +++ rsync-2.6.1/options.c 2004-04-27 19:28:10.000000000 +0300 @@ -37,6 +37,7 @@ int make_backups = 0; **/ int whole_file = -1; +int do_fsync = 0; int archive_mode = 0; int copy_links = 0; int preserve_links = 0; @@ -230,6 +231,7 @@ void usage(enum logcode F) rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); rprintf(F," --backup-dir make backups into this directory\n"); rprintf(F," -...

Hello folks, trying to make use of the new --keep-dirlinks feature for a synch port; it works excellent but feels incomplete without a way for rsync to ignore recursive links. Example: # ls -la . total 6 drwxrwxr-x 2 bldmstr staff 512 Aug 16 21:42 . drwxrwxr-x 8 bldmstr staff 512 Aug 16 21:41 .. lrwxrwxrwx 1 bldmstr staff 2 Aug 20 12:07 bogus -> .. if you use

...RG_NONE, &rsync_exclude , 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only , 0, 0, 0 }, {"links", 'l', POPT_ARG_NONE, &preserve_links , 0, 0, 0 }, {"copy-links", 'L', POPT_ARG_NONE, &copy_links , 0, 0, 0 }, diff -ru rsync-2.5.6cvs/rsync.yo rsync-2.5.6cvsJ/rsync.yo --- rsync-2.5.6cvs/rsync.yo Tue Jan 14 09:35:25 2003 +++ rsync-2.5.6cvsJ/rsync.yo Tue Jan 14 09:35:40 2003 @@ -276,6 +276,11 @@ this is launched from cron every few hours. +This command creates a linked backup of /home nam...

...RG_STRING, &rsync_exclude , 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only , 0, 0, 0 }, {"links", 'l', POPT_ARG_NONE, &preserve_links , 0, 0, 0 }, {"copy-links", 'L', POPT_ARG_NONE, &copy_links , 0, 0, 0 }, diff -ru rsync-2.5.6/proto.h rsync-2.5.6J/proto.h --- rsync-2.5.6/proto.h Sun Jan 26 20:35:09 2003 +++ rsync-2.5.6J/proto.h Wed Jan 29 17:16:39 2003 @@ -58,6 +58,7 @@ void setup_protocol(int f_out,int f_in); int claim_connection(char *fname,int max_connections); int check_exclude(c...

...+ omit_dir_times = 2; if (make_backups && !backup_dir) omit_dir_times = 1; @@ -1513,6 +1519,8 @@ argstr[x++] = 'm'; if (omit_dir_times == 2) argstr[x++] = 'O'; + if (omit_dir_changes == 1) + args[ac++] = "--omit-dir-changes"; } else { if (copy_links) argstr[x++] = 'L'; Index: receiver.c =================================================================== RCS file: /cvsroot/rsync/receiver.c,v retrieving revision 1.181 diff -u -r1.181 receiver.c --- receiver.c 1 Jun 2006 08:04:50 -0000 1.181 +++ receiver.c 2 Jun 2006 13:00:01 -0000 @...

...ruly, Christian Konz -------------- next part -------------- diff -uNr rsync-2.6.6/flist.c rsync-2.6.6_patch/flist.c --- rsync-2.6.6/flist.c 2005-07-07 21:49:14.000000000 +0200 +++ rsync-2.6.6_patch/flist.c 2006-01-07 14:04:38.000000000 +0100 @@ -54,6 +54,7 @@ extern int implied_dirs; extern int copy_links; extern int copy_unsafe_links; +extern int remote_protocol; extern int protocol_version; extern int sanitize_paths; extern int orig_umask; @@ -314,6 +315,7 @@ { unsigned short flags; static time_t modtime; + static time_t acctime; static mode_t mode; static int64 dev; static dev_t r...

...T_ARG_STRING, &rsync_exclude, 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, {"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 }, {"copy-links", 'L', POPT_ARG_NONE, &copy_links, 0, 0, 0 }, diff -ru rsync-2.6.1pre-1/proto.h rsync-2.6.1pre-1J/proto.h --- rsync-2.6.1pre-1/proto.h 2004-02-18 00:13:06.000000000 +0100 +++ rsync-2.6.1pre-1J/proto.h 2004-04-07 11:42:21.000000000 +0200 @@ -52,7 +52,8 @@ void setup_protocol(int f_out,int f_in); int claim_connection(char *fname,i...

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

...43): remark #1419: external declaration in primary source file extern int log_got_error; ^ main.c(44): remark #1419: external declaration in primary source file extern int module_id; ^ main.c(45): remark #1419: external declaration in primary source file extern int copy_links; ^ main.c(46): remark #1419: external declaration in primary source file extern int copy_dirlinks; ^ main.c(47): remark #1419: external declaration in primary source file extern int keep_dirlinks; ^ main.c(48): remark #1419: external declaration in pri...