extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
+extern int always_checksum;
extern int recurse;
-extern int fuzzy_basis;
extern int relative_paths;
extern int rsync_port;
-extern int inplace;
-extern int make_backups;
extern int whole_file;
extern int read_batch;
extern int write_batch;
extern pid_t cleanup_child_pid;
extern struct stats stats;
extern char *filesfrom_host;
-extern char *partial_dir;
-extern char *basis_dir[];
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
+extern char curr_dir[MAXPATHLEN];
int local_server = 0;
+int pre_checksum = 0;
struct file_list *the_file_list;
/* There's probably never more than at most 2 outstanding child processes,
/****************************************************************************
wait for a process to exit, calling io_flush while waiting
****************************************************************************/
-void wait_process(pid_t pid, int *status)
+static void wait_process(pid_t pid, int *code_ptr)
{
pid_t waited_pid;
- int cnt;
+ int cnt, status;
- while ((waited_pid = waitpid(pid, status, WNOHANG)) == 0) {
+ while ((waited_pid = waitpid(pid, &status, WNOHANG)) == 0) {
msleep(20);
io_flush(FULL_FLUSH);
}
*/
for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) {
if (pid == pid_stat_table[cnt].pid) {
- *status = pid_stat_table[cnt].status;
+ waited_pid = pid;
+ status = pid_stat_table[cnt].status;
pid_stat_table[cnt].pid = 0;
break;
}
/* TODO: If the child exited on a signal, then log an
* appropriate error message. Perhaps we should also accept a
* message describing the purpose of the child. Also indicate
- * this to the caller so that thhey know something went
- * wrong. */
- *status = WEXITSTATUS(*status);
+ * this to the caller so that they know something went wrong. */
+ if (waited_pid < 0)
+ *code_ptr = RERR_WAITCHILD;
+ else if (!WIFEXITED(status)) {
+#ifdef WCOREDUMP
+ if (WCOREDUMP(status))
+ *code_ptr = RERR_CRASHED;
+ else
+#endif
+ if (WIFSIGNALED(status))
+ *code_ptr = RERR_TERMINATED;
+ else
+ *code_ptr = RERR_WAITCHILD;
+ } else
+ *code_ptr = WEXITSTATUS(status);
}
/* This function gets called from all 3 processes. We want the client side
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
{
- int i;
struct file_list *flist;
char *dir = argv[0];
argc--;
argv++;
- if (strcmp(dir,".")) {
- int l = strlen(dir);
- if (strcmp(dir,"/") == 0)
- l = 0;
- for (i = 0; i < argc; i++)
- argv[i] += l+1;
- }
-
if (argc == 0 && (recurse || list_only)) {
argc = 1;
argv--;
struct file_list *flist;
char *local_name = NULL;
char *dir = NULL;
+ char olddir[sizeof curr_dir];
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
filesfrom_fd = -1;
}
+ strlcpy(olddir, curr_dir, sizeof olddir);
+ if (always_checksum && argc > 0)
+ pre_checksum = push_dir(argv[0]);
+
flist = recv_file_list(f_in);
verbose = save_verbose;
if (!flist) {
}
the_file_list = flist;
- if (argc > 0) {
- if (strcmp(dir,".")) {
- argv[0] += strlen(dir);
- if (argv[0][0] == '/')
- argv[0]++;
- }
+ if (pre_checksum)
+ pop_dir(olddir);
+
+ if (argc > 0)
local_name = get_local_name(flist,argv[0]);
- }
status = do_recv(f_in,f_out,flist,local_name);
exit_cleanup(status);
{
struct file_list *flist = NULL;
int status = 0, status2 = 0;
+ char olddir[sizeof curr_dir];
char *local_name = NULL;
cleanup_child_pid = pid;
filesfrom_fd = -1;
}
+ strlcpy(olddir, curr_dir, sizeof olddir);
+ if (always_checksum)
+ pre_checksum = push_dir(argv[0]);
+
if (write_batch && !am_server)
start_write_batch(f_in);
flist = recv_file_list(f_in);
the_file_list = flist;
+ if (pre_checksum)
+ pop_dir(olddir);
+
if (flist && flist->count > 0) {
local_name = get_local_name(flist, argv[0]);
if (shell_path) { /* source is remote */
char *dummy1;
int dummy2;
- if (check_for_hostspec(argv[argc], &dummy1, &dummy2)) {
+ if (argc && check_for_hostspec(argv[argc], &dummy1, &dummy2)) {
rprintf(FERROR,
"The source and destination cannot both be remote.\n");
exit_cleanup(RERR_SYNTAX);