search for: backup_suffix_len

With this patch (see URL), backup-dir is passed to the server. It's not currently ignored on the other end if irrelevant (which it is for senders). Either we should not pass it, or let the sender ignore it later on. http://cvs.samba.org/cgi-bin/cvsweb/rsync/options.c.diff?r1=1.109&r2=1.110&f=h Either we should not pass it, or tell a sender to ignore it later on. Happy to whip

.../delete.c +++ b/delete.c -@@ -25,6 +25,7 @@ +@@ -23,6 +23,7 @@ + #include "rsync.h" + extern int am_root; ++extern int detect_renamed; extern int make_backups; extern int max_delete; -+extern int detect_renamed; - extern char *backup_dir; - extern char *backup_suffix; - extern int backup_suffix_len; -@@ -44,6 +45,8 @@ static inline int is_backup_file(char *fn) + extern int force_change; +@@ -45,6 +46,8 @@ * its contents, otherwise just checks for content. Returns DR_SUCCESS or * DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The * buffer is used for recursion, b...

I'm having an issue with the --suffix and -b flags - I've tried the following commands: rsync -avbr --backup-dir=/rsyncbackup rsynctest user@server.com::module rsync -avbr --backup-dir=/rsyncbackup --suffix="" rsynctest user@server.com::module and either way, I wind up with a tilde as a suffix on all the files moved into the backup directory at time of synchronization.

...----------------------------- *** work/rsync-3.0.7/generator.c.orig 2009-12-23 21:36:27.000000000 +0200 --- work/rsync-3.0.7/generator.c 2010-07-09 15:36:01.000000000 +0300 *************** *** 96,101 **** --- 96,102 ---- extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; + extern long check_point; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct filter_list_struct daemon_filter_list; *************** *** 132,138 **** }; enum delret { ! DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY }; /* Forward declarations. */...

...ded a flag to mark the last item in the original list (so we know when to give up our search and just ask for the file to be created). ..wayne.. -------------- next part -------------- --- backup.c 20 Jan 2004 05:24:07 -0000 1.19 +++ backup.c 25 Jan 2004 09:54:32 -0000 @@ -25,6 +25,7 @@ extern int backup_suffix_len; extern int backup_dir_len; extern char *backup_suffix; extern char *backup_dir; +extern struct file_struct **hlink_list; extern int am_root; extern int preserve_devices; @@ -263,7 +264,7 @@ static int keep_backup(char *fname) } #endif if (!kept && preserve_hard_links &&...

...version that doesn't know this diff -ur rsync/receiver.c rsync-backuponly/receiver.c --- rsync/receiver.c 2003-09-05 14:53:55.000000000 +0900 +++ rsync-backuponly/receiver.c 2003-09-05 15:06:37.000000000 +0900 @@ -39,6 +39,7 @@ extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; +extern int backup_only; static struct delete_list { DEV64_T dev; @@ -159,13 +160,14 @@ char *f = f_name(local_file_list->files[i]); if (make_backups && (backup_dir || !is_backup_file(f))) { (void) make_backup(f); - if (verbose) + if (verbose && !bac...

..._out, int f_in); int try_bind_local(int s, int ai_family, int ai_socktype, const char *bind_address); Index: receiver.c --- receiver.c 15 Jan 2004 07:42:25 -0000 1.63 +++ receiver.c 17 Jan 2004 05:04:55 -0000 @@ -39,6 +39,7 @@ extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; extern int cleanup_got_literal; +extern int delete_sent_files; static void delete_one(char *fn, int is_dir) { @@ -287,7 +288,7 @@ int recv_files(int f_in,struct file_list char *fname, fbuf[MAXPATHLEN]; char template[MAXPATHLEN]; char fnametmp[MAXPATHLEN]; - char *fnamecmp; + char *fname...

...c,v retrieving revision 1.157 diff -c -b -d -r1.157 options.c *** options.c 20 Jun 2004 19:47:05 -0000 1.157 --- options.c 12 Jul 2004 00:37:50 -0000 *************** *** 111,116 **** --- 111,117 ---- int write_batch = 0; int read_batch = 0; + int batch_fd = 0; int backup_dir_len = 0; int backup_suffix_len; unsigned int backup_dir_remainder; *************** *** 638,643 **** --- 639,654 ---- } #endif + if ((write_batch || read_batch) && am_server) { + rprintf(FERROR, + "batch-mode is incompatible with server mode\n"); + write_batch = 0; + read_batch = 0; + /* We...

...s.c =================================================================== --- rsync-2.6.3.orig/options.c 2005-03-18 17:19:30.%N -0800 +++ rsync-2.6.3/options.c 2005-03-19 12:45:22.%N -0800 @@ -113,6 +113,7 @@ int write_batch = 0; int read_batch = 0; +int offline = 0; int backup_dir_len = 0; int backup_suffix_len; unsigned int backup_dir_remainder; @@ -304,6 +305,7 @@ rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); rprintf(F," --write-batch=FILE write a batch to FILE\n"); rprintf(F," --read-batch=FILE read a batch from...

...external declaration in primary source file extern char *backup_dir; ^ generator.c(91): remark #1419: external declaration in primary source file extern char *backup_suffix; ^ generator.c(92): remark #1419: external declaration in primary source file extern int backup_suffix_len; ^ generator.c(93): remark #1419: external declaration in primary source file extern struct file_list *the_file_list; ^ generator.c(94): remark #1419: external declaration in primary source file extern struct filter_list_struct server_filter_list;...