search for: write_batch_argvs_fil

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

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

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

...orig_argv = argv; signal(SIGUSR1, sigusr1_handler); @@ -847,15 +849,10 @@ that implement getcwd that way "pwd" can't be found after chroot. */ push_dir(NULL,0); - if (write_batch) { /* dw */ - create_batch_file_ext(); + if (write_batch && !am_server) { write_batch_argvs_file(orig_argc, orig_argv); } - if (read_batch) { /* dw */ - set_batch_file_ext(batch_ext); - } - if (am_daemon) { return daemon_main(); } @@ -885,4 +882,3 @@ exit_cleanup(ret); return ret; } - Index: options.c =================================================================== RCS...

...am_sender && argc > 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: /cvsro...