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
- Changed the map_size parameter to map_file() to be an int32 named
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
c3ba30c
..
2ffd03f
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-47,7
+47,7
@@
extern int protocol_version;
extern int always_checksum;
extern char *partial_dir;
extern char *basis_dir[];
extern int always_checksum;
extern char *partial_dir;
extern char *basis_dir[];
-extern int co
py
_dest;
+extern int co
mpare
_dest;
extern int link_dest;
extern int whole_file;
extern int local_server;
extern int link_dest;
extern int whole_file;
extern int local_server;
@@
-467,13
+467,13
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
safe_fname(fname));
}
fnamecmp = fnamecmpbuf;
safe_fname(fname));
}
fnamecmp = fnamecmpbuf;
- fnamecmp_type =
FNAMECMP_BASIS_DIR +
i;
+ fnamecmp_type = i;
}
} else
#endif
{
fnamecmp = fnamecmpbuf;
}
} else
#endif
{
fnamecmp = fnamecmpbuf;
- fnamecmp_type =
FNAMECMP_BASIS_DIR +
i;
+ fnamecmp_type = i;
}
}
}
}
}
}
@@
-485,7
+485,7
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
stat_errno = ENOENT;
}
stat_errno = ENOENT;
}
- if (partial_dir && (partialptr = partial_dir_fname(fname))
+ if (partial_dir && (partialptr = partial_dir_fname(fname))
!= NULL
&& link_stat(partialptr, &partial_st, 0) == 0
&& S_ISREG(partial_st.st_mode)) {
if (statret == -1)
&& link_stat(partialptr, &partial_st, 0) == 0
&& S_ISREG(partial_st.st_mode)) {
if (statret == -1)
@@
-519,7
+519,7
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
return;
}
return;
}
- if (
(link_dest || copy_dest) && fnamecmp_type != FNAMECMP_FNAME
)
+ if (
!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH
)
;
else if (unchanged_file(fnamecmp, file, &st)) {
if (fnamecmp_type == FNAMECMP_FNAME)
;
else if (unchanged_file(fnamecmp, file, &st)) {
if (fnamecmp_type == FNAMECMP_FNAME)
@@
-528,6
+528,13
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
}
prepare_to_open:
}
prepare_to_open:
+ if (partialptr) {
+ st = partial_st;
+ fnamecmp = partialptr;
+ fnamecmp_type = FNAMECMP_PARTIAL_DIR;
+ statret = 0;
+ }
+
if (dry_run || whole_file > 0) {
statret = -1;
goto notify_others;
if (dry_run || whole_file > 0) {
statret = -1;
goto notify_others;
@@
-535,12
+542,6
@@
prepare_to_open:
if (read_batch)
goto notify_others;
if (read_batch)
goto notify_others;
- if (partialptr) {
- st = partial_st;
- fnamecmp = partialptr;
- fnamecmp_type = FNAMECMP_PARTIAL_DIR;
- }
-
/* open the file */
fd = do_open(fnamecmp, O_RDONLY, 0);
/* open the file */
fd = do_open(fnamecmp, O_RDONLY, 0);
@@
-685,6
+686,9
@@
void generate_files(int f_out, struct file_list *flist, char *local_name,
write_int(f_out, -1);
write_int(f_out, -1);
+ /* Read post-redo-phase MSG_DONE and any prior messages. */
+ get_redo_num();
+
if (preserve_hard_links)
do_hard_links();
if (preserve_hard_links)
do_hard_links();