search for: one_file_system

...---- next part -------------- --- rsync-2.6.0/flist.c.orig 2003-12-15 09:10:31.000000000 +0100 +++ rsync-2.6.0/flist.c 2004-02-02 10:35:06.000000000 +0100 @@ -618,32 +618,6 @@ static void receive_file_entry(struct fi } -/* determine if a file in a different filesstem should be skipped - when one_file_system is set. We bascally only want to include - the mount points - but they can be hard to find! */ -static int skip_filesystem(char *fname, STRUCT_STAT * st) -{ - STRUCT_STAT st2; - char *p = strrchr(fname, '/'); - - /* skip all but directories */ - if (!S_ISDIR(st->st_mode)) - return 1;...

https://bugzilla.samba.org/show_bug.cgi?id=2645 ------- Additional Comments From dalgoda@ix.netcom.com 2005-04-24 11:36 ------- It looks like the culprit is the change for receiver.c 1.130. It pulled the call to send_file_list(-1,...), which is what handled the one_file_system code. It's not like we can easily go back either, since flist.c 1.267 removed support for f=-1. Bummer. -- 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 co...

...t ignore_existing = 0; int ignore_non_existing = 0; +int ignore_non_existing_dirs = 0; int need_messages_from_generator = 0; int max_delete = INT_MIN; OFF_T max_size = -1; @@ -916,6 +917,7 @@ static struct poptOption long_options[] = { {"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, {"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, + {"ignore-non-existing-directory",0,POPT_ARG_NONE, &ignore_non_existing_dirs, 0, 0, 0 },...

...t ignore_existing = 0; int ignore_non_existing = 0; +int ignore_non_existing_dirs = 0; int need_messages_from_generator = 0; int max_delete = INT_MIN; OFF_T max_size = -1; @@ -916,6 +917,7 @@ static struct poptOption long_options[] = { {"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, {"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, + {"ignore-non-existing-directory",0,POPT_ARG_NONE, &ignore_non_existing_dirs, 0, 0, 0 },...

...t ignore_existing = 0; int ignore_non_existing = 0; +int ignore_non_existing_dirs = 0; int need_messages_from_generator = 0; int max_delete = INT_MIN; OFF_T max_size = -1; @@ -916,6 +917,7 @@ static struct poptOption long_options[] = { {"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, {"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, + {"ignore-non-existing-directory",0,POPT_ARG_NONE, &ignore_non_existing_dirs, 0, 0, 0 },...

...? "include" : "exclude"); } --- flist.c 27 Jan 2004 01:47:41 -0000 1.174 +++ flist.c 27 Jan 2004 07:36:30 -0000 @@ -46,6 +46,7 @@ extern int recurse; extern char curr_dir[MAXPATHLEN]; extern char *files_from; extern int filesfrom_fd; +extern char *who_am_i; extern int one_file_system; extern int make_backups; @@ -342,7 +343,8 @@ static void flist_expand(struct file_lis } if (verbose >= 2) { - rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n", + rprintf(FINFO, "[%c] expand file_list to %.0f bytes, did%s move\n", + *who_am_i,...

rsync-2.6.6 manpage says: --delete [...] This option has no effect unless directory recursion is enabled. True. In fact, I noted that --delete doesn't delete anything if --dirs is used rather than --recursive. Is there any reason for --delete not to delete when used with --dirs? Is there a way to get rsync to actually delete files on the receiving end when using

...-28 04:11:57.000000000 +0100 +++ rsync-2.5.6-filtered/options.c 2003-11-16 14:06:29.000000000 +0100 @@ -48,6 +48,9 @@ int dry_run=0; int local_server=0; int ignore_times=0; +char *source_filter = NULL; +char *dest_filter = NULL; +int times_only=0; int delete_mode=0; int delete_excluded=0; int one_file_system=0; @@ -246,6 +249,7 @@ rprintf(F," --timeout=TIME set IO timeout in seconds\n"); rprintf(F," -I, --ignore-times don't exclude files that match length and time\n"); rprintf(F," --size-only only use file size when determining...

...*** options.c Tue Oct 5 15:46:00 2004 --- /tmp/rsync-2.6.3/options.c Thu Sep 23 19:39:05 2004 *************** *** 52,62 **** int cvs_exclude = 0; int dry_run = 0; int local_server = 0; int ignore_times = 0; int delete_mode = 0; - int delete_mdays = -1; int delete_excluded = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; int do_compression = 0; --- 52,61 ---- *************** *** 263,273 **** rprintf(F," -e, --rsh=COMMAND specify the remote shell\n"); rprintf(F," --rsync-path=PATH specify path to rsyn...

...h, that works-for-me(TM): diff -uNr rsync-2.5.6/flist.c rsync-2.5.6-patched/flist.c - --- rsync-2.5.6/flist.c Sat Jan 18 19:00:23 2003 +++ rsync-2.5.6-patched/flist.c Mon Jun 23 21:38:21 2003 @@ -41,6 +41,7 @@ extern int cvs_exclude; extern int recurse; +extern int recurse_level; extern int one_file_system; extern int make_backups; @@ -797,11 +798,20 @@ send_file_entry(file, f, base_flags); } - - if (S_ISDIR(file->mode) && recursive) { + if (S_ISDIR(file->mode) && recursive ) { struct exclude_struct **last_exclude_list =...

...SPARSE_WRITE_SIZE); + int len1 = MIN(len, (size_t)sparse_files_block_size); r1 = write_sparse(f, buf, len1); } else { if (!wf_writeBuf) { diff --git a/options.c b/options.c index f2d23f6..aaffdc7 100644 --- a/options.c +++ b/options.c @@ -73,6 +73,7 @@ int remove_source_files = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; +long sparse_files_block_size = SPARSE_WRITE_SIZE; int do_compression = 0; int def_compress_level = Z_DEFAULT_COMPRESSION; int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */ @@ -358,6 +359,7 @@ void us...

...kup) diff --git a/options.c b/options.c index 9e95c86..6085444 100644 --- a/options.c +++ b/options.c @@ -69,6 +69,8 @@ int delete_during = 0; int delete_before = 0; int delete_after = 0; int delete_excluded = 0; +int diffserv = 8; +char *congestion_alg = NULL; int remove_source_files = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; @@ -776,6 +778,8 @@ void usage(enum logcode F) rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n"); rprintf(F," --port=PORT specify double-colon alternate port number\n");...

...rt -------------- Index: flist.c =================================================================== RCS file: /cvsroot/rsync/flist.c,v retrieving revision 1.169 diff -u -r1.169 flist.c --- flist.c 22 Jan 2004 18:39:32 -0000 1.169 +++ flist.c 24 Jan 2004 20:30:08 -0000 @@ -50,6 +50,7 @@ extern int one_file_system; extern int make_backups; extern int preserve_links; +extern int follow_links_depth; extern int preserve_hard_links; extern int preserve_perms; extern int preserve_devices; @@ -725,6 +726,65 @@ /* IRIX cc cares that the operands to the ternary have the same type. */ #define MALLOC(ap, i) (ap...

...o redistribute it under certain conditions. See the GNU General Public Licence for details. [root at arden-lt tmp]# ----------------------- [OK it's not very good removing lost+found, but that's not the problem]. I think the problem is the code in delete_in_dir() in generator.c: if (one_file_system) { if (file->flags & FLAG_TOP_DIR) filesystem_dev = *fs_dev; else if (filesystem_dev != *fs_dev) return; } As far as I can tell this is unnecessary. --one-file-system should only check the source filesystems not the destination filesystems. This c...

...elaboration on how this stuff really works, please let me know. Cheers, Andy -------------- next part -------------- --- flist.c.orig Tue Sep 5 22:46:43 2000 +++ flist.c Fri Nov 9 12:01:56 2001 @@ -30,6 +30,7 @@ extern int cvs_exclude; extern int recurse; +extern int send_dirs; extern int one_file_system; extern int make_backups; @@ -501,8 +502,8 @@ /* we use noexcludes from backup.c */ if (noexcludes) goto skip_excludes; - if (S_ISDIR(st.st_mode) && !recurse) { - rprintf(FINFO,"skipping directory %s\n",fname); + if (S_ISDIR(st.st_mode) && !recurse && !send...

...ter(&filter_list, fname, is_dir) < 0) - return 1; - return 0; + && (r = check_filter(&filter_list, fname, is_dir)) != M_NOMATCH) { + if (filter_level != ALL_FILTERS) { + if (r == M_IGNORE) + return r; + } else + return r; + } + return M_NOMATCH; } /* used by the one_file_system code */ @@ -786,9 +792,10 @@ if (readlink_stat(thisname, &st, linkname) != 0) { int save_errno = errno; /* See if file is excluded before reporting an error. */ - if (filter_level != NO_FILTERS - && is_excluded(thisname, 0, filter_level)) - return NULL; + if (filter_lev...

...hould cover everything, let me know if there are any questions. Cheers, Andy -------------- next part -------------- --- flist.c.orig Thu Mar 14 16:20:20 2002 +++ flist.c Fri Jan 10 11:10:58 2003 @@ -41,6 +41,7 @@ extern int cvs_exclude; extern int recurse; +extern int send_dirs; extern int one_file_system; extern int make_backups; @@ -662,8 +663,8 @@ if (noexcludes) goto skip_excludes; - if (S_ISDIR(st.st_mode) && !recurse) { - rprintf(FINFO, "skipping directory %s\n", fname); + if (S_ISDIR(st.st_mode) && !recurse && !send_dirs) { + rprintf(FINFO, "ma...

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

People of cygwin & rsync, I recently attempted to get cygwin and rsync working to solve a backup/mirroring need in my computer life. Well, as you might guess, I ran into a little but of trouble. Strangely enough, rsync seemed to be regularly hanging when I attempted to do a "get" (sycronize a remote to a local dir). Well, considering I want to automate this, that was not going

...k #1419: external declaration in primary source file extern int max_delete; ^ generator.c(86): remark #1419: external declaration in primary source file extern int force_delete; ^ generator.c(87): remark #1419: external declaration in primary source file extern int one_file_system; ^ generator.c(88): remark #1419: external declaration in primary source file extern struct stats stats; ^ generator.c(89): remark #1419: external declaration in primary source file extern dev_t filesystem_dev; ^ generator.c(90): remark #1419...