search for: whole_file

...ndwidth line: rsync -v -r -z -t -p <local dir> <user>@<host>:<dir on host> After updating from rsync 2.5.2 to 2.5.4 I noticed that modified files are always copied completely. The problem seems to be related to the new (in 2.5.3) option -no-whole-file. The global variable whole_file is initialized to -1 in options.c. In server_options() (options.c) it is set to zero if the original value has not been changed. A value of zero on whole_file is not transmitted to the remote rsync however. So the remote rsync has -1 instead of zero on its whole_file variable. To fix the problem I...

...---------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Additional Comments From wayned@samba.org 2004-09-23 08:47 ------- This was a very simple bug in the g2r-basis-filename.diff: the line that checked if whole_file was non-zero needed to be updated to check if whole_file was greater than 0. I missed this in my testing because I tested local copies using the --no-whole-file option. So, temporary workaround: specify --no-whole-file. Proper fix, get an updated version of the g2r-basis-filename patch (or just...

...(es) for this purpose and not clutter up rsync code? -------------- next part -------------- diff -ru rsync-2.5.5.orig/generator.c rsync-2.5.5/generator.c --- rsync-2.5.5.orig/generator.c Mon Mar 25 07:54:31 2002 +++ rsync-2.5.5/generator.c Sun Jun 2 20:25:54 2002 @@ -141,6 +141,7 @@ extern int whole_file, no_whole_file; extern int local_server; extern int write_batch; + extern int read_batch; assert(whole_file == 0 || whole_file == 1); @@ -150,7 +151,7 @@ return True; else if (no_whole_file) return False; - else if (write_batch) + else if (write_batch || read_batch) return Fals...

...h. *************** *** 210,223 **** * * When do we do this? If the user's explicitly said they * want the whole thing, or if { they haven't explicitly ! * requested a delta, and it's local but not batch mode.} * * Whew. */ static BOOL disable_deltas_p(void) { if (whole_file > 0) return True; ! if (whole_file == 0 || write_batch || read_batch) return False; return local_server; } --- 211,224 ---- * * When do we do this? If the user's explicitly said they * want the whole thing, or if { they haven't explicitly ! * requested a delta, a...

...POPT_ARG_NONE, &preserve_links, 0, 0, 0 }, + {"links-depth", 0, POPT_ARG_INT, &follow_links_depth , 0, 0, 0 }, {"copy-links", 'L', POPT_ARG_NONE, &copy_links, 0, 0, 0 }, {"whole-file", 'W', POPT_ARG_VAL, &whole_file, 1, 0, 0 }, {"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },

Patch to add an archive mode that includes deletion. -Rob -------------- next part -------------- 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"...

...;SHAR_EOF' > options-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 ove...

...; set_nonblocking(f_in); set_nonblocking(f_out); @@ -582,7 +582,7 @@ list_only = 1; } - if (!write_batch) /* dw */ + if (!write_batch) send_exclude_list(f_out); flist = recv_file_list(f_in); @@ -658,6 +658,7 @@ extern char *shell_cmd; extern int rsync_port; extern int whole_file; + extern int write_batch; extern int read_batch; int rc; @@ -685,7 +686,7 @@ return start_socket_client(host, path, argc-1, argv+1); } - if (!read_batch) { /* dw */ + if (!read_batch) { p = find_colon(argv[0]); if (p) { @@ -711,8 +712,11 @@ p = find_colon(argv[argc-1]);...

...OPT_MODIFY_WINDOW, 0, 0 }, {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system , 0, 0, 0 }, @@ -471,6 +481,16 @@ print_rsync_version(FINFO); exit_cleanup(0); + case OPT_SOURCE_FILTER: + /* source_filter already set by popt */ + whole_file = 1; + break; + + case OPT_DEST_FILTER: + /* dest_filter already set by popt */ + whole_file = 1; + break; + case OPT_SUFFIX: /* The value has already been set by popt, but * we need to remember that a suffix was specified @@ -631,6 +65...

Hi NG, I want to do incremental backups to a remote server running rsyncd (because daemonless transfer via ssh often hangs!). In contrast to transfer via ssh (without remote rsyncd) this doesn't seem possible, or do I miss something? Imagine I want to incrementally backup `mydir' to the backup space `backup' on e remote server `alpha' running an rsync daemon. rsyncd on

...- Only in rsync-2.4.6-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...

...me, file, &st)) { > - if (fnamecmp == fname) > - set_perms(fname,file,&st,1); > - return; > - } > - > - if (dry_run) { > - write_int(f_out,i); > + fd = open_base_file(file, fname, statret, &st); > + if (fd == -2) > return; > - } > - > - if (whole_file) { > - write_int(f_out,i); > - send_sums(NULL,f_out); > - return; > - } > - > - /* open the file */ > - fd = do_open(fnamecmp, O_RDONLY, 0); > > - if (fd == -1) { > - rprintf(FERROR,RSYNC_NAME": failed to open \"%s\", continuing : %s\n",...

https://bugzilla.samba.org/show_bug.cgi?id=4834 Summary: --inplace with --backup --backup-dir does not work Product: rsync Version: 2.6.9 Platform: All OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: core AssignedTo: wayned@samba.org ReportedBy: joost@seat-ibiza.nl

...t_cleanup(RERR_FILEIO); + } if (verbose > 2) rprintf(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 mak...

Hi, I am exploring extending Kyle Jones' patch (which implements post-transfer filter in receiver.c) to pre-filter or otherwise pre-process the file before it is sent. Kyle Jones patch can be found here <http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=b6f55s%24256q%241%40FreeBSD.csie.NCTU.edu.tw&rnum=6> and the rationale for what I am trying to do here

...number of generator.c: In function `recv_generator': generator.c:344: warning: comparison between signed and unsigned type errors in various files, as well as main.c: In function `start_client': main.c:665: warning: unused variable `write_batch' main.c:664: warning: unused variable `whole_file' including... zlib/inftrees.c: In function `huft_build': zlib/inftrees.c:216: warning: signed and unsigned type in conditional expression zlib/inftrees.c: In function `inflate_trees_fixed': zlib/inftrees.c:403: warning: unused parameter `z' Note again that running without -z works...

For those that like to assist in the testing of rsync, the CVS version now defaults to doing an incremental file-list scan when it is recursing through the directories. This avoids keeping the whole file list in memory, and allows the transfer to start working on changed files before it has completed the recursive scan of the sending side. The code appears to be working well so far, but there

...ching rsync. This patch was made against rsync 2.5.4. cheers, Tony rsync-2.5.4-force_fd.apc.patch ----- diff -urN rsync-2.5.4-2/main.c rsync-2.5.4-2apc/main.c --- rsync-2.5.4-2/main.c Mon Sep 30 10:09:17 2002 +++ rsync-2.5.4-2apc/main.c Thu Mar 6 15:29:27 2003 @@ -665,6 +665,8 @@ extern int whole_file; extern int write_batch; extern int read_batch; + extern int force_f_in; + extern int force_f_out; int rc; /* Don't clobber argv[] so that ps(1) can still show the right @@ -770,9 +772,14 @@ list_only = 1; } - pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_i...

...re quite a few compilation warnings from rsync-2.5.5rc1 that could be eliminated by code cleanup. gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -c main.c -o main.o main.c: In function `start_client': main.c:665: warning: unused variable `write_batch' main.c:664: warning: unused variable `whole_file' These warnings will go away when the two variables are properly bracketed by #ifdef INET6 ... #endif: gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c lib/getaddrinfo.c -o lib/getaddrinfo.o lib/getaddrinfo.c: In function `getaddrinfo': lib/getaddrinfo.c:399: warning: unused va...

...cc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c util.c -o util.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c main.c -o main.o main.c: In function `start_client': main.c:665: warning: unused variable `write_batch' main.c:664: warning: unused variable `whole_file' gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c checksum.c -o checksum.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c match.c -o match.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c syscall.c -o syscall.o gcc -I. -I. -O3 -mcpu=i686...