Commit Graph

  • 8db3106e0b Mention the compression-mode fix for large block sizes. Wayne Davison 2005-02-20 23:08:56 +00:00
  • 1b1fef20b3 Tweaked the rprintf() that outputs about the delta-transmission enablement. Wayne Davison 2005-02-20 22:11:43 +00:00
  • 22c7c5fb0b - Integrated the latest version from samba. - Tweaked the order of the code in my_modf() to avoid a compiler warning. Wayne Davison 2005-02-20 22:10:33 +00:00
  • 13d00101e8 One more tweak to the "whoami" code. Wayne Davison 2005-02-20 21:04:03 +00:00
  • 3e7934a5fb Changed the memory implementation of --delay-updates so that it only allocates memory to store needed bits, it sparsely allocates the bits in 16KB chunks, and the bit-finding loop works in a more efficient manner. Wayne Davison 2005-02-20 20:55:24 +00:00
  • 815193e89e Got rid of "set -x" (runtests.sh has a way to set this, if desired). Wayne Davison 2005-02-20 17:24:15 +00:00
  • 4fd4b3d667 Dropped a useless "const" from the definition of poptStrerror. Wayne Davison 2005-02-20 17:21:13 +00:00
  • 1526b8b17d Mark a couple unused variables. Wayne Davison 2005-02-20 17:20:14 +00:00
  • 732537212b Cast char* to uchar* when dereferencing characters for isdigit() and isprint(). Wayne Davison 2005-02-20 17:07:31 +00:00
  • 4adbb5f246 Have rule_strcmp() accept and return a uchar*. Wayne Davison 2005-02-20 17:04:53 +00:00
  • 30fa772457 A few improvements to the "test" commands to neaten them up and to try to fix another problem under solaris. Wayne Davison 2005-02-20 17:01:32 +00:00
  • ee03617b3d Cast a uchar* arg to char* for write_buf(). Wayne Davison 2005-02-20 16:56:30 +00:00
  • 19cb6106d2 Improved the testuser-setting code to try to get it to work under solaris. Wayne Davison 2005-02-20 16:27:10 +00:00
  • cd6bececc1 If --delay-updates is specified with --remove-sent-files, delay the MSG_SUCCESS messages until we actually move the files into place at the end. Wayne Davison 2005-02-20 02:54:30 +00:00
  • 88b93c6159 Corrected "log format" info and added info on --remove-sent-files. Wayne Davison 2005-02-20 02:45:10 +00:00
  • b62fd39392 A small twiddle. Wayne Davison 2005-02-20 01:14:27 +00:00
  • 95306d9d50 - For every file that we send off to the receiver, mark it with FLAG_SENT. - Added successful_send(), which is called when MSG_SUCCESS was received from the receiver/generator side. This function validates the message, and removes the indicated file/symlink (assuming that remove_sent_files was actually set). Wayne Davison 2005-02-20 01:04:54 +00:00
  • 3e870a6444 If --remove-sent-files was specified and we successfully updated a file, send MSG_SUCCESS to the sender (through the generator). Wayne Davison 2005-02-20 01:04:51 +00:00
  • bf26aa2219 - If --remove-sent-files was specified, abort if we're pulling from a read-only module. - If need_messages_from_generator is set, make sure that the connection between the generator to the sender has multiplexed I/O enabled. Wayne Davison 2005-02-20 01:04:49 +00:00
  • 9981c27ef1 Handle the new MSG_SUCCESS message for both the generator and the sender. Wayne Davison 2005-02-20 01:04:46 +00:00
  • fe96018750 If we update the contents of a symlink and --remove-sent-files is enabled, tell the sender about it via MSG_SUCCESS. Wayne Davison 2005-02-20 01:04:43 +00:00
  • 07c6ae7de8 - Added --remove-sent-files option. - If a server is refusing "delete" and we're the sender, also refuse the --remove-sent-files option. Wayne Davison 2005-02-20 01:04:40 +00:00
  • e163683020 Document how refusing "delete" affects --remove-sent-files. Wayne Davison 2005-02-20 01:04:37 +00:00
  • 961103049b Document --remove-sent-files. Wayne Davison 2005-02-20 01:04:34 +00:00
  • 0254bd46ec Test --remove-sent-files. Wayne Davison 2005-02-20 01:04:27 +00:00
  • 8b806ed347 Disallow --remove-sent-files with a read-only server. Wayne Davison 2005-02-20 01:04:12 +00:00
  • 8e3ead09a3 Got rid of maybe_DEL_TERSE. Wayne Davison 2005-02-20 00:47:15 +00:00
  • 8715db2cab Tweaked some externs. Wayne Davison 2005-02-20 00:16:23 +00:00
  • 50839b4bb0 Tweaked some externs. Wayne Davison 2005-02-19 23:42:09 +00:00
  • e1f40891c7 - Needed to use a name buffer in delete_missing() to avoid having a recursive delete reuse our buffer from f_name(). - Moved the backup-handling into delete_file() in rsync.c. - Moved the --max-delete counting into delete_file() in rsync.c. Wayne Davison 2005-02-19 23:41:52 +00:00
  • 042f470ef9 Made delete_file() backup files it is removing if --backup was specified. Wayne Davison 2005-02-19 23:39:47 +00:00
  • 40cc28516d Moved deletion_count here so that we honor --max-delete in delete_file(). Wayne Davison 2005-02-19 23:24:41 +00:00
  • 8174bc3506 If the server refuses a directory, don't allow any files to be sent to the server inside that directory. Wayne Davison 2005-02-19 23:01:52 +00:00
  • 9118a09c77 Changed a couple log_recv() calls back to log_send(). Wayne Davison 2005-02-19 22:57:08 +00:00
  • 8324bd5c21 When logging PERMS_REPORT messages, send them with the FCLIENT code if the daemon has "%i" in its log message (because it already got a detailed log message from the generator). Wayne Davison 2005-02-19 22:16:53 +00:00
  • 7f37167da5 - Always send the itemized-info bytes on to the receiver. This not only ensures that batch files are created consistently for push and pull, but allows a daemon to log itemized changes. - Improved the logging of itemized changes for the daemon. - Make sure we debug-log our presence in send_files(). Wayne Davison 2005-02-19 22:16:50 +00:00
  • 227a9c41c1 - Improved the logging of itemized changes for the daemon. - Make sure we debug-log our presence in recv_files(). Wayne Davison 2005-02-19 22:16:47 +00:00
  • 6c3862fae3 Make use of new variables (log_format_has_i, log_format_has_o_or_i, and daemon_log_format_has_i) and the new FCLIENT logging code to output stats in the best way possible for both the client and the daemon. Wayne Davison 2005-02-19 22:16:45 +00:00
  • 1eec003a80 The FCLIENT log code aviods putting the message into the daemon's log file and instead sends a FINFO message to the client. This is used when the daemon wants to log a better message locally than it is sending to the client. Improved log_delete() to make use of this idiom if it needs to log a separate delete message for the daemon and the client. Wayne Davison 2005-02-19 22:16:41 +00:00
  • 684d7582b6 - Added log_format_has_i. - Fixed a problem withe option-refusing code when it refuses the daemon options. - Don't sent --itemize-changes (-i) to the server -- send an improved --log-format value instead. Wayne Davison 2005-02-19 22:16:39 +00:00
  • f39b2060fe We now set daemon_log_format_has_i and daemon_log_format_has_o_or_i instead of itemize_daemon_changes. Wayne Davison 2005-02-19 22:16:35 +00:00
  • 4f2ba7e056 No more need to clear itemize_changes based on protocol_version. Wayne Davison 2005-02-19 22:16:33 +00:00
  • 1dcf3b4345 Changed some of the values of the MSG_* defines. Wayne Davison 2005-02-19 22:16:31 +00:00
  • aa57d14ae7 We now use a regular expression to parse the (restored to its previous version) default logfile format. Added parsing for a version of the default logfile format where %o has been replaced with %i. Wayne Davison 2005-02-19 19:36:54 +00:00
  • 3c54d8a3ad Decided to leave the "log format" default the same as in earlier versions. Wayne Davison 2005-02-19 17:38:51 +00:00
  • c0814b813f If the "log format" has a %i in it, set itemize_daemon_changes. Wayne Davison 2005-02-19 17:37:40 +00:00
  • 088aff1a48 - Don't log a delete message to the daemon log in dry-run mode. - The daemon's wrote/read log message now uses the terms sent/received. Wayne Davison 2005-02-19 17:23:08 +00:00
  • d6707171e6 Decide whether to log a delete message via the default format by checking the new log_format_has_o_or_i variable, not itemize_changes. Wayne Davison 2005-02-19 03:54:13 +00:00
  • 5c5e159892 - Set new variable, log_format_has_o_or_i. - Make sure that -i can't be set w/o an actual %i in the log_format. - Only need to pass -i to server if we're the sender. - Only need to pass some --log-format information to the server in certain circumstances. Wayne Davison 2005-02-19 03:54:11 +00:00
  • 6d7b3d52dc Rules read in from per-dir merge files need to have non-applicable rules filtered out before the rule gets stored (not in a post- filtering pass like the rules that are read-in prior to the run). Wayne Davison 2005-02-19 03:12:21 +00:00
  • 591b908fbf Mention the change in the default "log format" daemon-config setting. Wayne Davison 2005-02-19 03:03:13 +00:00
  • 742be97ce4 Log items that are unchanged if verbose > 1. Wayne Davison 2005-02-19 02:39:33 +00:00
  • 1f30a674cd Notify the remote side about -i (if either specified or inferred from the user's --log-format string) and, if we're not verbose but we're logging messages, let the server know that --log-format was specified. Wayne Davison 2005-02-19 02:39:30 +00:00
  • 19bc826d8b - Tweaked the letters output by "%i", including adding support for logging a deleted item and an identical item. - Added log_delete(), a routine that either logs the fact that a deletion happened, or sends a MSG_DELETED message to the client side (or both if we're a daemon server receiver). Wayne Davison 2005-02-19 02:39:26 +00:00
  • c786a7aec5 - Changed the calling args to delete_file() to take an st_mode instead of a DEL_DIR flag. - Call log_delete() instead of outputting "deleting ..." messages.. - Log deletions if either verbose or log-format is specified. Wayne Davison 2005-02-19 02:39:23 +00:00
  • 8a8356b7db - Send the itemized data for every file, changed or not, if verbose > 1. - Don't call set_perms() with PERMS_REPORT if we're itemizing changes. - Don't call delete_file() with DEL_TERSE if we're itemizing changes. - Call delete_file() with its new arg. Wayne Davison 2005-02-19 02:39:21 +00:00
  • 0d67e00af8 - Allow send_msg() to be called by the delete code in flist.c and have it figure out if it should send the message to our sibling or the other side. - Handle the new MSG_DELETED message in both the generator and the sender. This message is used to let the client side log each deletion when the server side is the receiver. Wayne Davison 2005-02-19 02:39:18 +00:00
  • 7448177753 - Call log_delete() instead of outputting a "deleting ..." message. - Call delete_file() with its new arg. Wayne Davison 2005-02-19 02:39:15 +00:00
  • 90d151f423 If the protocol is less than 29, make sure itemize_changes is off. Wayne Davison 2005-02-19 02:39:11 +00:00
  • 9f7c5dabf8 - Got rid of DEL_DIR define. - Added define for ITEM_DELETED. Wayne Davison 2005-02-19 02:39:09 +00:00
  • a85a151430 - Mention that "%o" can now have the value "del." - Updated the description of "%i" to reflect the latest functioning. Wayne Davison 2005-02-19 02:39:06 +00:00
  • 5dd97ab999 Fixed an inaccuracy in the --archive description. Wayne Davison 2005-02-19 02:39:03 +00:00
  • 8daa9925cc More improvements. Wayne Davison 2005-02-18 21:24:00 +00:00
  • e844be4e7b - Use read_short() and write_short(). - If the user does not want itemized changes, don't log the name for attribute changes. Wayne Davison 2005-02-18 20:17:24 +00:00
  • 88b218fa5c - Tweaked code in itemize() a bit. - Use the new write_short() function. - Mention the delete() when an item replaces an item of a different type. - Make sure that this replacing of a non-same item is marked as a new transfer in the itemized output. Wayne Davison 2005-02-18 20:17:20 +00:00
  • e66d70e34c The '%n' escape needs to append a trailing slash onto a directory name. Wayne Davison 2005-02-18 20:17:17 +00:00
  • 9361f83933 Added read_short() and write_short(). Wayne Davison 2005-02-18 20:17:15 +00:00
  • 3b2bebbf90 Improved the "log format" section some more. Wayne Davison 2005-02-18 20:17:12 +00:00
  • 4f90eb433a Improved --verbose, --itemize-changes, and --log-format. Wayne Davison 2005-02-18 20:17:09 +00:00
  • b485e0c16c Fixed/improved the comment before safe_name(). Wayne Davison 2005-02-18 20:17:05 +00:00
  • bc1fac9648 Handle uchar and short as a function return type. Wayne Davison 2005-02-18 20:16:59 +00:00
  • c78779cce3 - Fixed a few bugs and compile warnings. - Use the long-option parser for better option handling. - Output a usage message if the options are wrong. - Improved the option-variable names. - Parse the new default daemon log-file format. - Handle filenames that have spaces in them. Wayne Davison 2005-02-18 17:58:03 +00:00
  • 702cd15cb0 For the server, don't ever intuit verbosity higher than what the client asked for. Wayne Davison 2005-02-18 17:36:12 +00:00
  • 1da05366ad The daemon loop needs to call log_open() because it called log_close(). Wayne Davison 2005-02-18 17:34:09 +00:00
  • 2267efeac5 Made log_open() non-static and moved log_close() next to it. Wayne Davison 2005-02-18 17:33:43 +00:00
  • 15954da08f Updated the default "log format" string and the output of "%i". Wayne Davison 2005-02-17 09:19:07 +00:00
  • b2dc7bad39 Changed the default log format. Wayne Davison 2005-02-17 09:16:51 +00:00
  • d4e0196346 Use '.' for unchanged attributes in the %i output. Wayne Davison 2005-02-17 09:16:23 +00:00
  • 2fc50f5a98 More improvements for the description of the %i output. Wayne Davison 2005-02-16 20:12:20 +00:00
  • bd5b85dbc7 Mention the new flag-word for protocol 29. Wayne Davison 2005-02-16 17:08:04 +00:00
  • 8a8324657e - The itemized flags are now 2 bytes instead of 1. - Always send/receive the itemized flags for protocols >= 29. - The output of the verbose log-the-transfer messages is always handled via log_send() (when we're the client). Wayne Davison 2005-02-16 17:02:16 +00:00
  • 4bb0af79b7 - The itemized flags are now 2 bytes instead of 1. - Always send/receive the itemized flags for protocols >= 29. - The output of the verbose log-the-transfer messages is always handled via log_recv() (when we're the client). Wayne Davison 2005-02-16 17:02:13 +00:00
  • e3bcd89319 - The itemized flags are now 2 bytes instead of 1. - Always send the itemized flags for protocols >= 29. - Sent an itemized-flag update for dirs and symlinks for protocols >= 29 (instead of outputting a message directly). Wayne Davison 2005-02-16 17:02:11 +00:00
  • 87383697e8 - Auto-set --verbose if --dry-run is specified w/o --log-format. - When verbose w/o a log_format specified, set it to "%n%L". - There's no longer a need to send -i to the server. Wayne Davison 2005-02-16 17:02:08 +00:00
  • e4b808989e Moved the auto-setting of --verbose when --dry-run is specified into options.c. Wayne Davison 2005-02-16 17:02:05 +00:00
  • 59e52bf276 Tweaked ITEM_MISSING_DATA. Wayne Davison 2005-02-16 17:02:02 +00:00
  • 9b40e44ef4 No need to handle itemize_changes anymore. Wayne Davison 2005-02-16 17:01:59 +00:00
  • e92f21d2f7 Tweaked the mention of --itemize-changes. Wayne Davison 2005-02-16 08:12:34 +00:00
  • 910e89b963 - We now accept an itemized-changes flag-byte over the socket if we're the local client and --itemized-changes was specified. If the item is not being updated, just call log_recv(). - We reject an attempt to file-update any non-regular file, not just dirs. - Avoid the verbose "log the transfer" output if --log-format was specified and log_before_transfer is in effect. - Call log_recv() with its new iflags arg. Wayne Davison 2005-02-16 08:10:45 +00:00
  • 8a9cfb2459 - We now accept an itemized-changes flag byte over the socket if we're in --itemized-changes mode. If the item is not being updated, either pass it along to the receiver (if we're the server) or just call log_send(). - We reject an attempt to file-update any non-regular file, not just dirs. - Avoid the verbose "log the transfer" output if --log-format was specified and log_before_transfer is in effect. - Call log_send() with its new iflags arg. Wayne Davison 2005-02-16 08:10:41 +00:00
  • 41961db0bd Ensure that -i is set consistent with the batch's data. Wayne Davison 2005-02-16 08:10:38 +00:00
  • e76518843d - If log_before_transfer is possible, don't force --verbose on for --progress. - If --log-format contains %i, set --itemize-changes (-i). - Always send -i to the remote rsync if it was specified/implied. Wayne Davison 2005-02-16 08:10:31 +00:00
  • ef74f5d626 - Improved log_formatted() to handle long filenames better. - Added %i, for the list of itemized changes, %n for the normal filename (might be shorter than %f), and %L for a " -> symlink" string IIF the item is a symlink (else ""). - The log_{send,recv}() functions now take an "iflags" arg. Wayne Davison 2005-02-16 08:10:28 +00:00
  • c557eb8cec Changed showchg() into itemize(), which now ships off a flag byte of what changed over to the sender instead of outputting a string itself. This does mean that we now ship off indexes of non-file items that got updated, but the sender will know what to do with it. Wayne Davison 2005-02-16 08:10:25 +00:00
  • 0cc279e0d3 - Added the new ITEM_* flags for the itemized-changes flag passing. - Also added defines for FLAG_SENT and MSG_SUCCESS. Wayne Davison 2005-02-16 08:10:22 +00:00
  • 0cfdf22655 Documented that -i now sets a default --log-format string. Wayne Davison 2005-02-16 08:10:19 +00:00
  • 527a010f10 Documented the new log-format escapes: %n, %L, and %i. Wayne Davison 2005-02-16 08:10:13 +00:00
  • c8ca974634 Some tweaks to how --itemize-changes works. Wayne Davison 2005-02-16 01:13:03 +00:00
  • 3296f91bb0 Check for refusal of --delete-before when it is inferred. Wayne Davison 2005-02-15 21:15:58 +00:00
  • e2124620eb Moved two paragraphs. Wayne Davison 2005-02-15 20:42:36 +00:00