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
Avoid a double-increment of a file's st_dev value
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
33b7ce2
..
bec5c17
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-289,7
+289,7
@@
static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
if (allowed_lull)
rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
if (allowed_lull)
- maybe_send_keepalive(time(NULL),
True
);
+ maybe_send_keepalive(time(NULL),
MSK_ALLOW_FLUSH
);
if (io_error && !ignore_errors) {
if (already_warned)
if (io_error && !ignore_errors) {
if (already_warned)
@@
-1355,10
+1355,12
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (safe_symlinks && unsafe_symlink(sl, fname)) {
if (INFO_GTE(NAME, 1)) {
if (solo_file)
if (safe_symlinks && unsafe_symlink(sl, fname)) {
if (INFO_GTE(NAME, 1)) {
if (solo_file)
+ /* fname contains the destination path, but we
+ * want to report the source path. */
fname = f_name(file, NULL);
rprintf(FINFO,
fname = f_name(file, NULL);
rprintf(FINFO,
- "ignoring unsafe symlink
%s
-> \"%s\"\n",
- f
ull_fname(fname)
, sl);
+ "ignoring unsafe symlink
\"%s\"
-> \"%s\"\n",
+ f
name
, sl);
}
return;
}
}
return;
}
@@
-1928,7
+1930,7
@@
static void touch_up_dirs(struct file_list *flist, int ndx)
}
if (counter >= loopchk_limit) {
if (allowed_lull)
}
if (counter >= loopchk_limit) {
if (allowed_lull)
- maybe_send_keepalive(time(NULL),
True
);
+ maybe_send_keepalive(time(NULL),
MSK_ALLOW_FLUSH
);
else
maybe_flush_socket(0);
counter = 0;
else
maybe_flush_socket(0);
counter = 0;
@@
-2128,7
+2130,7
@@
void generate_files(int f_out, const char *local_name)
if (i + cur_flist->ndx_start >= next_loopchk) {
if (allowed_lull)
if (i + cur_flist->ndx_start >= next_loopchk) {
if (allowed_lull)
- maybe_send_keepalive(time(NULL),
True
);
+ maybe_send_keepalive(time(NULL),
MSK_ALLOW_FLUSH
);
else
maybe_flush_socket(0);
next_loopchk += loopchk_limit;
else
maybe_flush_socket(0);
next_loopchk += loopchk_limit;