extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
-extern int remove_sent_files;
+extern int remove_source_files;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
static struct bitbag *delayed_bits = NULL;
static int phase = 0;
+/* We're either updating the basis file or an identical copy: */
+static int updating_basis;
/*
* As long as it's unique, rsync will work.
*/
-static int get_tmpname(char *fnametmp, char *fname)
+int get_tmpname(char *fnametmp, char *fname)
{
+ int maxname, added, length = 0;
char *f;
- int length = 0;
- int maxname;
if (tmpdir) {
/* Note: this can't overflow, so the return value is safe */
length = strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
fnametmp[length++] = '/';
- fnametmp[length] = '\0'; /* always NULL terminated */
}
if ((f = strrchr(fname, '/')) != NULL) {
} else
f = fname;
fnametmp[length++] = '.';
- fnametmp[length] = '\0'; /* always NULL terminated */
+ /* The maxname value is bufsize, and includes space for the '\0'.
+ * (Note that NAME_MAX get -8 for the leading '.' above.) */
maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
if (maxname < 1) {
return 0;
}
- strlcpy(fnametmp + length, f, maxname);
- strcat(fnametmp + length, ".XXXXXX");
+ added = strlcpy(fnametmp + length, f, maxname);
+ if (added >= maxname)
+ added = maxname - 1;
+ memcpy(fnametmp + length + added, ".XXXXXX", 8);
return 1;
}
offset = j;
}
if (offset < sum.flength) {
- int32 len = sum.flength - offset;
+ int32 len = (int32)(sum.flength - offset);
if (do_progress)
show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, len), len);
sum_update(map, len);
}
- if (inplace) {
+ if (updating_basis) {
if (offset == offset2 && fd != -1) {
OFF_T pos;
if (flush_write_file(fd) < 0)
static void handle_delayed_updates(struct file_list *flist, char *local_name)
{
- char *fname, *partialptr, numbuf[4];
+ char *fname, *partialptr;
int i;
for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) {
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
} else {
- if (remove_sent_files
- || (preserve_hard_links
- && file->link_u.links)) {
- SIVAL(numbuf, 0, i);
- send_msg(MSG_SUCCESS,numbuf,4);
- }
+ if (remove_source_files
+ || (preserve_hard_links && F_IS_HLINKED(file)))
+ send_msg_int(MSG_SUCCESS, i);
handle_partial_dir(partialptr, PDIR_DELETE);
}
}
char *fname, fbuf[MAXPATHLEN];
char xname[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
- char *fnamecmp, *partialptr, numbuf[4];
+ char *fnamecmp, *partialptr;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
struct file_struct *file;
if (delay_updates)
delayed_bits = bitbag_create(flist->count);
+ updating_basis = inplace;
+
while (1) {
cleanup_disable();
i = read_int(f_in);
- if (i == -1) {
+ if (i == NDX_DONE) {
if (read_batch) {
get_next_gen_i(batch_gen_fd, next_gen_i,
flist->count);
stats.current_file_index = i;
stats.num_transferred_files++;
- stats.total_transferred_size += file->length;
+ stats.total_transferred_size += F_LENGTH(file);
cleanup_got_literal = 0;
if (server_filter_list.head
}
if (!do_xfers) { /* log the transfer */
- log_item(FNAME, file, &stats, iflags, NULL);
+ log_item(FCLIENT, file, &stats, iflags, NULL);
if (read_batch)
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
continue;
}
if (write_batch < 0) {
log_item(FINFO, file, &stats, iflags, NULL);
if (!am_server)
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
continue;
}
rprintf(FINFO,
"(Skipping batched update for \"%s\")\n",
fname);
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
continue;
}
next_gen_i = -1;
fnamecmp = get_backup_name(fname);
break;
case FNAMECMP_FUZZY:
+ updating_basis = 0;
if (file->dirname) {
pathjoin(fnamecmpbuf, MAXPATHLEN,
file->dirname, xname);
fnamecmp = xname;
break;
default:
+ updating_basis = 0;
if (fnamecmp_type >= basis_dir_cnt) {
rprintf(FERROR,
"invalid basis_dir index: %d.\n",
}
}
- if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
+ if (fd1 == -1) {
+ st.st_mode = 0;
+ st.st_size = 0;
+ } else if (do_fstat(fd1,&st) != 0) {
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
continue;
}
*/
rprintf(FERROR,"recv_files: %s is a directory\n",
full_fname(fnamecmp));
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
continue;
}
file->mode = dest_mode(file->mode, st.st_mode, exists);
}
- /* We now check to see if we are writing file "inplace" */
+ /* We now check to see if we are writing the file "inplace" */
if (inplace) {
fd2 = do_open(fname, O_WRONLY|O_CREAT, 0600);
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
full_fname(fname));
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
continue;
}
} else {
if (!get_tmpname(fnametmp,fname)) {
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
continue;
if (fd2 == -1) {
rsyserr(FERROR, errno, "mkstemp %s failed",
full_fname(fnametmp));
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
continue;
/* log the transfer */
if (log_before_transfer)
- log_item(FNAME, file, &initial_stats, iflags, NULL);
+ log_item(FCLIENT, file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", fname);
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
- fname, fd2, file->length);
+ fname, fd2, F_LENGTH(file));
log_item(log_code, file, &initial_stats, iflags, NULL);
cleanup_disable();
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);
- }
+ if (remove_source_files
+ || (preserve_hard_links && F_IS_HLINKED(file)))
+ send_msg_int(MSG_SUCCESS, i);
} else if (!recv_ok) {
- int msgtype = phase || read_batch ? FERROR : FINFO;
+ enum logcode msgtype = phase || read_batch ? FERROR : FINFO;
if (msgtype == FERROR || verbose) {
char *errstr, *redostr, *keptstr;
if (!(keep_partial && partialptr) && !inplace)
"%s: %s failed verification -- update %s%s.\n",
errstr, fname, keptstr, redostr);
}
- if (!phase) {
- SIVAL(numbuf, 0, i);
- send_msg(MSG_REDO, numbuf, 4);
- }
+ if (!phase)
+ send_msg_int(MSG_REDO, i);
}
}
make_backups = save_make_backups;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff