extern int verbose;
extern int dry_run;
extern int relative_paths;
+extern int keep_dirlinks;
extern int preserve_links;
extern int am_root;
extern int preserve_devices;
extern int link_dest;
extern int whole_file;
extern int local_server;
-extern int read_batch;
-extern int write_batch;
extern int list_only;
+extern int read_batch;
extern int only_existing;
extern int orig_umask;
extern int safe_symlinks;
+extern unsigned int block_size;
extern struct exclude_list_struct server_exclude_list;
/* choose whether to skip a particular file */
static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
{
- if (st->st_size != file->length) {
+ if (st->st_size != file->length)
return 0;
- }
if (link_dest) {
if (preserve_perms
&& (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
: MD4_SUM_LENGTH) == 0;
}
- if (size_only) {
+ if (size_only)
return 1;
- }
- if (ignore_times) {
+ if (ignore_times)
return 0;
- }
- return (cmp_modtime(st->st_mtime,file->modtime) == 0);
+ return cmp_modtime(st->st_mtime, file->modtime) == 0;
}
write_int(f, sum->remainder);
}
-/*
+/*
* set (initialize) the size entries in the per-file sum_struct
- * calulating dynamic block ans checksum sizes.
+ * calculating dynamic block and checksum sizes.
*
- * This is only called from generate_and_send_sums() but is a seperate
+ * This is only called from generate_and_send_sums() but is a separate
* function to encapsulate the logic.
*
* The block size is a rounded square root of file length.
static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
{
- extern unsigned int block_size;
unsigned int blength;
int s2length;
uint32 c;
}
}
-/**
- * Perhaps we want to just send an empty checksum set for this file,
- * which will force the whole thing to be literally transferred.
- *
- * When do we do this? If the user's explicitly said they
- * want the whole thing, or if { they haven't explicitly
- * requested a delta, and it's local but not batch mode.}
- *
- * Whew. */
-static BOOL disable_deltas_p(void)
-{
- if (whole_file > 0)
- return True;
- if (whole_file == 0 || write_batch || read_batch)
- return False;
- return local_server;
-}
-
/*
* Generate and send a stream of signatures/checksums that describe a buffer
*
* Generate approximately one checksum every block_len bytes.
*/
-static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out)
+static void generate_and_send_sums(struct map_struct *buf, OFF_T len, int f_out)
{
size_t i;
struct sum_struct sum;
-/**
+/*
* Acts on file number @p i from @p flist, whose name is @p fname.
*
* First fixes up permissions, then generates checksums for the file.
*
* @note This comment was added later by mbp who was trying to work it
* out. It might be wrong.
- **/
-void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
+ */
+static void recv_generator(char *fname, struct file_struct *file, int i,
+ int f_out)
{
int fd;
STRUCT_STAT st;
return;
}
- statret = link_stat(fname,&st);
+ statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
if (only_existing && statret == -1 && errno == ENOENT) {
/* we only want to update existing files */
* we need to delete it. If it doesn't exist, then
* recursively create it. */
- if (dry_run) return; /* XXXX -- might cause inaccuracies?? -- mbp */
+ if (dry_run)
+ return; /* TODO: causes inaccuracies -- fix */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (robust_unlink(fname) != 0) {
rsyserr(FERROR, errno,
full_fname(fname));
}
}
- /* f_out is set to -1 when doing final directory
- permission and modification time repair */
- if (set_perms(fname,file,NULL,0) && verbose && (f_out != -1))
+ /* f_out is set to -1 when doing final directory-permission
+ * and modification-time repair. */
+ if (set_perms(fname, file, statret ? NULL : &st, 0)
+ && verbose && f_out != -1)
rprintf(FINFO,"%s/\n",fname);
return;
}
+ if (read_batch)
+ return;
+
if (preserve_links && S_ISLNK(file->mode)) {
#if SUPPORT_LINKS
char lnk[MAXPATHLEN];
/* try the file at compare_dest instead */
int saveerrno = errno;
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname);
- statret = link_stat(fnamecmpbuf,&st);
+ statret = link_stat(fnamecmpbuf, &st, 0);
if (!S_ISREG(st.st_mode))
statret = -1;
if (statret == -1)
return;
if (errno == ENOENT) {
write_int(f_out,i);
- if (!dry_run) write_sum_head(f_out, NULL);
+ if (!dry_run)
+ write_sum_head(f_out, NULL);
} else if (verbose > 1) {
rsyserr(FERROR, errno,
"recv_generator: failed to open %s",
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
write_int(f_out,i);
- if (!dry_run) write_sum_head(f_out, NULL);
+ if (!dry_run)
+ write_sum_head(f_out, NULL);
return;
}
return;
}
- if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
+ if (update_only && fnamecmp == fname
+ && cmp_modtime(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
rprintf(FINFO,"%s is newer\n",fname);
return;
return;
}
- if (disable_deltas_p()) {
+ if (whole_file > 0) {
write_int(f_out,i);
write_sum_head(f_out, NULL);
return;
generate_and_send_sums(mapbuf, st.st_size, f_out);
close(fd);
- if (mapbuf) unmap_file(mapbuf);
+ if (mapbuf)
+ unmap_file(mapbuf);
}
-void generate_files(int f, struct file_list *flist, char *local_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name)
{
int i;
- int phase=0;
+ int phase = 0;
char fbuf[MAXPATHLEN];
if (verbose > 2) {
if (verbose >= 2) {
rprintf(FINFO,
- disable_deltas_p()
+ whole_file > 0
? "delta-transmission disabled for local transfer or --whole-file\n"
: "delta transmission enabled\n");
}
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, f);
+ file, i, f_out);
}
phase++;
csum_length = SUM_LENGTH;
- ignore_times=1;
+ ignore_times = 1;
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
- write_int(f,-1);
+ write_int(f_out, -1);
/* files can cycle through the system more than once
* to catch initial checksum errors */
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);
+ file, i, f_out);
}
phase++;
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
- write_int(f,-1);
+ write_int(f_out, -1);
if (preserve_hard_links)
do_hard_links();
* modified during the transfer */
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
- if (!file->basename || !S_ISDIR(file->mode)) continue;
+ if (!file->basename || !S_ISDIR(file->mode))
+ continue;
recv_generator(local_name ? local_name : f_name(file),
file, i, -1);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff