* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
-extern struct file_list *cur_flist, *first_flist;
+extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct server_filter_list;
static struct bitbag *delayed_bits = NULL;
* As long as it's unique, rsync will work.
*/
-int get_tmpname(char *fnametmp, char *fname)
+int get_tmpname(char *fnametmp, const char *fname)
{
int maxname, added, length = 0;
- char *f;
+ const char *f;
if (tmpdir) {
/* Note: this can't overflow, so the return value is safe */
return 1;
}
+/* Opens a temporary file for writing.
+ * Success: Writes name into fnametmp, returns fd.
+ * Failure: Clobbers fnametmp, returns -1.
+ * Calling cleanup_set() is the caller's job. */
+int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
+{
+ int fd;
+
+ if (!get_tmpname(fnametmp, fname))
+ return -1;
+
+ /* We initially set the perms without the setuid/setgid bits or group
+ * access to ensure that there is no race condition. They will be
+ * correctly updated after the right owner and group info is set.
+ * (Thanks to snabb@epipe.fi for pointing this out.) */
+ fd = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
+
+#if 0
+ /* In most cases parent directories will already exist because their
+ * information should have been previously transferred, but that may
+ * not be the case with -R */
+ if (fd == -1 && relative_paths && errno == ENOENT
+ && create_directory_path(fnametmp) == 0) {
+ /* Get back to name with XXXXXX in it. */
+ get_tmpname(fnametmp, fname);
+ fd = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
+ }
+#endif
+
+ if (fd == -1) {
+ rsyserr(FERROR, errno, "mkstemp %s failed",
+ full_fname(fnametmp));
+ return -1;
+ }
+
+ return fd;
+}
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
const char *fname, int fd, OFF_T total_size)
sum.flength = (OFF_T)sum.count * sum.blength;
if (sum.remainder)
sum.flength -= sum.blength - sum.remainder;
- for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
- if (do_progress)
- show_progress(offset, total_size);
- sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
- CHUNK_SIZE);
- offset = j;
- }
- if (offset < sum.flength) {
- int32 len = (int32)(sum.flength - offset);
- if (do_progress)
- show_progress(offset, total_size);
- sum_update(map_ptr(mapbuf, offset, len), len);
- offset = sum.flength;
+ if (append_mode == 2) {
+ for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
+ if (do_progress)
+ show_progress(offset, total_size);
+ sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
+ CHUNK_SIZE);
+ offset = j;
+ }
+ if (offset < sum.flength) {
+ int32 len = (int32)(sum.flength - offset);
+ if (do_progress)
+ show_progress(offset, total_size);
+ sum_update(map_ptr(mapbuf, offset, len), len);
+ }
}
+ offset = sum.flength;
if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
rsyserr(FERROR, errno, "lseek of %s returned %.0f, not %.0f",
full_fname(fname), (double)j, (double)offset);
if (delay_updates)
delayed_bits = bitbag_create(cur_flist->used + 1);
- updating_basis = inplace;
-
while (1) {
cleanup_disable();
continue;
}
- file = cur_flist->files[ndx - cur_flist->ndx_start];
+ if (ndx - cur_flist->ndx_start >= 0)
+ file = cur_flist->files[ndx - cur_flist->ndx_start];
+ else
+ file = dir_flist->files[cur_flist->parent_ndx];
fname = local_name ? local_name : f_name(file, fbuf);
if (verbose > 2)
if (csum_length == SHORT_SUM_LENGTH) {
if (keep_partial && !partial_dir)
make_backups = -make_backups; /* prevents double backup */
+ if (append_mode)
+ sparse_files = -sparse_files;
append_mode = -append_mode;
- sparse_files = -sparse_files;
csum_length = SUM_LENGTH;
redoing = 1;
}
if (csum_length != SHORT_SUM_LENGTH) {
if (keep_partial && !partial_dir)
make_backups = -make_backups;
+ if (append_mode)
+ sparse_files = -sparse_files;
append_mode = -append_mode;
- sparse_files = -sparse_files;
csum_length = SHORT_SUM_LENGTH;
redoing = 0;
}
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",
fd1 = do_open(fnamecmp, O_RDONLY, 0);
}
}
+ updating_basis = inplace && fnamecmp == fname;
if (fd1 == -1) {
st.st_mode = 0;
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
full_fname(fname));
- discard_receive_data(f_in, F_LENGTH(file));
- if (fd1 != -1)
- close(fd1);
- if (inc_recurse)
- send_msg_int(MSG_NO_SEND, ndx);
- continue;
}
} else {
- if (!get_tmpname(fnametmp,fname)) {
- discard_receive_data(f_in, F_LENGTH(file));
- if (fd1 != -1)
- close(fd1);
- if (inc_recurse)
- send_msg_int(MSG_NO_SEND, ndx);
- continue;
- }
-
- /* we initially set the perms without the
- * setuid/setgid bits to ensure that there is no race
- * condition. They are then correctly updated after
- * the lchown. Thanks to snabb@epipe.fi for pointing
- * this out. We also set it initially without group
- * access because of a similar race condition. */
- fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
-
- /* in most cases parent directories will already exist
- * because their information should have been previously
- * transferred, but that may not be the case with -R */
- if (fd2 == -1 && relative_paths && errno == ENOENT
- && create_directory_path(fnametmp) == 0) {
- /* Get back to name with XXXXXX in it. */
- get_tmpname(fnametmp, fname);
- fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
- }
- if (fd2 == -1) {
- rsyserr(FERROR, errno, "mkstemp %s failed",
- full_fname(fnametmp));
- discard_receive_data(f_in, F_LENGTH(file));
- if (fd1 != -1)
- close(fd1);
- if (inc_recurse)
- send_msg_int(MSG_NO_SEND, ndx);
- continue;
- }
+ fd2 = open_tmpfile(fnametmp, fname, file);
+ if (fd2 != -1)
+ cleanup_set(fnametmp, partialptr, file, fd1, fd2);
+ }
- cleanup_set(fnametmp, partialptr, file, fd1, fd2);
+ if (fd2 == -1) {
+ discard_receive_data(f_in, F_LENGTH(file));
+ if (fd1 != -1)
+ close(fd1);
+ if (inc_recurse)
+ send_msg_int(MSG_NO_SEND, ndx);
+ continue;
}
/* log the transfer */