search for: orig_argc

I compiled and tried rsync 2.5.1pre1. RSYNC with -F option dumps a core. % gdb ./rsync GNU gdb 5.1 (gdb) r -F Starting program: /work/rsync-2.5.1pre1/./rsync -F Program received signal SIGSEGV, Segmentation fault. write_batch_argvs_file (orig_argc=-2, argc=0, argv=0x0) at batch.c:153 153 if ( !strcmp(argv[i],"-F") ){ /* safer to change it here than script*/ ... -- ayamura

> 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.

...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 char *batch_ext; /* dw */ - int orig_argc; /* dw */ + extern int write_batch; + int orig_argc; char **orig_argv; - orig_argc = argc; /* dw */ + orig_argc = argc; orig_argv = argv; signal(SIGUSR1, sigusr1_handler); @@ -847,15 +849,10 @@ that implement getcwd that way "pwd" can't be found after chroot. */ pu...

Hey everyone. My mind has been boggled by an issue I ran into a few hours ago. I am completely lost as to why the following code behaves the way it does and would appreciate any hints from you guys. It would already be super-helpful if others could post their output for the following so that I can figure out whether this is weirdness specific to my setup or a global phenomenon. So far,

...*********** *** 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 || read_batch) { ! if (write_batch) write_batch_argvs_file(orig_argc, orig_argv); + + batch_fd = do_open(batch_prefix, + write_batch ? O_WRONLY | O_CREAT | O_T...

...rgv=0x18da238) at main.c:822 flist = 0x18fa9b0 dir = 0x7ffff3bf4e65 "." #4 0x0000000000423f1f in start_server (f_in=0, f_out=1, argc=2, argv=0x18da230) at main.c:1089 No locals. #5 0x0000000000425282 in main (argc=2, argv=0x18da230) at main.c:1630 ret = 0 orig_argc = 7 orig_argv = 0x7ffff3bf3fc8 sigmask = {__val = {84483, 0 <repeats 15 times>}} --snip-- Detaching from program: /usr/bin/rsync, process 4942 root at st1:~# gcore 4942 hash_search (f=1, s=0x192d220, buf=0x192d1e0, len=214748364800) at match.c:238 238...

...gc > 1) { usage(FERROR); exit_cleanup(RERR_SYNTAX); } ! /* ... or no dest at all */ ! if (!am_sender && argc == 0) { list_only = 1; } *************** *** 1028,1033 **** --- 1029,1038 ---- if (write_batch && !am_server) { write_batch_argvs_file(orig_argc, orig_argv); + /* initialize static fds */ + ret = -1; + write_batch_csum_info(&ret, NULL); + write_batch_delta_file(NULL, 0); } if (am_daemon && !am_server) Index: options.c =================================================================== RCS file: /cvsroot/rsync/op...

...p(f_out,src_list_fp) : + send_file_list(f_out,argc,argv)); if (verbose > 3) rprintf(FINFO,"file list sent\n"); @@ -836,6 +840,7 @@ extern int dry_run; extern int am_daemon; extern int am_server; + extern int source_list; int ret; extern int write_batch; int orig_argc; @@ -872,6 +877,14 @@ /* FIXME: We ought to call the same error-handling * code here, rather than relying on getopt. */ option_error(); + exit_cleanup(RERR_SYNTAX); + } + + if (source_list && + ((argc != 2) || + !(src_list_fp = (strcmp(argv[0]...