mirror/rsync
1
0 Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-10-23 14:18:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

- Updated to handle the new ITEM_* flags.

Browse Source 
- Changed read_iflags() to read/write a suffixed hard-link name.
This commit is contained in:
Wayne Davison committed 2005-03-05 00:21:59 +00:00
1 parent 22907b6bd9
commit fad3dc421c
1 file changed
+28 -11
Download Patch File Download Diff File Expand all files Collapse all files
sender.c
+28 -11
View File
@@ -128,8 +128,10 @@ void successful_send(int ndx)
/* This is also used by receive.c with f_out = -1. */
int read_iflags(int f_in, int f_out, int ndx, char *buf)
{
int len;
int iflags = protocol_version >= 29 ? read_shortint(f_in)
: ITEM_UPDATING | ITEM_MISSING_DATA;
: ITEM_TRANSFER | ITEM_MISSING_DATA;
int isave = iflags; /* XXX remove soon */
/* Handle the new keep-alive (no-op) packet. */
if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
@@ -144,11 +146,32 @@ int read_iflags(int f_in, int f_out, int ndx, char *buf)
exit_cleanup(RERR_PROTOCOL);
}
*buf = '\0';
if (iflags & ITEM_HARD_LINKED)
len = read_vstring(f_in, buf, MAXPATHLEN);
else {
*buf = '\0';
len = -1;
}
if ((!(iflags & ITEM_UPDATING) || !S_ISREG(the_file_list->files[ndx]->mode)) && f_out >= 0) {
/* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
if (protocol_version >= 29 && iflags & ITEM_TRANSFER
&& !S_ISREG(the_file_list->files[ndx]->mode)) {
iflags &= ~ITEM_TRANSFER;
iflags |= ITEM_LOCAL_CHANGE;
}
if (iflags & ITEM_TRANSFER) {
if (!S_ISREG(the_file_list->files[ndx]->mode)) {
rprintf(FERROR,
"received index of non-regular file: %d [%s]\n",
ndx, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
} else if (f_out >= 0) {
write_int(f_out, ndx);
write_shortint(f_out, iflags);
write_shortint(f_out, isave /*XXX iflags */);
if (len >= 0)
write_vstring(f_out, buf, len);
}
return iflags;
@@ -210,7 +233,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
if (!(iflags & ITEM_TRANSFER)) {
maybe_log_item(file, iflags, itemizing, fnametmp);
continue;
}
@@ -220,12 +243,6 @@ void send_files(struct file_list *flist, int f_out, int f_in)
} else
updating_basis_file = inplace && !make_backups;
if (!S_ISREG(file->mode)) {
rprintf(FERROR, "[%s] got index of non-regular file: %d\n",
who_am_i(), i);
exit_cleanup(RERR_PROTOCOL);
}
stats.current_file_index = i;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;