search for: backup_dir_len

https://bugzilla.samba.org/show_bug.cgi?id=7869 Summary: rsync segfault Product: rsync Version: 3.0.7 Platform: x64 OS/Version: Linux Status: NEW Severity: minor Priority: P3 Component: core AssignedTo: wayned at samba.org ReportedBy: rafa.silva at gmail.com QAContact: rsync-qa at

Dear All, I have been seeing some strange behavior using rsync 3.1.1 on OSX with the 3 standard patches applied when using the --backup and --backup-Dir options. This works as expected on 3.0.9, moving any files on dest that are not on source to the backup folder. If no changes then the backup folder is not even created. -aHAXN --fileflags --force-change --protect-decmpfs ?delete --backup

...aking screwy directories. This is my diff, assuming one runs fileflags, crtimes, and hfs_compression diffs first for OSX and rsync 3.1.1. Rob diff --git a/backup.c b/backup.c --- a/backup.c +++ b/--- a/backup.c @@ -65,6 +65,9 @@ BOOL ret = True; stat_x sx; char *b, *rel = backup_dir_buf + backup_dir_len, *name = rel; + + if (x_lstat(fname, &sx.st, NULL) < 0) + return 1; for (f = fname, b = rel; *f && *f == *b; f++, b++) { if (*b == '/') @@ -215,17 +218,18 @@ stat_x sx; struct file_struct *file; int save_preserve_xattrs; - char *buf = get_backup_name(fnam...

...m 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 && file->link_u.links -...

...en.org http://www.paken.org/ =================================================================== diff -ur rsync/backup.c rsync-backuponly/backup.c --- rsync/backup.c 2003-08-22 09:30:46.000000000 +0900 +++ rsync-backuponly/backup.c 2003-09-02 15:29:03.000000000 +0900 @@ -25,6 +25,7 @@ extern int backup_dir_len; extern char *backup_suffix; extern char *backup_dir; +extern int backup_only; extern int am_root; extern int preserve_devices; @@ -133,21 +134,26 @@ int keep_trying = 4; int keep_path_extfs = 0; int failed; + int saveerrno; while (keep_trying) { - if (keep_path_extfs) { + if (kee...

...e: /cvsroot/rsync/options.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;...

...Index: rsync-2.6.3/options.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=...

...ib/inftrees.o zlib/infutil.o zlib/trees.o \ zlib/zutil.o zlib/adler32.o diff -rupNP --exclude-from cvs/.ignore cvs/backup.c pool2/backup.c --- cvs/backup.c Wed Feb 4 03:49:36 2004 +++ pool2/backup.c Wed Feb 4 22:11:26 2004 @@ -189,6 +189,7 @@ static int keep_backup(char *fname) backup_dir[--backup_dir_len] = '\0'; if (verbose > 0) rprintf(FINFO, "backup_dir is %s\n", backup_dir); + initialised = 1; } @@ -199,7 +200,7 @@ static int keep_backup(char *fname) if (do_stat(fname, &st)) return 1; #endif - file = make_file(fname, NO_EXCLUDES); + file = make_file(f...

...ported proto.h(224): remark #310: old-style parameter list (anachronism) void setup_iconv(); ^ backup.c(24): remark #1419: external declaration in primary source file extern int verbose; ^ backup.c(25): remark #1419: external declaration in primary source file extern int backup_dir_len; ^ backup.c(26): remark #1419: external declaration in primary source file extern unsigned int backup_dir_remainder; ^ backup.c(27): remark #1419: external declaration in primary source file extern char backup_dir_buf[MAXPATHLEN]; ^ backup.c(2...