search for: f_out

...| sn@parlanet.de | +49 431 988-1260 -------------- next part -------------- --- rsync-2.5.5/generator.c Mon Mar 25 06:54:31 2002 +++ rsync-2.5.5-gen/generator.c Tue Apr 23 01:51:32 2002 @@ -102,28 +102,12 @@ /* send a sums struct down a fd */ -static void send_sums(struct sum_struct *s, int f_out) +static void send_null_sums(int f_out) { - if (s) { - size_t i; - - /* tell the other guy how many we are going to be - doing and how many bytes there are in the last - chunk */ - write_int(f_out, s->count); - write_int(f_out, s->n); - write_int(f_out, s->remainder); - - fo...

...003 +++ proto.h Sat Mar 29 12:15:38 2003 @@ -91,6 +91,7 @@ struct file_list *flist_new(void); void flist_free(struct file_list *flist); char *f_name(struct file_struct *f); +void write_sum_head(int f, struct sum_struct *sum); void recv_generator(char *fname, struct file_list *flist, int i, int f_out); void generate_files(int f,struct file_list *flist,char *local_name,int f_recv); int main(int argc, char *argv[]); @@ -190,6 +191,7 @@ int report); void sig_int(void); void finish_transfer(char *fname, char *fnametmp, struct file_struct *file); +void read_sum_head(int f, struct sum_str...

....c,v retrieving revision 1.156 diff -c -r1.156 main.c *** main.c 1 Aug 2002 20:46:59 -0000 1.156 --- main.c 31 Dec 2002 01:21:34 -0000 *************** *** 346,351 **** --- 346,353 ---- exit_cleanup(0); } + io_start_buffering_in(f_in); + io_start_buffering_out(f_out); send_files(flist,f_out,f_in); io_flush(); report(f_out); *************** *** 421,427 **** close(error_pipe[1]); if (f_in != f_out) close(f_in); ! io_start_buffering(f_out); io_set_error_fd(error_pipe[0]); --- 423,429 ---- close(error_pipe[1]); if (f_...

..._t s2length; /**< csum_length */ struct sum_buf *sums; /**< points to info for each chunk */ }; --- generator.c Sat Mar 22 03:38:21 2003 +++ generator.c.dynsumlen Sat Mar 22 09:47:43 2003 @@ -109,13 +109,21 @@ /* - send a header that says "we have no checksums" down the f_out fd + * NULL sum_struct means we have no checksums */ -static void send_null_sums(int f_out) + +void write_sum_head(int f, struct sum_struct *sum) { - write_int(f_out, 0); - write_int(f_out, block_size); - write_int(f_out, 0); + static struct sum_struct null_sum; + + if (sum == (struct sum_stru...

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

...any way to get modules with ssh. GORY DETAILS: The code changes are about 150 lines, plus 70 lines of man page changes. Most of the code changes were to several functions (e.g. auth_server(), start_accept_loop(), rsync_module(), start_daemon()) to make them handle two file descriptors (f_in and f_out) instead of one bidirectional socket file descriptor (fd). Other changes include: - main() will call start_daemon() instead of start_server() if the program is called with both '--server' and '--daemon'. - start_daemon() is modified to no longer be static (it needs to be...

...False; return local_server; } *************** *** 227,242 **** * Generate and send a stream of signatures/checksums that describe a buffer * * Generate approximately one checksum every block_len bytes. */ ! static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out) { ! size_t i; struct sum_struct sum; OFF_T offset = 0; sum_sizes_sqroot(&sum, len); write_sum_head(f_out, &sum); for (i = 0; i < sum.count; i++) { unsigned int n1 = MIN(len, sum.blength); --- 228,253 ---- * Generate and send a stream of signatures/check...

...= { CAP_SYS_CHROOT, CAP_DAC_READ_SEARCH }; +#endif extern int am_sender; extern int am_server; extern int am_daemon; @@ -373,12 +389,46 @@ } #endif +#ifdef HAVE_LINUX_CAPS + if (setreuid(uid, 0)) { + rsyserr(FERROR, errno, "setreuid(%d,0) failed", (int) uid); + io_printf(f_out, "@ERROR: setreuid failed\n"); + return -1; + } + if( prctl(PR_SET_KEEPCAPS, 1) < 0 ) { + rsyserr(FERROR, errno, "prctl failed"); + io_printf(f_out, "@ERROR: prctl failed\n"); + return -1; + } + if( (cp = cap_init()) == NULL ) { + rsyserr(FERROR, errno...

https://bugzilla.samba.org/show_bug.cgi?id=10364 Summary: send_xattr_request: Assertion `f_out >= 0' failed. Product: rsync Version: 3.1.0 Platform: All OS/Version: All Status: NEW Severity: normal Priority: P5 Component: core AssignedTo: wayned at samba.org ReportedBy: xose.vazquez at gma...

...n char *exclude_path_prefix; extern char *config_file; + extern int write_batch; + extern int batch_fd; char *auth_user; *************** *** 97,109 **** return ret < 0? ret : client_run(fd, fd, -1, argc, argv); } ! int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) { int i; char *sargs[MAX_ARGS]; int sargc = 0; char line[MAXPATHLEN]; char *p; if (argc == 0 && !am_sender) list_only = 1; --- 99,121 ---- return ret < 0? ret : client_run(fd, fd, -1, argc, argv); } ! /* start_inband_exchange() contains an un...

As I reported a while back rsync doesn't handle metadata (permissions and ownership) in dryrun mode. I offered to make a patch and that offer still stands. I didn't have the time for it until now and want to pick it up again. I had some ugly hack back then but I want to redo it in a clean way. I would like some input on my thoughts. IMHO, it would be ideally if the check for dry_run

...code=62, buf=0x591d8 "\a\020", len=62) at io.c:498 #4 0x24f24 in io_flush () at io.c:518 #5 0x24940 in readfd (fd=0, buffer=0xffbe7020 "?\002r\215?/\201R", N=4) at io.c:314 #6 0x24998 in read_int (f=0) at io.c:329 #7 0x199a4 in send_files (flist=0x574e8, f_out=1, f_in=0) at sender.c:110 #8 0x1d1e8 in do_server_sender (f_in=0, f_out=1, argc=1, argv=0x56f74) at main.c:300 #9 0x1d708 in start_server (f_in=0, f_out=1, argc=2, argv=0x56f70) at main.c:476 #10 0x1e08c in main (argc=2, argv=0x56f70) at main.c:838 Backtrace #1 on client (the...

...io.c:1144 #5 0x0000000000425b20 in read_ndx (f=5) at io.c:1749 #6 0x000000000040a957 in read_ndx_and_attrs (f_in=5, iflag_ptr=0x7fff1d3afe38, type_ptr=0x7fff1d3afe3f "", buf=0x7fff1d3add50 "", len_ptr=0x7fff1d3afe34) at rsync.c:218 #7 0x00000000004125ea in send_files (f_in=5, f_out=4) at sender.c:193 #8 0x00000000004194f7 in client_run (f_in=5, f_out=4, pid=3713, argc=1, argv=0x66f240) at main.c:1045 #9 0x000000000041a550 in main (argc=2, argv=0x66f240) at main.c:1304 Strace says: select(6, [5], [], NULL, {49, 420000} <unfinished ...> # gdb -p 3713 (gdb) bt #0 0x0...

...x7fff5fbfdee0 "", len=4) at io.c:1012 #3 0x000000010002ffae in readfd (fd=3, buffer=0x7fff5fbfdee0 "", N=4) at io.c:1157 #4 0x000000010002da8c in read_msg_fd () at io.c:338 #5 0x000000010002e7b4 in wait_for_receiver () at io.c:540 #6 0x00000001000132f8 in generate_files (f_out=4, local_name=0x0) at generator.c:2290 #7 0x0000000100020f48 in do_recv (f_in=5, f_out=4, local_name=0x0) at main.c:833 #8 0x000000010002179f in client_run (f_in=5, f_out=4, pid=64758, argc=1, argv=0x100100398) at main.c:1070 #9 0x00000001000220ff in start_client (argc=1, argv=0x100100398)...

...code=FLOG, format=<value optimized out>, op=0x45170a "recv", file=0x7f976a8cb360, fname=0x0, iflags=40960, hlink=0x0) at log.c:769 #5 0x0000000000422eaa in log_item (code=FINFO, file=0x7f976a8cb360, iflags=40960, hlink=0x0) at log.c:806 #6 0x0000000000413966 in recv_files (f_in=3, f_out=7, local_name=0x0) at receiver.c:852 #7 0x000000000041d3dc in do_recv (f_in=3, f_out=7, local_name=0x0) at main.c:901 #8 0x000000000041dbbd in do_server_recv (f_in=3, f_out=3, argc=<value optimized out>, argv=<value optimized out>) at main.c:1070 #9 start_server (f_in=3, f_out=3, arg...

The attached patch adds some whitespace to the recv_files() function declaration, and renames variable 'f' to 'f_out' in generate_files(). -------------- next part -------------- Index: generator.c =================================================================== RCS file: /cvsroot/rsync/generator.c,v retrieving revision 1.93 diff -b -c -r1.93 generator.c *** generator.c 30 Jun 2004 07:27:30 -0000 1.93 ---...

...th> gdb back trace: #0 0x080ad49c in check_prior (file=0x8297f7c, gnum=0, prev_ndx_p=0x80449a0, flist_p=0x80449a4) at hlink.c:268 #1 0x080ae0f3 in skip_hard_link (file=0x8297f7c, flist_p=0x81bf8b4) at hlink.c:549 #2 0x080c6a14 in handle_skipped_hlink (file=0x8297f7c, itemizing=1, code=FLOG, f_out=1) at generator.c:2015 #3 0x080c4b68 in recv_generator ( fname=0x8045900 "<path to directory>", file=0x8297f7c, ndx=647, itemizing=1, code=FLOG, f_out=1) at generator.c:1400 #4 0x080c761f in generate_files (f_out=1, local_name=0x0) at generator.c:2262 #5 0x0809fa50 in do...

...ead_a_msg () at io.c:1423 #4 0x00007f87d88e0676 in read_buf (f=f at entry=4, buf=buf at entry=0x7ffd814c0df0 "\300\037L\201\375\177", len=len at entry=1) at io.c:1835 #5 0x00007f87d88e157b in read_ndx (f=f at entry=4) at io.c:2222 #6 0x00007f87d88be377 in read_ndx_and_attrs (f_in=4, f_out=6, iflag_ptr=0x7ffd814c0f28, type_ptr=0x7ffd814c0f27 "\200\b", buf=0x7ffd814c1fc0 "", len_ptr=0x7ffd814c0f2c) at rsync.c:320 #7 0x00007f87d88c5b5e in recv_files (f_in=5, f_out=-2125728480, local_name=0x7ffd814c0fc0 "some_dbase") at receiver.c:548 #8 0x00007f8...

https://bugzilla.samba.org/show_bug.cgi?id=5701 Summary: deadlock on local rsyncing, bisected to commit f303b749f2843433c9acd8218a4b9096d0d1bb8d Product: rsync Version: 3.1.0 Platform: All OS/Version: Linux Status: NEW Severity: major Priority: P3 Component: core AssignedTo:

...into an infinite loop in generator.c:sum_sizes_sqroot The code at fault seems to be: for (l = len; l >>= 1; b += 2) {} Here's the stack: #0 0x00402ae3 in sum_sizes_sqroot (sum=0x8bf530, len=-2073107852) at generator.c:455 #1 0x00402c56 in generate_and_send_sums (fd=5, len=-2073107852, f_out=4, f_copy=-1) at generator.c:490 #2 0x00405035 in recv_generator (fname=0x8bfc40 "gf_profile_file.MYD", file=0x1788f8, ndx=517, itemizing=1, maybe_ATTRS_REPORT=1, code=FLOG, f_out=4) at generator.c:1338 #3 0x00405400 in generate_files (f_out=4, flist=0x144ac0, local_name=0x0) at genera...