search for: basis_dir

Hi NG, I want to do incremental backups to a remote server running rsyncd (because daemonless transfer via ssh often hangs!). In contrast to transfer via ssh (without remote rsyncd) this doesn't seem possible, or do I miss something? Imagine I want to incrementally backup `mydir' to the backup space `backup' on e remote server `alpha' running an rsync daemon. rsyncd on

...e restore scenario, I am not concerned with preserving multiple snapshots, so I should be able to operate on one tree. Any time the batch file says to link from somewhere else, just use the existing file. When I tried simply leaving off the --link-dest option, rsync complained about "invalid basis_dir index". So I found this code, and instead copied the common case where the file to work on is the destination file: --- receiver.c.orig 2010-04-14 00:30:45.000000000 +0000 +++ receiver.c 2010-04-14 00:31:16.000000000 +0000 @@ -654,10 +654,8 @@ break;...

...for example. Please be aware that the patch is untested. Florian diff --git a/generator.c b/generator.c index a112da6..2df1b28 100644 --- a/generator.c +++ b/generator.c @@ -876,26 +876,22 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode)) continue; - switch (match_level) { - case 0: + if (match_level < 1) { best_match = j; match_level = 1; - /* FALL THROUGH */ - case 1: - if (!unchanged_file(cmpbuf, file, &sxp-...

https://bugzilla.samba.org/show_bug.cgi?id=12036 Bug ID: 12036 Summary: Multiple --link-dest, --copy-dest, or --compare-dest flags produce incorrect behavior Product: rsync Version: 3.1.2 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component:

...+ if (check_filter(elp, tmpdir, 1) == M_EXCLUDE) goto options_rejected; } if (partial_dir) { clean_fname(partial_dir, 1); - if (check_filter(elp, partial_dir, 1) < 0) + if (check_filter(elp, partial_dir, 1) == M_EXCLUDE) goto options_rejected; } for (i = 0; i < basis_dir_cnt; i++) { clean_fname(basis_dir[i], 1); - if (check_filter(elp, basis_dir[i], 1) < 0) + if (check_filter(elp, basis_dir[i], 1) == M_EXCLUDE) goto options_rejected; } if (backup_dir) { clean_fname(backup_dir, 1); - if (check_filter(elp, backup_dir, 1) < 0) + if (ch...

...ink (or not a symlink), so - * delete it. */ + /* Not not a symlink, so delete it. */ if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_SYMLINK) != 0) goto cleanup; } else if (basis_dir[0] != NULL) { -- Configure bugmail: https://bugzilla.samba.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug, or are watching the QA contact.

...l_ret == 0) get_acl(fname, &real_sx); Presumably real_ret is zero if and only if the destination file actually exists. However, back in lines 1210-1226, the generator sets real_ret to 0 if a basis file is found, even though the destination file does not exist: if (statret != 0 && basis_dir[0] != NULL) { int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx, itemizing, maybe_ATTRS_REPORT, code); if (j == -2) { if (remove_source_files == 1) goto return_with_success; goto cleanup; } if (j >= 0) { fnamecmp = fnamecmpbuf; fnamecmp_type = j; s...

https://bugzilla.samba.org/show_bug.cgi?id=4080 Summary: rsync can't find basis dirs with -n and nonexistent destination Product: rsync Version: 2.6.9 Platform: All OS/Version: All Status: NEW Severity: normal Priority: P3 Component: core AssignedTo: wayned@samba.org

...SUPPORT_HARD_LINKS @@ -1619,7 +1641,9 @@ if (remove_source_files == 1) goto return_with_success; goto cleanup; - } + } else + iflags = ITEM_REPORT_CHANGE; + recreate_D: if (delete_item(fname, sx.st.st_mode, del_opts | del_for_flag) != 0) goto cleanup; } else if (basis_dir[0] != NULL) { @@ -1656,9 +1680,9 @@ set_file_attrs(fname, file, NULL, NULL, 0); if (itemizing) { itemize(fname, file, ndx, statret, &sx, - ITEM_LOCAL_CHANGE|ITEM_REPORT_CHANGE, 0, NULL); + ITEM_LOCAL_CHANGE|iflags, 0, NULL); } - if (code != FNONE && verbose) +...

...file for --log-after */ + if (log_after_transfer) + logfile_name = logafter_name; + recv_files(f_in, f_out, local_name); io_flush(FULL_FLUSH); handle_stats(f_in); diff --git a/options.c b/options.c index fd674754..4ab83650 100644 --- a/options.c +++ b/options.c @@ -176,7 +176,9 @@ char *basis_dir[MAX_BASIS_DIRS+1]; char *config_file = NULL; char *shell_cmd = NULL; char *logfile_name = NULL; +char *logafter_name = NULL; char *logfile_format = NULL; +char *logafter_format = NULL; char *stdout_format = NULL; char *password_file = NULL; char *early_input_file = NULL; @@ -205,6 +207,7 @@...

...: external declaration in primary source file extern int checksum_len; ^ generator.c(74): remark #1419: external declaration in primary source file extern char *partial_dir; ^ generator.c(75): remark #1419: external declaration in primary source file extern char *basis_dir[]; ^ generator.c(76): remark #1419: external declaration in primary source file extern int compare_dest; ^ generator.c(77): remark #1419: external declaration in primary source file extern int copy_dest; ^ generator.c(78): remark #1419: external decla...

...serve_xattrs; extern int preserve_links; extern int preserve_devices; +extern int copy_devices; extern int preserve_specials; extern int preserve_hard_links; extern int preserve_executability; @@ -980,7 +981,7 @@ static int try_dests_reg(struct file_str do { pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); - if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode)) + if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !(S_ISREG(sxp->st.st_mode) || (copy_devices && IS_DEVICE(sxp->st.st_mode)))) continue; switch (match_level) { case 0: @@ -1...