c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
blength = MAX(blength, BLOCK_SIZE);
- blength = MIN(blength, MAX_BLOCK_SIZE);
}
if (protocol_version < 27) {
int f_out)
{
int fd;
- STRUCT_STAT st;
+ STRUCT_STAT st, partial_st;
int statret, stat_errno;
- char *fnamecmp;
+ char *fnamecmp, *partialptr;
char fnamecmpbuf[MAXPATHLEN];
if (list_only)
return;
}
- statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
- stat_errno = errno;
+ if (dry_run > 1) {
+ statret = -1;
+ stat_errno = ENOENT;
+ } else {
+ statret = link_stat(fname, &st,
+ keep_dirlinks && S_ISDIR(file->mode));
+ stat_errno = errno;
+ }
if (only_existing && statret == -1 && stat_errno == ENOENT) {
/* we only want to update existing files */
stat_errno = ENOENT;
}
+ if (partial_dir && (partialptr = partial_dir_fname(fname))
+ && link_stat(partialptr, &partial_st, 0) == 0
+ && S_ISREG(partial_st.st_mode)) {
+ if (statret == -1)
+ goto prepare_to_open;
+ } else
+ partialptr = NULL;
+
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
return;
}
+prepare_to_open:
if (dry_run || read_batch) {
write_int(f_out,i);
return;
return;
}
- if (partial_dir) {
- STRUCT_STAT st2;
- char *partialptr = partial_dir_fname(fname);
- if (partialptr && link_stat(partialptr, &st2, 0) == 0
- && S_ISREG(st2.st_mode)) {
- st = st2;
- fnamecmp = partialptr;
- }
+ if (partialptr) {
+ st = partial_st;
+ fnamecmp = partialptr;
}
/* open the file */