diff options
author | Wayne Davison <wayne@opencoder.net> | 2020-06-27 23:13:25 -0700 |
---|---|---|
committer | Wayne Davison <wayne@opencoder.net> | 2020-06-27 23:14:35 -0700 |
commit | 299430a6c11fadcdfffa1f41f1d3344e01efe596 (patch) | |
tree | b54ce64fedd765ae6feda9e009d6d64488c83dcf | |
parent | dcbe005a6a557294ceba3fd3d8a22ecf62d47e54 (diff) | |
download | rsync-299430a6c11fadcdfffa1f41f1d3344e01efe596.tar.gz |
Lack of "saw" values now reported as "INVALID"; tweak a comment.
-rw-r--r-- | cleanup.c | 2 | ||||
-rw-r--r-- | compat.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -222,7 +222,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) * we don't want to output a duplicate error. */ if ((exit_code && line > 0) || am_daemon || (logfile_name && (am_server || !INFO_GTE(STATS, 1)))) { -#ifdef HAVE_USLEEP /* Try for a teeny delay if both sender & receiver are sending a msg at the same time. */ +#ifdef HAVE_USLEEP /* A tiny delay just in case both sender & receiver are sending a msg at the same time. */ if (am_server && exit_code) usleep(50); #endif @@ -366,7 +366,7 @@ static void recv_negotiate_str(int f_in, struct name_num_obj *nno, char *tmpbuf, rprintf(FERROR, "%s list: %s\n", am_server ? "Client" : "Server", tmpbuf); /* Recreate our original list from the saw values. This can't overflow our huge * buffer because we don't have enough valid entries to get anywhere close. */ - for (j = 1; j <= nno->saw_len; j++) { + for (j = 1, *cp = '\0'; j <= nno->saw_len; j++) { struct name_num_item *nni; for (nni = nno->list; nni->name; nni++) { if (nno->saw[nni->num] == j) { @@ -376,6 +376,8 @@ static void recv_negotiate_str(int f_in, struct name_num_obj *nno, char *tmpbuf, } } } + if (!*tmpbuf) + strlcpy(cp, " INVALID", MAX_NSTR_STRLEN); rprintf(FERROR, "%s list:%s\n", am_server ? "Server" : "Client", tmpbuf); } |