Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimized away a call to cmp_modtime() for a compare-dest file.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
9cbfe75
..
84958b8
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-52,6
+52,7
@@
extern int list_only;
extern int only_existing;
extern int orig_umask;
extern int safe_symlinks;
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;
extern struct exclude_list_struct server_exclude_list;
@@
-59,9
+60,8
@@
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)
{
/* 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;
return 0;
- }
if (link_dest) {
if (preserve_perms
&& (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
if (link_dest) {
if (preserve_perms
&& (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
@@
-93,15
+93,13
@@
static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
: MD4_SUM_LENGTH) == 0;
}
: MD4_SUM_LENGTH) == 0;
}
- if (size_only)
{
+ if (size_only)
return 1;
return 1;
- }
- if (ignore_times)
{
+ if (ignore_times)
return 0;
return 0;
- }
- return
(cmp_modtime(st->st_mtime,file->modtime) == 0)
;
+ return
cmp_modtime(st->st_mtime, file->modtime) == 0
;
}
}
@@
-122,11
+120,11
@@
void write_sum_head(int f, struct sum_struct *sum)
write_int(f, sum->remainder);
}
write_int(f, sum->remainder);
}
-/*
+/*
* set (initialize) the size entries in the per-file sum_struct
* set (initialize) the size entries in the per-file sum_struct
- * cal
ulating dynamic block ans
checksum sizes.
+ * cal
culating dynamic block and
checksum sizes.
*
*
- * This is only called from generate_and_send_sums() but is a sep
e
rate
+ * This is only called from generate_and_send_sums() but is a sep
a
rate
* function to encapsulate the logic.
*
* The block size is a rounded square root of file length.
* function to encapsulate the logic.
*
* The block size is a rounded square root of file length.
@@
-142,7
+140,6
@@
void write_sum_head(int f, struct sum_struct *sum)
static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
{
static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
{
- extern unsigned int block_size;
unsigned int blength;
int s2length;
uint32 c;
unsigned int blength;
int s2length;
uint32 c;
@@
-294,7
+291,7
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
return;
}
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 */
if (only_existing && statret == -1 && errno == ENOENT) {
/* we only want to update existing files */
@@
-303,15
+300,6
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
return;
}
return;
}
-#if SUPPORT_LINKS
- if (statret == 0 && keep_dirlinks
- && S_ISLNK(st.st_mode) && S_ISDIR(file->mode)) {
- STRUCT_STAT st2;
- if (do_stat(fname, &st2) == 0 && S_ISDIR(st2.st_mode))
- st = st2;
- }
-#endif
-
if (statret == 0 &&
!preserve_perms &&
(S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
if (statret == 0 &&
!preserve_perms &&
(S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
@@
-329,7
+317,8
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
* we need to delete it. If it doesn't exist, then
* recursively create it. */
* 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,
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (robust_unlink(fname) != 0) {
rsyserr(FERROR, errno,
@@
-438,7
+427,7
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
/* try the file at compare_dest instead */
int saveerrno = errno;
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname);
/* 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)
if (!S_ISREG(st.st_mode))
statret = -1;
if (statret == -1)
@@
-463,7
+452,8
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
return;
if (errno == ENOENT) {
write_int(f_out,i);
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",
} else if (verbose > 1) {
rsyserr(FERROR, errno,
"recv_generator: failed to open %s",
@@
-481,7
+471,8
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
write_int(f_out,i);
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;
}
@@
-491,7
+482,8
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
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;
if (verbose > 1)
rprintf(FINFO,"%s is newer\n",fname);
return;
@@
-545,7
+537,8
@@
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
generate_and_send_sums(mapbuf, st.st_size, f_out);
close(fd);
generate_and_send_sums(mapbuf, st.st_size, f_out);
close(fd);
- if (mapbuf) unmap_file(mapbuf);
+ if (mapbuf)
+ unmap_file(mapbuf);
}
}
@@
-623,7
+616,8
@@
void generate_files(int f, struct file_list *flist, char *local_name)
* modified during the transfer */
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
* 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);
}
recv_generator(local_name ? local_name : f_name(file),
file, i, -1);
}