Some basic batch-mode tests.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index c41e224..715af86 100644 (file)
--- a/main.c
+++ b/main.c
@@ -53,6 +53,7 @@ extern int whole_file;
 extern int read_batch;
 extern int write_batch;
 extern int batch_fd;
+extern int batch_gen_fd;
 extern int filesfrom_fd;
 extern pid_t cleanup_child_pid;
 extern char *files_from;
@@ -311,15 +312,24 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
                rprintf(FINFO,"\n");
        }
 
-       if (local_server) {
+       if (read_batch) {
+               int from_gen_pipe[2];
+               if (fd_pair(from_gen_pipe) < 0) {
+                       rsyserr(FERROR, errno, "pipe");
+                       exit_cleanup(RERR_IPC);
+               }
+               batch_gen_fd = from_gen_pipe[0];
+               *f_out = from_gen_pipe[1];
+               *f_in = batch_fd;
+               ret = -1; /* no child pid */
+       } else if (local_server) {
                /* If the user didn't request --[no-]whole-file, force
                 * it on, but only if we're not batch processing. */
-               if (whole_file < 0 && !read_batch && !write_batch)
+               if (whole_file < 0 && !write_batch)
                        whole_file = 1;
                ret = local_child(argc, args, f_in, f_out, child_main);
-       } else {
+       } else
                ret = piped_child(args,f_in,f_out);
-       }
 
        if (dir)
                free(dir);
@@ -392,7 +402,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
                        (long)getpid());
        }
 
-       if (am_daemon && lp_write_only(module_id) && am_sender) {
+       if (am_daemon && lp_write_only(module_id)) {
                rprintf(FERROR, "ERROR: module is write only\n");
                exit_cleanup(RERR_SYNTAX);
                return;
@@ -529,7 +539,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
                        argc, (long)getpid());
        }
 
-       if (am_daemon && lp_read_only(module_id) && !am_sender) {
+       if (am_daemon && lp_read_only(module_id)) {
                rprintf(FERROR,"ERROR: module is read only\n");
                exit_cleanup(RERR_SYNTAX);
                return;
@@ -624,13 +634,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 
        cleanup_child_pid = pid;
        if (read_batch) {
-               /* This is the heart of the read_batch approach:
-                * Switcher-roo the file descriptors, and
-                * nobody's the wiser. */
-               close(f_in);
-               close(f_out);
-               f_in = batch_fd;
-               f_out = do_open("/dev/null", O_WRONLY, 0);
                assert(am_sender == 0);
        } else {
                set_nonblocking(f_in);
@@ -655,8 +658,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 
                if (write_batch)
                        start_write_batch(f_out);
-               /* Can be unconditional, but this is theoretically
-                * more efficent for read_batch case. */
                if (!read_batch) /* don't write to pipe */
                        flist = send_file_list(f_out,argc,argv);
                if (verbose > 3)
@@ -683,8 +684,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
        if (argc == 0)
                list_only = 1;
 
-       /* Can be unconditional, but this is theoretically more
-        * efficient for the read_batch case. */
        if (!read_batch)
                send_exclude_list(f_out);
 
@@ -1020,11 +1019,8 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
 int main(int argc,char *argv[])
 {
        int ret;
-       int orig_argc;
-       char **orig_argv;
-
-       orig_argc = argc;
-       orig_argv = argv;
+       int orig_argc = argc;
+       char **orig_argv = argv;
 
        signal(SIGUSR1, sigusr1_handler);
        signal(SIGUSR2, sigusr2_handler);
@@ -1075,7 +1071,7 @@ int main(int argc,char *argv[])
 
        if (write_batch || read_batch) {
                if (write_batch)
-                       write_batch_argvs_file(orig_argc, orig_argv);
+                       write_batch_shell_file(orig_argc, orig_argv, argc);
 
                if (read_batch && strcmp(batch_name, "-") == 0)
                        batch_fd = STDIN_FILENO;