search for: batch_flist

...char rsync_csums_file[27] = "rsync_csums."; -char rsync_delta_file[27] = "rsync_delta."; -char rsync_argvs_file[27] = "rsync_argvs."; - -char batch_file_ext[15]; - -int fdb; -int fdb_delta; -int fdb_open; -int fdb_close; +extern char *batch_prefix; struct file_list *batch_flist; -void create_batch_file_ext() -{ - struct tm *timeptr; - time_t elapsed_seconds; - - /* Save run date and time to use for batch file extensions */ - time(&elapsed_seconds); - timeptr = localtime(&elapsed_seconds); - - sprintf(batch_file_ext, "%4d%02d%02d%02d%02d%02d", - timept...

...ff -E -B -c -r rsync-2.5.6/main.c rsync-2.5.6-remotebatch/main.c *** rsync-2.5.6/main.c Tue Jan 28 05:05:53 2003 --- rsync-2.5.6-remotebatch/main.c Wed Jul 23 15:55:18 2003 *************** *** 263,270 **** } if (local_server) { - if (read_batch) - create_flist_from_batch(); /* sets batch_flist */ ret = local_child(argc, args, f_in, f_out, child_main); } else { ret = piped_child(args,f_in,f_out); --- 263,268 ---- *************** *** 505,515 **** if (delete_mode && !delete_excluded) recv_exclude_list(f_in); ! ! if (read_batch) ! flist = batch_flist; ! e...

...FO, "keep_backup %s -> %s\n", fname, keep_name); diff -rupNP --exclude-from cvs/.ignore cvs/batch.c pool2/batch.c --- cvs/batch.c Thu Feb 5 20:47:31 2004 +++ pool2/batch.c Thu Feb 5 20:51:14 2004 @@ -136,9 +136,7 @@ struct file_list *create_flist_from_batc exit_cleanup(1); } - batch_flist = new(struct file_list); - if (!batch_flist) - out_of_memory("create_flist_from_batch"); + batch_flist = flist_new(WITH_HLINK, "create_flist_from_batch"); save_read = stats.total_read; save_pv = protocol_version; @@ -153,9 +151,9 @@ struct file_list *create_flist_from_bat...

...Jan 5 13:27:01 2002 +++ lcl_src:batch.c Sat Jan 12 21:21:52 2002 @@ -1,3 +1,4 @@ +/* Converted by prj_src:unix_c_to_vms_c.tpu AND PRJ_SRC:BATCH.TPU on 12-JAN-2002 21:21:52.41 OPENVMS_AXP */ /* -*- c-file-style: "linux" -*- Weiss 1/1999 @@ -22,7 +23,7 @@ struct file_list *batch_flist; -void create_batch_file_ext() +void create_batch_file_ext(void) { struct tm *timeptr; time_t elapsed_seconds; @@ -103,7 +104,7 @@ if (i == flist_count - 1) { fdb_close = 1; } - write_char_bufs(fptr[i]-&gt...

...================================================================= RCS file: /cvsroot/rsync/batch.c,v retrieving revision 1.32 diff -c -b -d -r1.32 batch.c *** batch.c 15 May 2004 19:31:10 -0000 1.32 --- batch.c 12 Jul 2004 00:37:45 -0000 *************** *** 25,30 **** --- 25,31 ---- void write_batch_flist_info(int flist_count, struct file_struct **files) { + return; char filename[MAXPATHLEN]; int i, f, save_pv; int64 save_written; *************** *** 180,185 **** --- 181,187 ---- **/ void write_batch_csum_info(int *flist_entry, struct sum_struct *s) { + return; size_t i; in...

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

...name), NS(flist->files[i]->basename), (int) flist->files[i]->mode, --- main.c 27 Jan 2004 08:05:10 -0000 1.185 +++ main.c 27 Jan 2004 07:59:07 -0000 @@ -56,6 +56,8 @@ extern char *remote_filesfrom_file; extern char *rsync_path; extern char *shell_cmd; extern struct file_list *batch_flist; +extern char *who_am_i; + /* there's probably never more than at most 2 outstanding child processes, * but set it higher just in case. @@ -198,7 +200,7 @@ static void show_malloc_stats(void) getpid(), am_server ? "server " : "", am_daemon ? "daemon "...

...t Feb 9 21:17:28 2002 +++ lcl_src:batch.c Sat Feb 9 23:09:27 2002 @@ -1,3 +1,4 @@ +/* Converted by prj_src:unix_c_to_vms_c.tpu AND PRJ_SRC:BATCH.TPU on 9-FEB-2002 23:09:26.95 OPENVMS_AXP */ /* -*- c-file-style: "linux" -*- Weiss 1/1999 @@ -22,7 +23,7 @@ struct file_list *batch_flist; -void create_batch_file_ext() +void create_batch_file_ext(void) { struct tm *timeptr; time_t elapsed_seconds; @@ -108,7 +109,7 @@ if (i == flist_count - 1) { fdb_close = 1; } - write_char_bufs(fptr[i]-&gt...

...ING(lp_name, name) FN_LOCAL_STRING(lp_comment, comment) diff --unified -r rsync-2.6.2/main.c rsync-dmn/main.c --- rsync-2.6.2/main.c Mon Feb 9 22:54:47 2004 +++ rsync-dmn/main.c Tue Sep 28 12:58:28 2004 @@ -57,6 +57,7 @@ extern char *rsync_path; extern char *shell_cmd; extern struct file_list *batch_flist; +extern char* config_file; /* there's probably never more than at most 2 outstanding child processes, @@ -1000,6 +1001,14 @@ * code here, rather than relying on getopt. */ option_error(); exit_cleanup(RERR_SYNTAX); + } + + if (!lp_load(config_file, 1)) { + exit_cleanup(RERR_SYN...

...C); /* XXX Need better RERR? */ } args[argc] = NULL; if (verbose > 3) { rprintf(FINFO,"cmd="); for (i=0;i<argc;i++) rprintf(FINFO,"%s ",args[i]); rprintf(FINFO,"\n"); } if (local_server) { if (read_batch) create_flist_from_batch(); /* sets batch_flist */ ret = local_child(argc, args, f_in, f_out, child_main); } else { ret = piped_child(args,f_in,f_out); } if (dir) free(dir); return ret; oom: out_of_memory("do_cmd"); return 0; /* not reached */ } -------------------------------------------------------------------------- -...

...amp;initial_stats); --- rsync-2.5.6.org/batch.c Tue Dec 24 08:42:04 2002 +++ rsync-2.5.6/batch.c Fri Feb 21 16:45:47 2003 @@ -8,6 +8,10 @@ #include "rsync.h" #include <time.h> +#ifndef S_IEXEC +# define S_IEXEC 0x040 +#endif + extern char *batch_prefix; struct file_list *batch_flist; -------------- next part -------------- POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin=`pwd`/rsync srcdir="." ./runtests.sh ============================================================ ./runtests.sh running in /boot/home/devel/rsync-2.5.6 rsync_bin=/boot/home/devel/rsync-2.5.6/rsync s...

...9 @@ struct file_list *send_file_list(int f, start_write = stats.total_written; + if (!am_server) + init_fname_convert(); + flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK, "send_file_list"); @@ -1217,6 +1227,9 @@ struct file_list *send_file_list(int f, write_batch_flist_info(flist->count, flist->files); } + if (!am_server) + cleanup_fname_convert(); + if (verbose > 3) output_flist(flist); @@ -1239,6 +1252,9 @@ struct file_list *recv_file_list(int f) start_read = stats.total_read; + if (!am_server) + init_fname_convert(); + flist = fli...