extern int io_timeout;
extern int protocol_version;
extern int always_checksum;
+extern char *partial_dir;
extern char *compare_dest;
extern int link_dest;
extern int whole_file;
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
- char fnamecmpdest[MAXPATHLEN];
-
- if (compare_dest != NULL) {
- if (access(fname, 0) != 0) {
- pathjoin(fnamecmpdest, sizeof fnamecmpdest,
- compare_dest, fname);
- fname = fnamecmpdest;
- }
- }
file_checksum(fname,sum,st->st_size);
return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
: MD4_SUM_LENGTH) == 0;
{
int fd;
STRUCT_STAT st;
- int statret;
+ int statret, stat_errno;
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
}
statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
+ stat_errno = errno;
- if (only_existing && statret == -1 && errno == ENOENT) {
+ if (only_existing && statret == -1 && stat_errno == ENOENT) {
/* we only want to update existing files */
if (verbose > 1) {
rprintf(FINFO, "not creating new file \"%s\"\n",
if (statret == -1 && compare_dest != NULL) {
/* try the file at compare_dest instead */
- int saveerrno = errno;
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname);
- statret = link_stat(fnamecmpbuf, &st, 0);
- if (!S_ISREG(st.st_mode))
- statret = -1;
- if (statret == -1)
- errno = saveerrno;
+ if (link_stat(fnamecmpbuf, &st, 0) == 0
+ && S_ISREG(st.st_mode)) {
#if HAVE_LINK
- else if (link_dest && !dry_run) {
- if (do_link(fnamecmpbuf, fname) != 0) {
- if (verbose > 0) {
- rsyserr(FINFO, errno, "link %s => %s",
- fnamecmpbuf, safe_fname(fname));
+ if (link_dest && !dry_run) {
+ if (do_link(fnamecmpbuf, fname) < 0) {
+ if (verbose) {
+ rsyserr(FINFO, errno,
+ "link %s => %s",
+ fnamecmpbuf,
+ safe_fname(fname));
+ }
+ fnamecmp = fnamecmpbuf;
}
- }
- fnamecmp = fnamecmpbuf;
- }
+ } else
#endif
- else
- fnamecmp = fnamecmpbuf;
+ fnamecmp = fnamecmpbuf;
+ statret = 0;
+ }
+ }
+
+ if (statret == 0 && !S_ISREG(st.st_mode)) {
+ if (delete_file(fname) != 0)
+ return;
+ statret = -1;
+ stat_errno = ENOENT;
}
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
- if (errno == ENOENT) {
+ if (stat_errno == ENOENT) {
write_int(f_out,i);
if (!dry_run && !read_batch)
write_sum_head(f_out, NULL);
} else if (verbose > 1) {
- rsyserr(FERROR, errno,
- "recv_generator: failed to open %s",
+ rsyserr(FERROR, stat_errno,
+ "recv_generator: failed to stat %s",
full_fname(fname));
}
return;
}
- if (!S_ISREG(st.st_mode)) {
- if (delete_file(fname) != 0) {
- return;
- }
-
- /* now pretend the file didn't exist */
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
- return;
- write_int(f_out,i);
- if (!dry_run && !read_batch)
- write_sum_head(f_out, NULL);
- return;
- }
-
if (opt_ignore_existing && fnamecmp == fname) {
if (verbose > 1)
rprintf(FINFO, "%s exists\n", safe_fname(fname));
return;
}
- if (skip_file(fname, file, &st)) {
+ if (skip_file(fnamecmp, file, &st)) {
if (fnamecmp == fname)
set_perms(fname, file, &st, PERMS_REPORT);
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;
+ }
+ }
+
/* open the file */
fd = do_open(fnamecmp, O_RDONLY, 0);