git.samba.org
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly handle a failure to create a partial directory, which is
[rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index 13ae8e4d41f221550471c6f7dfa4d64850f0226b..c8ef7ccde000bb5c34418b5ad2d4cdc068c4621a 100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-3,11
+3,12
@@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-200
7
Wayne Davison
+ * Copyright (C) 2003-200
8
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,7
+21,6
@@
#include "rsync.h"
#include "rsync.h"
-extern int verbose;
extern int dry_run;
extern int do_xfers;
extern int am_server;
extern int dry_run;
extern int do_xfers;
extern int am_server;
@@
-38,12
+38,11
@@
extern int protocol_version;
extern int remove_source_files;
extern int updating_basis_file;
extern int make_backups;
extern int remove_source_files;
extern int updating_basis_file;
extern int make_backups;
-extern int do_progress;
extern int inplace;
extern int batch_fd;
extern int write_batch;
extern struct stats stats;
extern int inplace;
extern int batch_fd;
extern int write_batch;
extern struct stats stats;
-extern struct file_list *cur_flist, *first_flist;
+extern struct file_list *cur_flist, *first_flist
, *dir_flist
;
/**
* @file
/**
* @file
@@
-70,9
+69,9
@@
static struct sum_struct *receive_sums(int f)
s->sums = NULL;
s->sums = NULL;
- if (
verbose > 3
) {
- rprintf(FINFO, "count=%
.0f
n=%ld rem=%ld\n",
-
(double)s->count
, (long)s->blength, (long)s->remainder);
+ if (
DEBUG_GTE(DELTASUM, 3)
) {
+ rprintf(FINFO, "count=%
s
n=%ld rem=%ld\n",
+
big_num(s->count, 0)
, (long)s->blength, (long)s->remainder);
}
if (append_mode > 0) {
}
if (append_mode > 0) {
@@
-104,10
+103,10
@@
static struct sum_struct *receive_sums(int f)
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
- if (
verbose > 3
) {
+ if (
DEBUG_GTE(DELTASUM, 3)
) {
rprintf(FINFO,
rprintf(FINFO,
- "chunk[%d] len=%d offset=%
.0f
sum1=%08x\n",
- i, s->sums[i].len,
(double)s->sums[i].offset
,
+ "chunk[%d] len=%d offset=%
s
sum1=%08x\n",
+ i, s->sums[i].len,
big_num(s->sums[i].offset, 0)
,
s->sums[i].sum1);
}
}
s->sums[i].sum1);
}
}
@@
-134,12
+133,12
@@
void successful_send(int ndx)
}
file = flist->files[ndx - flist->ndx_start];
}
file = flist->files[ndx - flist->ndx_start];
- if (!
push_pathname(F_PATHNAME(file), -1
))
+ if (!
change_pathname(file, NULL, 0
))
return;
f_name(file, fname);
if (do_unlink(fname) == 0) {
return;
f_name(file, fname);
if (do_unlink(fname) == 0) {
- if (
verbose > 1
)
+ if (
INFO_GTE(REMOVE, 1)
)
rprintf(FINFO, "sender removed %s\n", fname);
} else
rsyserr(FERROR, errno, "sender failed to remove %s", fname);
rprintf(FINFO, "sender removed %s\n", fname);
} else
rsyserr(FERROR, errno, "sender failed to remove %s", fname);
@@
-181,7
+180,7
@@
void send_files(int f_in, int f_out)
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int ndx, j;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int ndx, j;
- if (
verbose > 2
)
+ if (
DEBUG_GTE(SEND, 1)
)
rprintf(FINFO, "send_files starting\n");
while (1) {
rprintf(FINFO, "send_files starting\n");
while (1) {
@@
-192,6
+191,10
@@
void send_files(int f_in, int f_out)
ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
xname, &xlen);
if (ndx == NDX_DONE) {
ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
xname, &xlen);
if (ndx == NDX_DONE) {
+ if (!am_server && INFO_GTE(PROGRESS, 2) && cur_flist) {
+ set_current_file_index(NULL, 0);
+ end_progress(0);
+ }
if (inc_recurse && first_flist) {
flist_free(first_flist);
if (first_flist) {
if (inc_recurse && first_flist) {
flist_free(first_flist);
if (first_flist) {
@@
-201,7
+204,7
@@
void send_files(int f_in, int f_out)
}
if (++phase > max_phase)
break;
}
if (++phase > max_phase)
break;
- if (
verbose > 2
)
+ if (
DEBUG_GTE(SEND, 1)
)
rprintf(FINFO, "send_files phase=%d\n", phase);
write_ndx(f_out, NDX_DONE);
continue;
rprintf(FINFO, "send_files phase=%d\n", phase);
write_ndx(f_out, NDX_DONE);
continue;
@@
-210,22
+213,25
@@
void send_files(int f_in, int f_out)
if (inc_recurse)
send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
if (inc_recurse)
send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
- file = cur_flist->files[ndx - cur_flist->ndx_start];
+ if (ndx - cur_flist->ndx_start >= 0)
+ file = cur_flist->files[ndx - cur_flist->ndx_start];
+ else
+ file = dir_flist->files[cur_flist->parent_ndx];
if (F_PATHNAME(file)) {
path = F_PATHNAME(file);
slash = "/";
} else {
path = slash = "";
}
if (F_PATHNAME(file)) {
path = F_PATHNAME(file);
slash = "/";
} else {
path = slash = "";
}
- if (!
push_pathname(F_PATHNAME(file), -1
))
+ if (!
change_pathname(file, NULL, 0
))
continue;
f_name(file, fname);
continue;
f_name(file, fname);
- if (
verbose > 2
)
+ if (
DEBUG_GTE(SEND, 1)
)
rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
#ifdef SUPPORT_XATTRS
rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR)
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR
&& !dry_run
)
recv_xattr_request(file, f_in);
#endif
recv_xattr_request(file, f_in);
#endif
@@
-261,7
+267,8
@@
void send_files(int f_in, int f_out)
updating_basis_file = inplace && (protocol_version >= 29
? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0);
updating_basis_file = inplace && (protocol_version >= 29
? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0);
- stats.current_file_index = ndx;
+ if (!am_server && INFO_GTE(PROGRESS, 1))
+ set_current_file_index(file, ndx);
stats.num_transferred_files++;
stats.total_transferred_size += F_LENGTH(file);
stats.num_transferred_files++;
stats.total_transferred_size += F_LENGTH(file);
@@
-276,7
+283,7
@@
void send_files(int f_in, int f_out)
if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
- rprintf(FERROR, "receive_sums failed\n");
+ rprintf(FERROR
_XFER
, "receive_sums failed\n");
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
@@
-285,13
+292,13
@@
void send_files(int f_in, int f_out)
if (errno == ENOENT) {
enum logcode c = am_daemon
&& protocol_version < 28 ? FERROR
if (errno == ENOENT) {
enum logcode c = am_daemon
&& protocol_version < 28 ? FERROR
- : F
INFO
;
+ : F
WARNING
;
io_error |= IOERR_VANISHED;
rprintf(c, "file has vanished: %s\n",
full_fname(fname));
} else {
io_error |= IOERR_GENERAL;
io_error |= IOERR_VANISHED;
rprintf(c, "file has vanished: %s\n",
full_fname(fname));
} else {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno,
+ rsyserr(FERROR
_XFER
, errno,
"send_files failed to open %s",
full_fname(fname));
}
"send_files failed to open %s",
full_fname(fname));
}
@@
-304,7
+311,7
@@
void send_files(int f_in, int f_out)
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno, "fstat failed");
+ rsyserr(FERROR
_XFER
, errno, "fstat failed");
free_sums(s);
close(fd);
exit_cleanup(RERR_PROTOCOL);
free_sums(s);
close(fd);
exit_cleanup(RERR_PROTOCOL);
@@
-316,27
+323,27
@@
void send_files(int f_in, int f_out)
} else
mbuf = NULL;
} else
mbuf = NULL;
- if (
verbose > 2
) {
- rprintf(FINFO, "send_files mapped %s%s%s of size %
.0f
\n",
- path,slash,fname,
(double)st.st_size
);
+ if (
DEBUG_GTE(DELTASUM, 2)
) {
+ rprintf(FINFO, "send_files mapped %s%s%s of size %
s
\n",
+ path,slash,fname,
big_num(st.st_size, 0)
);
}
write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
fnamecmp_type, xname, xlen);
write_sum_head(f_xfer, s);
}
write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
fnamecmp_type, xname, xlen);
write_sum_head(f_xfer, s);
- if (
verbose > 2
)
+ if (
DEBUG_GTE(DELTASUM, 2)
)
rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname);
if (log_before_transfer)
log_item(FCLIENT, file, &initial_stats, iflags, NULL);
rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname);
if (log_before_transfer)
log_item(FCLIENT, file, &initial_stats, iflags, NULL);
- else if (!am_server &&
verbose && do_progress
)
+ else if (!am_server &&
INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1)
)
rprintf(FCLIENT, "%s\n", fname);
set_compression(fname);
match_sums(f_xfer, s, mbuf, st.st_size);
rprintf(FCLIENT, "%s\n", fname);
set_compression(fname);
match_sums(f_xfer, s, mbuf, st.st_size);
- if (
do_progress
)
+ if (
INFO_GTE(PROGRESS, 1)
)
end_progress(st.st_size);
log_item(log_code, file, &initial_stats, iflags, NULL);
end_progress(st.st_size);
log_item(log_code, file, &initial_stats, iflags, NULL);
@@
-345,7
+352,7
@@
void send_files(int f_in, int f_out)
j = unmap_file(mbuf);
if (j) {
io_error |= IOERR_GENERAL;
j = unmap_file(mbuf);
if (j) {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, j,
+ rsyserr(FERROR
_XFER
, j,
"read errors mapping %s",
full_fname(fname));
}
"read errors mapping %s",
full_fname(fname));
}
@@
-354,7
+361,7
@@
void send_files(int f_in, int f_out)
free_sums(s);
free_sums(s);
- if (
verbose > 2
)
+ if (
DEBUG_GTE(SEND, 1)
)
rprintf(FINFO, "sender finished %s%s%s\n", path,slash,fname);
/* Flag that we actually sent this entry. */
rprintf(FINFO, "sender finished %s%s%s\n", path,slash,fname);
/* Flag that we actually sent this entry. */
@@
-363,7
+370,7
@@
void send_files(int f_in, int f_out)
if (make_backups < 0)
make_backups = -make_backups;
if (make_backups < 0)
make_backups = -make_backups;
- if (
verbose > 2
)
+ if (
DEBUG_GTE(SEND, 1)
)
rprintf(FINFO, "send files finished\n");
match_report();
rprintf(FINFO, "send files finished\n");
match_report();