extern int log_before_transfer;
extern int log_format_has_i;
extern int daemon_log_format_has_i;
-extern int delete_after;
extern int csum_length;
extern int read_batch;
extern int batch_gen_fd;
extern struct filter_list_struct server_filter_list;
-
-/* This deletes any files on the receiving side that are not present on the
- * sending side. This is used by --delete-before and --delete-after. */
-void delete_files(struct file_list *flist)
-{
- char fbuf[MAXPATHLEN];
- int j;
-
- for (j = 0; j < flist->count; j++) {
- struct file_struct *file = flist->files[j];
-
- if (!(file->flags & FLAG_DEL_HERE))
- continue;
-
- f_name_to(file, fbuf);
- if (verbose > 1 && file->flags & FLAG_TOP_DIR)
- rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
-
- delete_in_dir(flist, fbuf, file);
- }
-}
-
#define SLOT_SIZE (16*1024) /* Desired size in bytes */
#define PER_SLOT_BITS (SLOT_SIZE * 8) /* Number of bits per slot */
#define PER_SLOT_INTS (SLOT_SIZE / 4) /* Number of int32s per slot */
static void read_gen_name(int fd, char *dirname, char *buf)
{
int dlen;
- int len = read_byte(fd);
-
- if (len & 0x80) {
-#if MAXPATHLEN > 32767
- uchar lenbuf[2];
- read_buf(fd, (char *)lenbuf, 2);
- len = (len & ~0x80) * 0x10000 + lenbuf[0] * 0x100 + lenbuf[1];
-#else
- len = (len & ~0x80) * 0x100 + read_byte(fd);
-#endif
- }
if (dirname) {
dlen = strlcpy(buf, dirname, MAXPATHLEN);
} else
dlen = 0;
- if (dlen + len >= MAXPATHLEN) {
- rprintf(FERROR, "bogus data on generator name pipe\n");
- exit_cleanup(RERR_PROTOCOL);
- }
-
- read_sbuf(fd, buf + dlen, len);
+ read_vstring(fd, buf + dlen, MAXPATHLEN - dlen);
}
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_recv(file, &stats, iflags);
- } else if (see_item || iflags & ITEM_UPDATING
- || (S_ISDIR(file->mode)
- && iflags & ITEM_REPORT_TIME))
- log_recv(file, &stats, iflags);
- 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;
if (dry_run) { /* log the transfer */
if (!am_server && log_format)
- log_recv(file, &stats, iflags);
+ log_item(file, &stats, iflags, NULL);
continue;
}
/* log the transfer */
if (log_before_transfer)
- log_recv(file, &initial_stats, iflags);
+ log_item(file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname));
fname, fd2, file->length);
if (!log_before_transfer)
- log_recv(file, &initial_stats, iflags);
+ log_item(file, &initial_stats, iflags, NULL);
if (fd1 != -1)
close(fd1);
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);
}
}
}
- if (delete_after && !local_name && flist->count > 0)
- delete_files(flist);
-
if (verbose > 2)
rprintf(FINFO,"recv_files finished\n");