continue;
}
- if (i < 0 || i >= flist->count) {
- /* Handle the new keep-alive (no-op) packet. */
- if (i == flist->count && protocol_version >= 29
- && read_shortint(f_in) == ITEM_IS_NEW)
- continue;
- rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
- i, flist->count);
- exit_cleanup(RERR_PROTOCOL);
- }
+ iflags = read_iflags(f_in, -1, i, fnametmp);
+ if (iflags == ITEM_IS_NEW) /* no-op packet */
+ continue;
file = flist->files[i];
fname = local_name ? local_name : f_name_to(file, fbuf);
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
- if (protocol_version >= 29) {
- iflags = read_shortint(f_in);
- if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
- int see_item = itemizing && (iflags || verbose > 1);
- if (am_server) {
- if (am_daemon && !dry_run && see_item)
- log_item(file, &stats, iflags, NULL);
- } else if (see_item || iflags & ITEM_UPDATING
- || (S_ISDIR(file->mode)
- && iflags & ITEM_REPORT_TIME))
- log_item(file, &stats, iflags, NULL);
- continue;
- }
- } else
- iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
-
- if (!S_ISREG(file->mode)) {
- rprintf(FERROR, "[%s] got index of non-regular file: %d\n",
- who_am_i(), i);
- exit_cleanup(RERR_PROTOCOL);
+ if (!(iflags & ITEM_TRANSFER)) {
+ maybe_log_item(file, iflags, itemizing, fnametmp);
+ continue;
}
stats.current_file_index = i;
cleanup_disable();
- if (recv_ok) {
- if (remove_sent_files && recv_ok > 0) {
+ if (recv_ok > 0) {
+ if (remove_sent_files
+ || (preserve_hard_links && file->link_u.links)) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS, numbuf, 4);
}
- } else {
- int msgtype = csum_length == SUM_LENGTH || read_batch ?
- FERROR : FINFO;
+ } else if (!recv_ok) {
+ int msgtype = phase || read_batch ? FERROR : FINFO;
if (msgtype == FERROR || verbose) {
char *errstr, *redostr, *keptstr;
if (!(keep_partial && partialptr) && !inplace)
errstr, safe_fname(fname),
keptstr, redostr);
}
- if (csum_length != SUM_LENGTH) {
+ if (!phase) {
SIVAL(numbuf, 0, i);
send_msg(MSG_REDO, numbuf, 4);
}
full_fname(fname),
safe_fname(partialptr));
} else {
- if (remove_sent_files) {
+ if (remove_sent_files
+ || (preserve_hard_links
+ && file->link_u.links)) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS,numbuf,4);
}