search for: bytes_to_writ

...t_file(buff, int_str_len); buff[int_str_len] = '\0'; - file[0].sum = strdup(buff); + file[0].sum = (unsigned char *)strdup(buff); } else { file[0].sum = NULL; } } -void write_batch_csums_file(char *buff, int bytes_to_write) +void write_batch_csums_file(const void *buff, int bytes_to_write) { static int fdb_open = 1; @@ -377,7 +378,7 @@ } } -void close_batch_csums_file() +void close_batch_csums_file(void) { close(fdb); @@ -394,12 +395,12 @@ /* Write csum info to batch fil...

...sync_csums_file[] = ".rsync_csums"; +static char rsync_delta_file[] = ".rsync_delta"; +static char rsync_argvs_file[] = ".rsync_argvs"; + +static int fdb; +static int fdb_delta; +static int fdb_open; +static int fdb_close; void write_batch_flist_file(char *buff, int bytes_to_write) { + char filename[MAXPATHLEN]; if (fdb_open) { /* Set up file extension */ - strcat(rsync_flist_file, batch_file_ext); + strlcpy(filename, batch_prefix, sizeof(filename)); + strlcat(filename, rsync_flist_file, sizeof(filename)); - /* Open batch flist file for writing; create it if i...

...frame[j] = data_as_floats [j+offset]; } // this enoced the data speex_encode( encoder_state, frame , bits ); // increase the offset offset+=FRAME_SIZE; } //speex_encode( encoder_state, frame , bits ); /// write teh stream out. int bytes_to_write = speex_bits_nbytes( bits ); /// transform from float to char* to write. The termination code is acutomatically added to teh end of the stream. bytes_written = speex_bits_write( bits, destinantion_buffer, bytes_to_write ); /// return the amount of data writtne. printf( "bytes...

...ile((char *) &file_sum1, + read_batch_csums_file( &file_sum1, sizeof(uint32)); read_batch_csums_file(file_sum2, csum_length); @@ -498,7 +499,7 @@ } -void write_batch_delta_file(char *buff, int bytes_to_write) +void write_batch_delta_file(const void *buff, int bytes_to_write) { static int fdb_delta_open = 1; @@ -528,13 +529,13 @@ exit_cleanup(1); } } -void close_batch_delta_file() +void close_batch_delta_file(void) { close(fdb_delta); } -int read_b...

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

...ar *allow_list, char *deny_list); char *auth_server(int fd, int module, char *addr, char *leader); void auth_client(int fd, char *user, char *challenge); +int make_backup(char *fname); void create_batch_file_ext(); void set_batch_file_ext(char *ext); void write_batch_flist_file(char *buff, int bytes_to_write); @@ -23,7 +24,6 @@ void close_batch_delta_file(); int read_batch_delta_file(char *buff, int len); void show_flist(int index, struct file_struct **fptr); void show_argvs(int argc, char *argv[]); -int make_backup(char *fname); uint32 get_checksum1(char *buf1,int len); void get_checksum2(char *...

...0) + return; write_batch_csums_file(flist_entry, sizeof (int)); int_count = s ? (int) s->count : 0; write_batch_csums_file(&int_count, sizeof int_count); *************** *** 285,290 **** --- 288,296 ---- } } + if (buff == NULL) + return; + if (write(f_delta, buff, bytes_to_write) < 0) { rsyserr(FERROR, errno, "Batch file %s write error", filename); close(f_delta); Index: compat.c =================================================================== RCS file: /cvsroot/rsync/compat.c,v retrieving revision 1.22 diff -c -b -d -r1.22 compat.c Index: flist.c...

...************** *** 180,185 **** --- 181,187 ---- **/ void write_batch_csum_info(int *flist_entry, struct sum_struct *s) { + return; size_t i; int int_count; char filename[MAXPATHLEN]; *************** *** 270,275 **** --- 272,278 ---- void write_batch_delta_file(char *buff, int bytes_to_write) { + return; char filename[MAXPATHLEN]; if (f_delta < 0) { Index: clientserver.c =================================================================== RCS file: /cvsroot/rsync/clientserver.c,v retrieving revision 1.127 diff -c -b -d -r1.127 clientserver.c *** clientserver.c 13 Jun 200...