search for: shell_path

...(FERROR); exit_cleanup(RERR_SYNTAX); } --- 755,761 ---- daemon_over_rsh = 1; } ! if (argc < 1) { /* destination required */ usage(FERROR); exit_cleanup(RERR_SYNTAX); } *************** *** 764,772 **** *p = 0; shell_machine = argv[0]; shell_path = p+1; - argc--; argv++; ! } else { am_sender = 1; /* rsync:// destination uses rsync server over direct socket */ --- 764,771 ---- *p = 0; shell_machine = argv[0]; shell_path = p+1; argv++; ! } else { /* source is local */ am_sender = 1; /*...

...--- 736,742 ---- return start_socket_client(host, path, argc-1, argv+1); } ! p = find_colon(argv[0]); if (p) { if (p[1] == ':') { /* double colon */ *************** *** 808,816 **** } argc--; } ! } else { am_sender = 1; ! local_server = 1; shell_path = argv[argc-1]; } --- 811,857 ---- } argc--; } ! } else { /* read_batch */ am_sender = 1; ! ! if (argc > 1) { ! usage(FERROR); ! exit_cleanup(RERR_SYNTAX); ! } ! ! if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) { ! char *host, *path; ! !...

...tern int whole_file; extern int write_batch; extern int read_batch; + extern int force_f_in; + extern int force_f_out; int rc; /* Don't clobber argv[] so that ps(1) can still show the right @@ -770,9 +772,14 @@ list_only = 1; } - pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); + if (force_f_in != -1) { + ret = client_run(force_f_in, force_f_out, -1, argc, argv); + } + else { + pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); - ret = client_run(f_in, f_out, pid, argc, argv); + ret = client_run(f_in, f_out, p...

...} else { + who_am_i = "sender"; am_sender = 1; /* rsync:// destination uses rsync server over direct socket */ @@ -817,6 +822,7 @@ static int start_client(int argc, char * argc--; } } else { + who_am_i = "sender"; am_sender = 1; local_server = 1; shell_path = argv[argc-1]; --- options.c 23 Jan 2004 09:32:50 -0000 1.127 +++ options.c 27 Jan 2004 08:00:54 -0000 @@ -66,6 +66,7 @@ int read_only = 0; int module_id = -1; int am_server = 0; int am_sender = 0; +char *who_am_i = "receiver"; char *files_from = NULL; int filesfrom_fd = -1; char *...

...* Send to remote rsyncd server. */ *p = 0; return start_socket_client(argv[argc-1], p+2, argc-1, argv); } @@ -726,6 +756,8 @@ exit_cleanup(RERR_SYNTAX); } + /* Last parameter is HOST:MODULE. + * Send to remote shell. */ if (local_server) { shell_machine = NULL; shell_path = argv[argc-1]; diff -urN rsync-2.5.5/options.c rsync-2.5.5+pushURL/options.c --- rsync-2.5.5/options.c Tue Mar 19 20:16:42 2002 +++ rsync-2.5.5+pushURL/options.c Wed Jun 5 09:17:13 2002 @@ -196,6 +196,7 @@ rprintf(F," or rsync [OPTION]... [USER@]HOST::SRC [DEST]\n"); rprintf(F,...

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.

...des local, + * except when creating a batch update + */ + if (!write_batch && whole_file == -1) whole_file = 1; } else if (p[1] == ':') { *p = 0; @@ -735,9 +739,9 @@ argc--; } } else { - am_sender = 1; /* dw */ - local_server = 1; /* dw */ - shell_path = argv[argc-1]; /* dw */ + am_sender = 1; + local_server = 1; + shell_path = argv[argc-1]; } if (shell_machine) { @@ -802,13 +806,11 @@ extern int am_daemon; extern int am_server; int ret; - extern int read_batch; /* dw */ - extern int write_batch; /* dw */ - extern ch...

...o last ':' */ + run_inband = 1; } else if (p[1] == ':') { *p = 0; return start_socket_client(argv[argc-1], p+2, argc-1, argv); *************** *** 650,655 **** --- 660,675 ---- pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); + /* if we're running in-band, we need to do the RSYNCD stuff first */ + if (run_inband) { + int tmpret; + tmpret = start_inband_exchange(shell_user, shell_path, + f_in, f_out, argc, argv); + if ( t...

...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); *************** *** 839,845 **** } argc--; } else { /* read_batch */ - am_sender = 1; local_server = 1; shell_path = argv[argc-1]; } --- 881,886 ---- *************** *** 1037,1044 **** init_flist(); ! if (write_batch && !am_server) { write_batch_argvs_file(orig_argc, orig_argv); } if (am_daemon && !am_server) --- 1078,1095 ---- init_flist(); ! if (write_batch...

People of cygwin & rsync, I recently attempted to get cygwin and rsync working to solve a backup/mirroring need in my computer life. Well, as you might guess, I ran into a little but of trouble. Strangely enough, rsync seemed to be regularly hanging when I attempted to do a "get" (sycronize a remote to a local dir). Well, considering I want to automate this, that was not going