* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "rsync.h"
extern int am_server;
extern int am_daemon;
extern int log_before_transfer;
-extern int log_format_has_i;
-extern int daemon_log_format_has_i;
+extern int stdout_format_has_i;
+extern int logfile_format_has_i;
extern int csum_length;
extern int append_mode;
extern int io_error;
extern int allowed_lull;
extern int protocol_version;
-extern int remove_sent_files;
+extern int remove_source_files;
extern int updating_basis_file;
extern int make_backups;
extern int do_progress;
extern int write_batch;
extern struct stats stats;
extern struct file_list *the_file_list;
-extern char *log_format;
+extern char *stdout_format;
/**
return;
file = the_file_list->files[ndx];
- /* The generator might tell us about symlinks we didn't send. */
- if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
- return;
- if (file->dir.root) {
+ if (F_ROOTDIR(file)) {
offset = stringjoin(fname, sizeof fname,
- file->dir.root, "/", NULL);
+ F_ROOTDIR(file), "/", NULL);
} else
offset = 0;
f_name(file, fname + offset);
- if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1)
- rprintf(FINFO, "sender removed %s\n", fname + offset);
+ if (remove_source_files) {
+ if (do_unlink(fname) == 0) {
+ if (verbose > 1)
+ rprintf(FINFO, "sender removed %s\n", fname + offset);
+ } else
+ rsyserr(FERROR, errno, "sender failed to remove %s", fname + offset);
+ }
}
-static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
- uchar fnamecmp_type, char *buf, int len)
+void write_ndx_and_attrs(int f_out, int ndx, int iflags,
+ uchar fnamecmp_type, char *buf, int len)
{
write_int(f_out, ndx);
if (protocol_version < 29)
write_vstring(f_out, buf, len);
}
-/* This is also used by receive.c with f_out = -1. */
-int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
- char *buf, int *len_ptr)
-{
- int len;
- uchar fnamecmp_type = FNAMECMP_FNAME;
- int iflags = protocol_version >= 29 ? read_shortint(f_in)
- : ITEM_TRANSFER | ITEM_MISSING_DATA;
-
- /* Handle the new keep-alive (no-op) packet. */
- if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
- ;
- else if (ndx < 0 || ndx >= the_file_list->count) {
- rprintf(FERROR, "Invalid file index: %d (count=%d) [%s]\n",
- ndx, the_file_list->count, who_am_i());
- exit_cleanup(RERR_PROTOCOL);
- } else if (iflags == ITEM_IS_NEW) {
- rprintf(FERROR, "Invalid itemized flag word: %x [%s]\n",
- iflags, who_am_i());
- exit_cleanup(RERR_PROTOCOL);
- }
-
- if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
- fnamecmp_type = read_byte(f_in);
- *type_ptr = fnamecmp_type;
-
- if (iflags & ITEM_XNAME_FOLLOWS) {
- if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
- exit_cleanup(RERR_PROTOCOL);
- } else {
- *buf = '\0';
- len = -1;
- }
- *len_ptr = len;
-
- if (iflags & ITEM_TRANSFER) {
- if (!S_ISREG(the_file_list->files[ndx]->mode)) {
- rprintf(FERROR,
- "received request to transfer non-regular file: %d [%s]\n",
- ndx, who_am_i());
- exit_cleanup(RERR_PROTOCOL);
- }
- } else if (f_out >= 0) {
- write_ndx_and_attrs(f_out, ndx, iflags,
- fnamecmp_type, buf, len);
- }
-
- return iflags;
-}
-
void send_files(struct file_list *flist, int f_out, int f_in)
{
int fd = -1;
int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1;
struct stats initial_stats;
int save_make_backups = make_backups;
- int itemizing = am_daemon ? daemon_log_format_has_i
- : !am_server && log_format_has_i;
+ int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
+ enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int i, j;
unsigned int offset;
i = read_int(f_in);
- if (i == -1) {
+ if (i == NDX_DONE) {
if (++phase > max_phase)
break;
csum_length = SUM_LENGTH;
if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase);
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
/* For inplace: redo phase turns off the backup
* flag so that we do a regular inplace send. */
make_backups = 0;
continue;
file = flist->files[i];
- if (file->dir.root) {
+ if (F_ROOTDIR(file)) {
/* N.B. We're sure that this fits, so offset is OK. */
- offset = strlcpy(fname, file->dir.root, sizeof fname);
+ offset = strlcpy(fname, F_ROOTDIR(file), sizeof fname);
if (!offset || fname[offset-1] != '/')
fname[offset++] = '/';
} else
stats.current_file_index = i;
stats.num_transferred_files++;
- stats.total_transferred_size += file->length;
+ stats.total_transferred_size += F_LENGTH(file);
if (!do_xfers) { /* log the transfer */
- if (!am_server && log_format)
- log_item(file, &stats, iflags, NULL);
+ log_item(FCLIENT, file, &stats, iflags, NULL);
write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
xname, xlen);
continue;
rprintf(FINFO, "calling match_sums %s\n", fname);
if (log_before_transfer)
- log_item(file, &initial_stats, iflags, NULL);
+ log_item(FCLIENT, file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
- rprintf(FINFO, "%s\n", fname2);
+ rprintf(FCLIENT, "%s\n", fname2);
set_compression(fname);
if (do_progress)
end_progress(st.st_size);
- if (!log_before_transfer)
- log_item(file, &initial_stats, iflags, NULL);
+ log_item(log_code, file, &initial_stats, iflags, NULL);
if (mbuf) {
j = unmap_file(mbuf);
match_report();
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff