* Copyright (C) 1996-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
extern int am_sender;
extern int am_generator;
extern int am_daemon;
-extern int incremental;
+extern int inc_recurse;
extern int blocking_io;
extern int remove_source_files;
extern int daemon_over_rsh;
io_flush(FULL_FLUSH);
handle_stats(f_in);
- send_msg(MSG_DONE, "", 0);
+ send_msg(MSG_DONE, "", 1);
+ write_longint(error_pipe[1], stats.total_read);
io_flush(FULL_FLUSH);
/* Handle any keep-alive packets from the post-processing work
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
- write_int(f_out, NDX_DONE);
+ write_ndx(f_out, NDX_DONE);
}
io_flush(FULL_FLUSH);
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
- if (incremental && file_total == 1)
+ if (inc_recurse && file_total == 1)
recv_additional_file_list(f_in);
verbose = save_verbose;
if (write_batch && !am_server)
start_write_batch(f_in);
flist = recv_file_list(f_in);
- if (incremental && file_total == 1)
+ if (inc_recurse && file_total == 1)
recv_additional_file_list(f_in);
if (flist && flist->count > 0) {