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
Fix the case where a partial-dir file exists but the destination
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
c1b46a6
..
1adb7a7
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-42,6
+42,7
@@
extern int size_only;
extern int io_timeout;
extern int protocol_version;
extern int always_checksum;
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;
extern char *compare_dest;
extern int link_dest;
extern int whole_file;
@@
-78,15
+79,6
@@
static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
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;
file_checksum(fname,sum,st->st_size);
return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
: MD4_SUM_LENGTH) == 0;
@@
-162,7
+154,6
@@
static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
blength = MAX(blength, BLOCK_SIZE);
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) {
}
if (protocol_version < 27) {
@@
-217,7
+208,7
@@
static void generate_and_send_sums(int fd, OFF_T len, int f_out)
sum_sizes_sqroot(&sum, len);
if (len > 0)
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;
else
mapbuf = NULL;
@@
-261,9
+252,9
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
int f_out)
{
int fd;
int f_out)
{
int fd;
- STRUCT_STAT st;
+ STRUCT_STAT st
, partial_st
;
int statret, stat_errno;
int statret, stat_errno;
- char *fnamecmp;
+ char *fnamecmp
, *partialptr = NULL
;
char fnamecmpbuf[MAXPATHLEN];
if (list_only)
char fnamecmpbuf[MAXPATHLEN];
if (list_only)
@@
-282,10
+273,16
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
return;
}
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 && 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",
/* we only want to update existing files */
if (verbose > 1) {
rprintf(FINFO, "not creating new file \"%s\"\n",
@@
-451,6
+448,16
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
stat_errno = ENOENT;
}
stat_errno = ENOENT;
}
+ if (partial_dir) {
+ if ((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;
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
@@
-479,12
+486,13
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
return;
}
return;
}
- if (skip_file(fname, file, &st)) {
+ if (skip_file(fname
cmp
, file, &st)) {
if (fnamecmp == fname)
set_perms(fname, file, &st, PERMS_REPORT);
return;
}
if (fnamecmp == fname)
set_perms(fname, file, &st, PERMS_REPORT);
return;
}
+prepare_to_open:
if (dry_run || read_batch) {
write_int(f_out,i);
return;
if (dry_run || read_batch) {
write_int(f_out,i);
return;
@@
-496,6
+504,11
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
return;
}
return;
}
+ if (partialptr) {
+ st = partial_st;
+ fnamecmp = partialptr;
+ }
+
/* open the file */
fd = do_open(fnamecmp, O_RDONLY, 0);
/* open the file */
fd = do_open(fnamecmp, O_RDONLY, 0);