search for: logcod

...s transfer errors. IMO, setting log_got_error back to zero after the password handling is a hack. Here are two possible better approaches: 1. Decide where the real division between setup and transfer errors is (e.g., the beginning of client_run) and reset log_got_error there. 2. Introduce a new logcode FERROR_NO23 that is the same as FERROR except that it doesn't cause log_got_error to be set, and use this logcode for error messages that shouldn't cause an exit code 23. Matt

...r = (char *)malloc(IO_BUFFER_SIZE); + io_buffer = malloc(IO_BUFFER_SIZE); if (!io_buffer) out_of_memory("writefd"); io_buffer_count = 0; } /* write an message to a multiplexed stream. If this fails then rsync exits */ -static void mplex_write(int fd, enum logcode code, char *buf, int len) +static void mplex_write(int fd, enum logcode code, const void *buf1, int len) { - char buffer[4096]; + unsigned char buffer[4096]; int n = len; +unsigned char * buf; + buf = (unsigned char *)buf1; SIVAL(buffer, 0, ((MPLEX_BASE + (i...

...100644 --- a/log.c +++ b/log.c @@ -47,6 +47,7 @@ extern mode_t orig_umask; extern char *auth_user; extern char *stdout_format; extern char *logfile_format; +extern char *logafter_format; extern char *logfile_name; #ifdef ICONV_CONST extern iconv_t ic_chck; @@ -271,6 +272,8 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8) * that the msg gets logged and then sent to stderr after that. */ if (am_daemon > 0 && code != FCLIENT) code = FLOG; + } else if (code == FLOG_AFTER) { + code = FLOG; } else if (send_msgs_to_gen) { assert(!is_utf8); /* Pas...

...10f864a93fd9203f75c43ffe9 . Basically we need to do two changes: (1) in options.c, make sure that the "missing_args" value is transferred when set ; and (2) in rsync.c, in the "missing_args" case, replace FERROR_XFER with something else, since apparently any log message with logcode FERROR_XFER sets the flag 'got_xfer_error' in log.c, and that finally leads to exit code RERR_PARTIAL (23), which is what we are trying to avoid. I am currently testing this on fairly big datasets to see if there's something missing, and will write more when I see how it goes ( as...

...sage being displayed on my terminal (2 actually) instead of a weird crash. ..wayne.. ---8<------8<------8<------8<---cut here--->8------>8------>8------>8--- Index: log.c --- log.c 2002/04/08 09:10:50 1.61 +++ log.c 2002/05/07 00:32:30 @@ -215,6 +215,7 @@ void rwrite(enum logcode code, char *buf, int len) { FILE *f=NULL; + static char semaphore = 0; extern int am_daemon; extern int am_server; extern int quiet; @@ -243,8 +244,11 @@ * io_multiplex_write can fail if we do not have a multiplexed * connection at the moment, in which case we fall through and *...

seems the behavior of rsync has changed when dealing with output and using both -v and -q at the same time ... for example: $ mkdir test1 $ touch test1/foo $ rsync-2.6.0 -avq test1 test2 $ rm -r test2 $ rsync-2.6.8 -avq test1 test2 test1/ test1/fo $ rm -r test2 $ rsync-cvs -avq test1 test2 building file list ... test1/ test1/fo $ rm -r test2 the new output in 2.6.8 comes from the calls to

...} + goto cleanup; + } + if (update_only > 0 && statret == 0 && file->modtime - sx.st.st_mtime < modify_window) { if (INFO_GTE(SKIP, 1)) rprintf(FINFO, "%s is newer\n", fname); @@ -2156,9 +2175,13 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) if (check_redo && (ndx = get_redo_num()) != -1) { OFF_T save_max_size = max_size; OFF_T save_min_size = min_size; + int save_max_age = max_age; + int save_min_age = min_age; csum_length = SUM_LENGTH; max_size = -1; min_size = -1; + m...

...tf(FINFO, "not creating new %s \"%s\"\n", + is_dir ? "directory" : "file", fname); + } + return; } - return; } if (statret == 0 && !(sx.st.st_mode & S_IWUSR) @@ -2109,6 +2116,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) min_size = -1; ignore_existing = -ignore_existing; ignore_non_existing = -ignore_non_existing; + ignore_non_existing_dirs = -ignore_non_existing_dirs; update_only = -update_only; always_checksum = -always_checksum; size_only = -size_only; @@ -2134,6...

....c @@ -69,6 +69,8 @@ int delete_during = 0; int delete_before = 0; int delete_after = 0; int delete_excluded = 0; +int diffserv = 8; +char *congestion_alg = NULL; int remove_source_files = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; @@ -776,6 +778,8 @@ void usage(enum logcode F) rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n"); rprintf(F," --port=PORT specify double-colon alternate port number\n"); rprintf(F," --sockopts=OPTIONS specify custom TCP options\n"); + rprin...

...tf(FINFO, "not creating new %s \"%s\"\n", + is_dir ? "directory" : "file", fname); + } + return; } - return; } if (statret == 0 && !(sx.st.st_mode & S_IWUSR) @@ -2109,6 +2116,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) min_size = -1; ignore_existing = -ignore_existing; ignore_non_existing = -ignore_non_existing; + ignore_non_existing_dirs = -ignore_non_existing_dirs; update_only = -update_only; always_checksum = -always_checksum; size_only = -size_only; @@ -2134,6...

...unsafe-links virgo::test/ /tmp/rsyncdest/ 2>/dev/null [...] file has vanished: "/horsroot" (in test) -------------------------- Nothing is sent to stderr whereas error code is set: $ echo $? 24 I had a look to flist.c/sender.c, it seems this is expected behavior: (flist.c:1037) enum logcode c = am_daemon && protocol_version < 28 ? FERROR : FINFO; and indeed the message is produce by daemon, and I am using proto 29 or 30. Well, I also found the message is not the appropriate one, the file has not vanished (at least, we cannot know that, the file pointe...

...tf(FINFO, "not creating new %s \"%s\"\n", + is_dir ? "directory" : "file", fname); + } + return; } - return; } if (statret == 0 && !(sx.st.st_mode & S_IWUSR) @@ -2109,6 +2116,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) min_size = -1; ignore_existing = -ignore_existing; ignore_non_existing = -ignore_non_existing; + ignore_non_existing_dirs = -ignore_non_existing_dirs; update_only = -update_only; always_checksum = -always_checksum; size_only = -size_only; @@ -2134,6...

Dear rsync folks, I'd like to request/suggest that cli options to set TCP send/receive buffers be added to rsync client-side. Summary: I'm aware that a daemon's config-file can set socket options for the server side (e.g. SO_SNDBUF, SO_RCVBUF). That is useful. But when trying to get high-throughput rsync over long paths (i.e. large bandwidth*delay product), since

Using rsync 2.6.0 with --verbose and doing a pull. >?receiving file list ... readlink "{FILENAME}" failed: >?No such file or directory >?done >?IO error encountered - skipping file deletion The file was a temporary file that was being deleted just as the rsync was run. So while the file list was being built, it was there when the directory was read but had vanished by the

Hi all, Well, yeah, that's it, really. :-) Try it. Works consistently, on Doze and Linux here ... # rsync -vvrlHSPtiypogD --stats --numeric-ids --delete-after --force -- partial-dir=.partial /tmp/ /var/tmp/ [...show stats...] unknown message 4:1 [generator] rsync error: error in rsync protocol data stream (code 12) at io.c(307) [generator=2.6.9] rsync: connection unexpectedly closed (26

...ry". - State the --suffix-dels default correctly. --- ?More work on backup-dir-dels... options.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/options.c b/options.c index ed21704..0abc1ca 100644 --- a/options.c +++ b/options.c @@ -330,8 +330,8 @@ void usage(enum logcode F) rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n"); rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-...

...2003-01-28 06:11:57 +0300 +++ rsync-2.5.6/options.c 2003-01-28 17:38:39 +0300 @@ -127,6 +127,8 @@ static int modify_window_set; * address, or a hostname. **/ char *bind_address; +/** Print information needed for APT rsync method */ +int apt_support = 0; static void print_rsync_version(enum logcode f) { @@ -370,6 +372,7 @@ static struct poptOption long_options[] {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET , 0, 0 }, {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6 , 0, 0 }, #endif + {"apt-support", 0, POPT_ARG_NON...

...close(fd1); if (close(fd2) < 0) { @@ -719,6 +717,7 @@ if (remove_source_files || inc_recurse || (preserve_hard_links && F_IS_HLINKED(file))) send_msg_int(MSG_SUCCESS, ndx); + log_item(log_code, file, &initial_stats, iflags, NULL); break; case 0: { enum logcode msgtype = redoing ? FERROR_XFER : FWARNING;

https://bugzilla.samba.org/show_bug.cgi?id=12036 Bug ID: 12036 Summary: Multiple --link-dest, --copy-dest, or --compare-dest flags produce incorrect behavior Product: rsync Version: 3.1.2 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component:

...> Basically we need to do two changes: > > (1) in options.c, make sure that the "missing_args" value is transferred > when set ; and > (2) in rsync.c, in the "missing_args" case, replace FERROR_XFER with > something else, since apparently any log message with logcode > FERROR_XFER sets the flag 'got_xfer_error' in log.c, and that finally > leads to exit code RERR_PARTIAL (23), which is what we are trying to avoid. > > I am currently testing this on fairly big datasets to see if there's > something missing, and will write more when I...