search for: log_transf

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

....c 7 Dec 2001 02:16:04 -0000 @@ -36,6 +36,7 @@ extern char *compare_dest; extern int make_backups; extern char *backup_suffix; +extern int write_batch; static struct delete_list { dev_t dev; @@ -357,6 +358,12 @@ if (!am_server) { log_transfer(file, fname); } + continue; + } + + if (write_batch) { + /* drain */ + receive_data(f_in,NULL,-1,NULL,file->length); continue; } -- J...

Hi, I'd like to extend rsync's --log-format to be more detailed and ultimately work in --dry-run mode. While i need both of these enhancements, i would rather not maintain such mods over time for our local use, so before i work on this, i'd like to hear back that this is indeed desirable/desired, as well as any advice, suggestion or feedback you may have in the hope to see this

...ct file_list cleanup_set(fnametmp, fname, file, buf, fd1, fd2); + if (apt_support) { + rprintf(FINFO,"Tmp-Filename: %s\n",fnametmp); + rprintf(FINFO,"Size: %u\n",file->length); + rprintf(FINFO,"Start: %s\n",fname); + } + if (!am_server) { log_transfer(file, fname); } @@ -475,6 +482,8 @@ int recv_files(int f_in,struct file_list rprintf(FINFO,"redoing %s(%d)\n",fname,i); write_int(f_gen,i); } + } else if (apt_support) { + rprintf(FINFO,"Done: %s\n",fname); } }

Sorry about that ./configure --with-included-popt But then 200+ plus lines of warnings :( I'll read some more -pete

Hi, Ever since after 2.5.1, rsync is no longer compiling cleanly, or make testing correctly : gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c log.c -o log.o log.c: In function `log_transfer': log.c:574: warning: unused parameter `file' gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c options.c -o options.o options.c:273: warning: missing initializer for `long_options[0].descrip' options.c:274: warning: missing initializer for `long_options[1].val' options.c:...

...cksum.c -o checksum.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c match.c -o match.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c syscall.c -o syscall.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c log.c -o log.o log.c: In function `log_transfer': log.c:574: warning: unused parameter `file' gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c backup.c -o backup.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c options.c -o options.o options.c:365: `POPT_ARG_VAL' undeclared here (not in a funct...

...+ compare_file = fnamecmpbuf; + } + + if ((fd1 == -1) && (compare_file != NULL)) { + /*try this file instead (--compare-dest, --compare-file, --compare-auto)*/ + fnamecmp = compare_file; fd1 = do_open(fnamecmp, O_RDONLY, 0); } @@ -446,6 +455,8 @@ if (!am_server) { log_transfer(file, fname); + if (compare_auto && (verbose > 1)) + rprintf(FINFO,"(compare-file %s)\n",fnamecmp); } /* recv file data */ diff -aur rsync-2.5.6/rsync.1 rsync-arh/rsync.1 --- rsync-2.5.6/rsync.1 Tue Jan 28 03:11:57 2003 +++ rsync-arh/rsync.1 Fri Oct 17 10:42:54 2...

...TER_ARGS; + p = strtok(0, sep)) { + filter_argv[i++] = p; + } + filter_argv[i] = 0; + if (p) { + rprintf(FERROR,"Too many arguments to dest-filter (> %d)\n", i); + exit_cleanup(RERR_SYNTAX); + } + } + while (1) { cleanup_disable(); @@ -448,16 +469,34 @@ log_transfer(file, fname); } + if (dest_filter) { + pid = run_filter(filter_argv, fd2, &fd2); + } + /* recv file data */ recv_ok = receive_data(f_in,buf,fd2,fname,file->length); + if (dest_filter) { + close(fd2); + wait_process(pid, &status); + if (status != 0) { + rprint...

...NFIG_H -Wall -W -I./popt -c checksum.c -o checksum.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c match.c -o match.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c syscall.c -o syscall.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c log.c -o log.o log.c: In function `log_transfer': log.c:570: warning: unused parameter `file' gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c backup.c -o backup.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c options.c -o options.o options.c:271: warning: missing initializer options.c:271: warning: (near initializati...

...file' gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -c checksum.c -o checksum.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -c match.c -o match.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -c syscall.c -o syscall.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -c log.c -o log.o log.c: In function `log_transfer': log.c:574: warning: unused parameter `file' gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -c backup.c -o backup.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -c options.c -o options.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -c flist.c -o flist.o flist.c: In function `receive_file_entr...

I've added the: /etc/services /etc/inetd entries as well as /etc/rsync.conf with the contents: [io] path = //Volumes/Mac_OS_X/Library/WebServer/iolanguage.com/Io comment = iolanguage source code But I get this error: % rsync -rvR --progress localhost:/ . localhost.dekorte.com: Connection refused rsync: connection unexpectedly closed (0 bytes read so far) rsync error:

...h.c:220: warning: signed and unsigned type in conditional expression match.c:250: warning: comparison between signed and unsigned gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c syscall.c -o syscall.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c log.c -o log.o log.c: In function `log_transfer': log.c:574: warning: unused parameter `file' gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c backup.c -o backup.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c options.c -o options.o In file included from options.c:22: popt/popt.h:117: warning: type qualifiers ignored o...

...CONFIG_H -Wall -W -I./popt -c checksum.c -o checksum.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c match.c -o match.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c syscall.c -o syscall.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c log.c -o log.o log.c: In function `log_transfer': log.c:570: warning: unused parameter `file' gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c backup.c -o backup.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c options.c -o options.o In file included from options.c:22: popt/popt.h:117: warning: type qualifiers ignored o...

...CONFIG_H -Wall -W -I./popt -c checksum.c -o checksum.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c match.c -o match.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c syscall.c -o syscall.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c log.c -o log.o log.c: In function `log_transfer': log.c:574: warning: unused parameter `file' gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c backup.c -o backup.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c options.c -o options.o options.c:273: warning: missing initializer options.c:273: warning: (near initializatio...

...mat, size_t arg (arg 3) match.c:162: warning: int format, size_t arg (arg 3) match.c:162: warning: int format, size_t arg (arg 5) gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c syscall.c -o syscall.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c log.c -o log.o log.c: In function `log_transfer': log.c:574: warning: unused parameter `file' gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c backup.c -o backup.o gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c options.c -o options.o In file included from options.c:22: ./popt/popt.h:117: warning: type qualifiers ignored...

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

...will be called at the end where the client was run - - it i called when a file starts to be transferred -*/ +/* + * Log the incoming transfer of a file for interactive use, + * this will be called at the end where the client was run. + * Called when a file starts to be transferred. + */ void log_transfer(struct file_struct *file, const char *fname) { extern int verbose; if (!verbose) return; - rprintf(FINFO,"%s\n", fname); + rprintf(FINFO, "%s\n", fname); } - Index: main.c =================================================================== RCS file: /cvsroot/rsync/ma...