extern int preserve_gid;
extern int update_only;
extern int opt_ignore_existing;
+extern int inplace;
+extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int size_only;
+extern OFF_T max_size;
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;
c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
blength = MAX(blength, BLOCK_SIZE);
- blength = MIN(blength, MAX_MAP_SIZE);
}
if (protocol_version < 27) {
*
* Generate approximately one checksum every block_len bytes.
*/
-static void generate_and_send_sums(int fd, OFF_T len, int f_out)
+static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
{
size_t i;
struct map_struct *mapbuf;
sum_sizes_sqroot(&sum, len);
if (len > 0)
- mapbuf = map_file(fd, len, sum.blength);
+ mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
else
mapbuf = NULL;
uint32 sum1 = get_checksum1(map, n1);
char sum2[SUM_LENGTH];
+ if (f_copy >= 0)
+ full_write(f_copy, map, n1);
+
get_checksum2(map, n1, sum2);
if (verbose > 3) {
* out. It might be wrong.
*/
static void recv_generator(char *fname, struct file_struct *file, int i,
- int f_out)
+ int f_out, int f_out_name)
{
- int fd;
- STRUCT_STAT st;
- int statret;
- char *fnamecmp;
+ int fd = -1, f_copy = -1;
+ STRUCT_STAT st, partial_st;
+ struct file_struct *back_file = NULL;
+ int statret, stat_errno;
+ char *fnamecmp, *partialptr, *backupptr = NULL;
char fnamecmpbuf[MAXPATHLEN];
+ uchar fnamecmp_type;
if (list_only)
return;
if (verbose > 2)
- rprintf(FINFO,"recv_generator(%s,%d)\n",fname,i);
+ rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i);
if (server_exclude_list.head
&& check_exclude(&server_exclude_list, fname,
S_ISDIR(file->mode)) < 0) {
if (verbose) {
rprintf(FINFO, "skipping server-excluded file \"%s\"\n",
- fname);
+ safe_fname(fname));
}
return;
}
- statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
+ 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 && 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", fname);
+ if (verbose > 1) {
+ rprintf(FINFO, "not creating new file \"%s\"\n",
+ safe_fname(fname));
+ }
return;
}
* and modification-time repair. */
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
- rprintf(FINFO,"%s/\n",fname);
+ rprintf(FINFO, "%s/\n", safe_fname(fname));
+ return;
+ } else if (max_size && file->length > max_size) {
+ if (verbose > 1)
+ rprintf(FINFO, "%s is over max-size\n", fname);
return;
}
}
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
- full_fname(fname), file->u.link);
+ full_fname(fname), safe_fname(file->u.link));
} else {
set_perms(fname,file,NULL,0);
if (verbose) {
- rprintf(FINFO,"%s -> %s\n", fname,file->u.link);
+ rprintf(FINFO, "%s -> %s\n", safe_fname(fname),
+ safe_fname(file->u.link));
}
}
#endif
return;
}
-#ifdef HAVE_MKNOD
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
if (statret != 0 ||
st.st_mode != file->mode ||
delete_file(fname);
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
- fname,(int)file->mode,(int)file->u.rdev);
+ safe_fname(fname),
+ (int)file->mode, (int)file->u.rdev);
}
if (do_mknod(fname,file->mode,file->u.rdev) != 0) {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
set_perms(fname,file,NULL,0);
- if (verbose)
- rprintf(FINFO,"%s\n",fname);
+ if (verbose) {
+ rprintf(FINFO, "%s\n",
+ safe_fname(fname));
+ }
}
} else {
set_perms(fname, file, &st, PERMS_REPORT);
}
return;
}
-#endif
if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
return;
if (!S_ISREG(file->mode)) {
- rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname);
+ rprintf(FINFO, "skipping non-regular file \"%s\"\n",
+ safe_fname(fname));
return;
}
fnamecmp = fname;
+ fnamecmp_type = FNAMECMP_FNAME;
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, 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_type = FNAMECMP_CMPDEST;
}
+ } else
+#endif
+ {
+ fnamecmp = fnamecmpbuf;
+ fnamecmp_type = FNAMECMP_CMPDEST;
}
- fnamecmp = fnamecmpbuf;
+ statret = 0;
}
-#endif
- else
- fnamecmp = fnamecmpbuf;
}
- if (statret == -1) {
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+ if (statret == 0 && !S_ISREG(st.st_mode)) {
+ if (delete_file(fname) != 0)
return;
- if (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",
- full_fname(fname));
- }
- return;
+ statret = -1;
+ stat_errno = ENOENT;
}
- if (!S_ISREG(st.st_mode)) {
- if (delete_file(fname) != 0) {
- return;
- }
+ 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;
- /* now pretend the file didn't exist */
+ if (statret == -1) {
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);
+ if (stat_errno == ENOENT)
+ goto notify_others;
+ if (verbose > 1) {
+ rsyserr(FERROR, stat_errno,
+ "recv_generator: failed to stat %s",
+ full_fname(fname));
+ }
return;
}
- if (opt_ignore_existing && fnamecmp == fname) {
+ if (opt_ignore_existing && fnamecmp_type == FNAMECMP_FNAME) {
if (verbose > 1)
- rprintf(FINFO,"%s exists\n",fname);
+ rprintf(FINFO, "%s exists\n", safe_fname(fname));
return;
}
- if (update_only && fnamecmp == fname
+ if (update_only && fnamecmp_type == FNAMECMP_FNAME
&& cmp_modtime(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
- rprintf(FINFO,"%s is newer\n",fname);
+ rprintf(FINFO, "%s is newer\n", safe_fname(fname));
return;
}
- if (skip_file(fname, file, &st)) {
- if (fnamecmp == fname)
+ if (skip_file(fnamecmp, file, &st)) {
+ if (fnamecmp_type == FNAMECMP_FNAME)
set_perms(fname, file, &st, PERMS_REPORT);
return;
}
- if (dry_run || read_batch) {
- write_int(f_out,i);
- return;
+prepare_to_open:
+ if (dry_run || whole_file > 0) {
+ statret = -1;
+ goto notify_others;
}
+ if (read_batch)
+ goto notify_others;
- if (whole_file > 0) {
- write_int(f_out,i);
- write_sum_head(f_out, NULL);
- return;
+ if (partialptr) {
+ st = partial_st;
+ fnamecmp = partialptr;
+ fnamecmp_type = FNAMECMP_PARTIAL_DIR;
}
/* open the file */
if (fd == -1) {
rsyserr(FERROR, errno, "failed to open %s, continuing",
full_fname(fnamecmp));
+ pretend_missing:
/* pretend the file didn't exist */
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
- write_int(f_out,i);
- write_sum_head(f_out, NULL);
- return;
+ statret = -1;
+ goto notify_others;
+ }
+
+ if (inplace && make_backups) {
+ if (!(backupptr = get_backup_name(fname))) {
+ close(fd);
+ return;
+ }
+ if (!(back_file = make_file(fname, NULL, NO_EXCLUDES))) {
+ close(fd);
+ goto pretend_missing;
+ }
+ if (robust_unlink(backupptr) && errno != ENOENT) {
+ rsyserr(FERROR, errno, "unlink %s",
+ full_fname(backupptr));
+ free(back_file);
+ close(fd);
+ return;
+ }
+ if ((f_copy = do_open(backupptr,
+ O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
+ rsyserr(FERROR, errno, "open %s",
+ full_fname(backupptr));
+ free(back_file);
+ close(fd);
+ return;
+ }
+ fnamecmp_type = FNAMECMP_BACKUP;
}
if (verbose > 3) {
- rprintf(FINFO,"gen mapped %s of size %.0f\n", fnamecmp,
- (double)st.st_size);
+ rprintf(FINFO, "gen mapped %s of size %.0f\n",
+ safe_fname(fnamecmp), (double)st.st_size);
}
if (verbose > 2)
rprintf(FINFO, "generating and sending sums for %d\n", i);
- write_int(f_out,i);
- generate_and_send_sums(fd, st.st_size, f_out);
+notify_others:
+ write_int(f_out, i);
+ if (f_out_name >= 0)
+ write_byte(f_out_name, fnamecmp_type);
+
+ if (dry_run || read_batch)
+ return;
+
+ if (statret == 0) {
+ generate_and_send_sums(fd, st.st_size, f_out, f_copy);
+
+ if (f_copy >= 0) {
+ close(f_copy);
+ set_perms(backupptr, back_file, NULL, 0);
+ if (verbose > 1) {
+ rprintf(FINFO, "backed up %s to %s\n",
+ fname, backupptr);
+ }
+ free(back_file);
+ }
- close(fd);
+ close(fd);
+ } else
+ write_sum_head(f_out, NULL);
}
-void generate_files(int f_out, struct file_list *flist, char *local_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name,
+ int f_out_name)
{
int i;
int phase = 0;
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, f_out);
+ 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);
+ 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);
+ file, i, -1, -1);
}
if (verbose > 2)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff