Wayne Davison
e2bc412669
Added a warning message when a file fails to verify, letting the user
...
know if we retained it or discarded it. Especially useful for batch-
reading mode where the old code could look like it did the update when
it really silently failed.
2004-07-22 04:15:18 +00:00
Wayne Davison
e344209582
Added even more double-quoting.
2004-07-22 03:23:04 +00:00
Wayne Davison
e76ca1458c
No need to check both delete_after and delete_mode since the former
...
implies the latter.
2004-07-22 02:52:57 +00:00
Wayne Davison
16cc9ca2c9
In read_batch mode, we read ints from the new batch_gen_fd pipe and
...
only process the updates from the batch file when the generator has
indicated that it is ready (which ensures that all the necessary
dirs have been created).
2004-07-21 23:59:37 +00:00
Wayne Davison
8c90957ff5
Got rid of read_batch special case.
2004-07-21 23:59:33 +00:00
Wayne Davison
c0d8e84c9d
Setup for read_batch mode a little differently:
...
- Avoid calling local_child().
- Create a pipe that lets the generator send us index values.
- Set batch_gen_fd for the receiver to read the pipe.
2004-07-21 23:59:31 +00:00
Wayne Davison
b0ad542928
Added batch_gen_fd.
2004-07-21 23:59:28 +00:00
Wayne Davison
727b35f665
In read_batch mode, we now let the code write out the index value
...
to the f_out pipe before we return from recv_generator(). This gives
the receiver something to sync with so that it doesn't rush ahead of
us (which could be bad if we didn't have a chance to create the
destination dirs yet).
2004-07-21 23:59:25 +00:00
Wayne Davison
aa4343211f
Don't write out the protocol_version number in read_batch mode.
2004-07-21 23:59:22 +00:00
Wayne Davison
3611989355
Complain if the user combines --read-batch with --files-from.
2004-07-21 22:50:11 +00:00
Wayne Davison
3381b77d71
Improved the test a little.
2004-07-21 21:06:13 +00:00
Wayne Davison
dce70db374
Adding a test for the --compare-dest option.
2004-07-21 20:58:32 +00:00
Wayne Davison
2adbcdc7ea
A couple am_sender checks (one negated) were not needed.
2004-07-21 20:17:02 +00:00
Wayne Davison
7e5fa372cf
Call map_file() with the new block_size arg (had to delay the
...
call to map_file() until the block size was known).
2004-07-20 21:35:58 +00:00
Wayne Davison
6e45e1dd86
- Call map_file() with the new block_size arg (had to delay the
...
call to map_file() until the block size was known).
- Got rid of the setting of max_map_size.
2004-07-20 21:35:55 +00:00
Wayne Davison
7f290d5c82
- Added a new block_size arg to map_file(). Use it to set the
...
new def_window_size member variable.
- Got rid of max_map_size global (we use def_window_size now).
2004-07-20 21:35:52 +00:00
Wayne Davison
b6609cafae
- Got rid of cleanup_buf (map-file cleanup is not needed).
...
- Renamed the cleanup_fd* vars.
2004-07-20 21:35:49 +00:00
Wayne Davison
efa95a1842
Call map_file() with its new block_size arg.
2004-07-20 21:35:46 +00:00
Wayne Davison
51bd4f0f3a
Tweaked an error message.
2004-07-20 21:10:20 +00:00
Wayne Davison
562b61695e
Added a def_window_size variable to struct map_struct.
2004-07-20 21:08:33 +00:00
Wayne Davison
98f51bfb56
- More batch-file improvements.
...
- A few spelling fixes.
2004-07-20 18:12:50 +00:00
Wayne Davison
73f0ce69e7
We now append the exclude list as a "here" document to the end of
...
the BATCH.sh file.
2004-07-20 17:07:55 +00:00
Wayne Davison
cf338ab1be
Made write_sbuf() non-static.
2004-07-20 16:57:18 +00:00
Wayne Davison
66a9dc9639
Changed write_batch_argvs_file() to new write_batch_shell_file()
...
call (with extra arg).
2004-07-19 17:11:41 +00:00
Wayne Davison
8ed9d849dc
Added new function discard_receive_data().
2004-07-19 17:05:01 +00:00
Wayne Davison
5ebab6c10c
- Don't allow some crafty user to try to force us to update a
...
server-excluded file.
- If get_tmpname() fails we need to discard the update using
receive_data().
2004-07-19 16:37:30 +00:00
Wayne Davison
e7a69008e6
Do a better job of writing out the BATCH.sh file (i.e. quote special
...
characters and spaces in args, omit all the source args, omit the
include/exclude args if we can).
2004-07-19 08:27:17 +00:00
Wayne Davison
73e015683c
Changed batch.rsync_argvs to batch.sh.
2004-07-19 03:59:35 +00:00
Wayne Davison
b462781fd0
Fixed the argv munging to work properly regardless of whether the
...
user specified a trailing '=VALUE' or put the value in a separate
arg.
2004-07-19 00:53:49 +00:00
Wayne Davison
93095cbe99
A very minor optimization was made to read_sbuf(), read_byte(),
...
write_sbuf(), and write_byte().
2004-07-17 21:17:34 +00:00
Wayne Davison
399371e7b5
- Improved the warning about --inplace.
...
- Fixed the sentence describing how to read standard input with
--read-batch.
2004-07-17 16:44:16 +00:00
Wayne Davison
d7142e2328
Moved the read_batch abort check below the code that handles the
...
symlinks and devices.
2004-07-17 16:29:10 +00:00
Wayne Davison
1f75bb1066
Revamped some of the io variables and calls to make the various I/O
...
functions seemlessly work on fds that aren't for the main socket. This
involved changing some fd-variable names (to make them clearer), adding
io_set_sock_fds(), and making input buffering have a better enabled
flag (via an allocated buffer, just like the output buffering). I also
got rid of the fd arg to some functions where the fd arg could only
specify the input or output fd for the socket (which we already know).
2004-07-17 15:20:00 +00:00
Wayne Davison
088adfacc1
Got rid of the arg to io_start_multiplex_out().
2004-07-17 15:19:57 +00:00
Wayne Davison
da3478b2a7
- Got rid of the arg to the io_start_multiplex_{in,out}() calls.
...
- Call io_set_sock_fds().
2004-07-17 15:19:54 +00:00
Wayne Davison
5126ed1ef0
Changed a MIN() to a MAX() when setting max_map_size.
2004-07-17 10:59:14 +00:00
Wayne Davison
61fb21ad28
Mention the new --inplace option.
2004-07-17 00:00:27 +00:00
Wayne Davison
a3221d2ac1
My version of Mark Curtis's --inplace option.
2004-07-16 20:06:24 +00:00
Wayne Davison
2c713fcdfa
Added a check for ftruncate.
2004-07-16 20:04:20 +00:00
Wayne Davison
afd8bdb907
Avoid some useless memory copying.
2004-07-16 18:08:52 +00:00
Wayne Davison
efd5ee5786
- Limit the maximum block size we compute for a file.
...
- Set max_map_size based on the current file's block size (so that
map_ptr() is more efficient with large blocks).
2004-07-16 18:04:23 +00:00
Wayne Davison
510b4cd4d5
Added a max_map_size variable, initialized to MAX_MAP_SIZE.
2004-07-16 18:02:30 +00:00
Wayne Davison
de584c658c
Limit the block-size that the user can specify.
2004-07-16 18:01:30 +00:00
Wayne Davison
6eb770bbcc
Improved a sentence about --whole-file.
2004-07-16 17:14:55 +00:00
Wayne Davison
c7e11bfdc0
Make wf_writeBufSize based on a multiple of WRITE_SIZE instead
...
of the unrelated MAX_MAP_SIZE.
2004-07-16 01:32:02 +00:00
Wayne Davison
94327ff0c2
- Complain and die if --dry-run is used with a batch option.
...
- Improved the warning if a batch option gets sent to the server.
2004-07-15 19:06:32 +00:00
Wayne Davison
4602eafa87
Changed the batch examples to show how to do a remote read-batch
...
without first transferring the batch file.
2004-07-15 19:04:54 +00:00
Wayne Davison
bb3edc3b47
Expanded the comment on the new batch code.
2004-07-15 19:03:50 +00:00
Wayne Davison
c769702fe5
Mention that "-" can be used with --read-batch for reading from stdin.
2004-07-15 17:56:11 +00:00
Wayne Davison
dbbab0c4d2
Allow --read-batch=- to indicate stdin.
2004-07-15 17:01:51 +00:00