extern int preserve_perms;
extern int preserve_uid;
extern int preserve_gid;
+extern int delete_during;
extern int update_only;
extern int opt_ignore_existing;
extern int inplace;
}
-/*
- * NULL sum_struct means we have no checksums
- */
-void write_sum_head(int f, struct sum_struct *sum)
-{
- static struct sum_struct null_sum;
-
- if (sum == NULL)
- sum = &null_sum;
-
- write_int(f, sum->count);
- write_int(f, sum->blength);
- if (protocol_version >= 27)
- write_int(f, sum->s2length);
- write_int(f, sum->remainder);
-}
-
/*
* set (initialize) the size entries in the per-file sum_struct
* calculating dynamic block and checksum sizes.
*
* This might be made one of several selectable heuristics.
*/
-static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
+static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
{
int32 blength;
int s2length;
blength = BLOCK_SIZE;
else {
int32 c;
- uint64 l;
+ int64 l;
int cnt;
for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {}
if (cnt >= 31 || c >= MAX_BLOCK_SIZE)
blength = 0;
do {
blength |= c;
- if (len < (uint64)blength * blength)
+ if (len < (int64)blength * blength)
blength &= ~c;
c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
s2length = SUM_LENGTH;
} else {
int32 c;
- uint64 l;
+ int64 l;
int b = BLOCKSUM_BIAS;
for (l = len; l >>= 1; b += 2) {}
for (c = blength; c >>= 1 && b; b--) {}
}
-
/*
* Acts on file number @p i from @p flist, whose name is @p fname.
*
* @note This comment was added later by mbp who was trying to work it
* out. It might be wrong.
*/
-static void recv_generator(char *fname, struct file_struct *file, int i,
+static void recv_generator(char *fname, struct file_list *flist,
+ struct file_struct *file, int i,
int f_out, int f_out_name)
{
int fd = -1, f_copy = -1;
* to prepare appropriately. If there is already a
* file of that name and it is *not* a directory, then
* we need to delete it. If it doesn't exist, then
- * recursively create it. */
-
- if (dry_run)
- return; /* TODO: causes inaccuracies -- fix */
+ * (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- if (robust_unlink(fname) != 0) {
- rsyserr(FERROR, errno,
- "recv_generator: unlink %s to make room for directory",
- full_fname(fname));
- return;
- }
+ delete_file(fname, DEL_TERSE);
statret = -1;
}
if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
- if (!(relative_paths && errno == ENOENT
- && create_directory_path(fname, orig_umask) == 0
- && do_mkdir(fname, file->mode) == 0)) {
+ if (!relative_paths || errno != ENOENT
+ || create_directory_path(fname, orig_umask) < 0
+ || do_mkdir(fname, file->mode) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
+ if (delete_during && f_out != -1
+ && (file->flags & FLAG_DEL_START))
+ delete_in_dir(flist, fname);
return;
} else if (max_size && file->length > max_size) {
if (verbose > 1)
if (preserve_links && S_ISLNK(file->mode)) {
#if SUPPORT_LINKS
- char lnk[MAXPATHLEN];
- int l;
-
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n",
return;
}
if (statret == 0) {
- l = readlink(fname,lnk,MAXPATHLEN-1);
- if (l > 0) {
- lnk[l] = 0;
+ int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
+ char lnk[MAXPATHLEN];
+ int len;
+
+ if (!dflag
+ && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
+ lnk[len] = 0;
/* A link already pointing to the
* right place -- no further action
* required. */
- if (strcmp(lnk,file->u.link) == 0) {
+ if (strcmp(lnk, file->u.link) == 0) {
set_perms(fname, file, &st,
PERMS_REPORT);
return;
}
}
- /* Not a symlink, so delete whatever's
- * already there and put a new symlink
- * in place. */
- delete_file(fname);
+ /* Not the right symlink (or not a symlink), so
+ * delete it. */
+ delete_file(fname, dflag | DEL_TERSE);
}
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
if (statret != 0 ||
st.st_mode != file->mode ||
st.st_rdev != file->u.rdev) {
- delete_file(fname);
+ int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
+ delete_file(fname, dflag | DEL_TERSE);
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
safe_fname(fname),
}
if (statret == 0 && !S_ISREG(st.st_mode)) {
- if (delete_file(fname) != 0)
+ int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
+ if (delete_file(fname, dflag | DEL_TERSE) != 0)
return;
statret = -1;
stat_errno = ENOENT;
notify_others:
write_int(f_out, i);
+ if (protocol_version >= 29 && inplace && !read_batch)
+ write_byte(f_out, fnamecmp_type);
if (f_out_name >= 0)
write_byte(f_out_name, fnamecmp_type);
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, f_out, f_out_name);
+ flist, file, i, f_out, f_out_name);
}
phase++;
while ((i = get_redo_num()) != -1) {
struct file_struct *file = flist->files[i];
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, f_out, f_out_name);
+ flist, file, i, f_out, f_out_name);
}
phase++;
if (!file->basename || !S_ISDIR(file->mode))
continue;
recv_generator(local_name ? local_name : f_name(file),
- file, i, -1, -1);
+ flist, file, i, -1, -1);
}
if (verbose > 2)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff