search for: base_flag

...process 30131 0x2a344742 in ?? () (gdb) bt #0 0x2a344742 in ?? () #1 0x2a3a2d20 in ?? () #2 0x00000020 in ?? () #3 0x598062b0 in ?? () #4 0x0805a150 in make_file (fname=0x0, flist=0x0, exclude_level=69) at flist.c:879 #5 0x0805a3bc in send_file_name (f=3, flist=0x41, fname=0x0, recursive=65, base_flags=0) at flist.c:932 #6 0x0805a845 in send_file_list (f=1, argc=1501590384, argv=0x0) at flist.c:1033 #7 0x08053e1a in hash_search (f=1, s=0x0, buf=0x0, len=577936410078638920) at match.c:170 #8 0x08054003 in hash_search (f=1, s=0x0, buf=0x0, len=0) at match.c:202 #9 0x08054726 in match_sums (f=3...

...gentle. diff -u rsync-2.6.0/flist.c rsync-2.6.0-dar/flist.c --- rsync-2.6.0/flist.c Mon Dec 15 03:10:31 2003 +++ rsync-2.6.0-dar/flist.c Wed Mar 10 11:29:32 2004 @@ -382,7 +382,7 @@ io_write_phase = "send_file_entry"; - fname = f_name(file); + fname = f_name_dst(file); flags = base_flags; @@ -737,7 +737,7 @@ if (lastdir && strcmp(fname, lastdir) == 0) { file->dirname = lastdir; } else { - file->dirname = strdup(fname); + file->dirname = STRDUP(ap,fname); lastdir = file->dirname; } file->basename = STRDUP(ap, p + 1); @@ -804,6 +804,9...

...[server]:[path] If I whittle down what appears in [paths], then it works. $ gdb rsync rsync.core gdb> bt #0 0x280faf0d in strncmp () from /usr/lib/libc.so.4 #1 0x7 in ?? () #2 0x80597f7 in send_file_name (f=-1, flist=0x808a100, fname=0xbfbfe994 "etc/opt/TWWfsw", recursive=1, base_flags=1) at flist.c:929 #3 0x805a2fc in send_file_list (f=-1, argc=0, argv=0xbfbffa44) at flist.c:1178 #4 0x804c0ff in delete_files (flist=0x808a0c0) at receiver.c:102 #5 0x805177e in do_recv (f_in=0, f_out=1, flist=0x808a0c0, local_name=0x0) at main.c:426 #6 0x8051bae in do_server_recv (f_i...

...quot;... Core was generated by `rsync'. Program terminated with signal 11, Segmentation fault. #0 0x809da23 in strncmp () (gdb) bt #0 0x809da23 in strncmp () #1 0xbfbfbd5c in ?? () #2 0x8054260 in send_file_name (f=-1, flist=0x80c5460, fname=0xbfbfca6c "news/etc", recursive=1, base_flags=1) at flist.c:929 #3 0x8054ab0 in send_file_list (f=-1, argc=0, argv=0xbfbfd71c) at flist.c:1178 #4 0x8049c72 in delete_files (flist=0x80c5340) at receiver.c:102 #5 0x804e028 in do_recv (f_in=0, f_out=1, flist=0x80c5340, local_name=0x0) at main.c:426 #6 0x804e3b7 in do_server_recv (f_in=...

...xit_cleanup(int code, const char *file, int line); void cleanup_disable(void); void cleanup_set(char *fnametmp, char *fname, struct file_struct *file, *************** *** 84,89 **** --- 84,90 ---- void send_file_name(int f, struct file_list *flist, char *fname, int recursive, unsigned base_flags); struct file_list *send_file_list(int f, int argc, char *argv[]); + void send_batch_file_list( int f, struct file_list *flist ); struct file_list *recv_file_list(int f); int file_compare(struct file_struct **f1, struct file_struct **f2); int flist_find(struct file_list *flist, struct file...

...list.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 = local_exclude_list; - - send_directory(f, flist, f_name(file)); - -...

OK, I searched through the archives and didn't find anything so I must be doing something stupid. I just compiled 2.6.3 and am trying to get it to run on linux 2.6.8.1 kernel with a more or less fedora core2 environment. I was trying between two systems but I have narrowed it down to what I believe is a pretty simple case. Here is my setup/test: Last login: Mon Oct 4 19:30:49 2004

...45 2004 +++ pool2/proto.h Thu Feb 5 18:49:59 2004 @@ -73,16 +73,18 @@ void show_flist_stats(void); int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf); int link_stat(const char *path, STRUCT_STAT * buffer); void send_file_entry(struct file_struct *file, int f, unsigned short base_flags); -void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f); -struct file_struct *make_file(char *fname, int exclude_level); +void receive_file_entry(struct file_struct **fptr, unsigned short flags, + struct file_list *flist, int f); +struct file_struct *make_file(char *f...

..."copy_exclude_list"); + *p=*from[i]; + p->pattern=strdup(from[i]->pattern); + if (!p->pattern) out_of_memory("copy_exclude_list"); + } + to[len]=NULL; + return to; +} void send_file_name(int f, struct file_list *flist, char *fname, int recursive, unsigned base_flags) @@ -800,8 +828,11 @@ if (S_ISDIR(file->mode) && recursive) { struct exclude_struct **last_exclude_list = local_exclude_list; + struct exclude_struct **recur_last_exclude_list = + recur_local_exclude_list; send_directory(f, flist, f_name(file)); local_exclude_lis...

...send_dirs = 1; + break; + + case OPT_NO_IMPLICIT_DIRS: + implicit_dirs = 0; break; default: --- proto.h.orig Tue Sep 5 22:46:43 2000 +++ proto.h Wed Nov 7 17:08:59 2001 @@ -46,6 +46,7 @@ void send_file_name(int f,struct file_list *flist,char *fname, int recursive, unsigned base_flags); struct file_list *send_file_list(int f,int argc,char *argv[]); +struct file_list *send_file_list_fp(int f,FILE *fp); struct file_list *recv_file_list(int f); int file_compare(struct file_struct **f1,struct file_struct **f2); int flist_find(struct file_list *flist,struct file_struct *f);

This is a patch to add an --rsync-exclude option to rsync-2.5.6cvs. File names in .rsync- (or .rsync+) are excluded (or included) from the file lists associated with the current directory and all of its subdirectories. This has advantages over --cvs-exclude for backing up large file systems since the .cvsignore files only apply to the current directory: unless the .cvsignore restrictions apply

...+351,11 @@ void send_file_entry(struct file_struct io_write_phase = "send_file_entry"; - fname = f_name_to(file, fbuf); + if (am_server) + f_name_to(file, fname); /* fname conversion always done on client */ + else + convert_fname(fname, f_name(file), MAXPATHLEN); + flags = base_flags; @@ -563,6 +567,9 @@ void receive_file_entry(struct file_stru strlcpy(lastname, thisname, MAXPATHLEN); + if (!am_server) /* fname conversion always done on client */ + convert_fname(thisname, lastname, MAXPATHLEN); + clean_fname(thisname); if (sanitize_paths) @@ -1043,6 +1050,9 @@ s...

...'\0'; + break; + + case OPT_NO_IMPLICIT_DIRS: + implicit_dirs = 0; break; default: --- proto.h.orig Sun Mar 24 22:51:17 2002 +++ proto.h Thu Jan 9 14:02:18 2003 @@ -82,6 +82,7 @@ void send_file_name(int f, struct file_list *flist, char *fname, int recursive, unsigned base_flags); struct file_list *send_file_list(int f, int argc, char *argv[]); +struct file_list *send_file_list_fp(int f,FILE *fp); struct file_list *recv_file_list(int f); int file_compare(struct file_struct **f1, struct file_struct **f2); int flist_find(struct file_list *flist, struct file_struct *f);

...8 Jun 2004 16:29:21 -0000 1.231 --- flist.c 12 Jul 2004 00:37:47 -0000 *************** *** 950,958 **** flist_expand(flist); - if (write_batch) - file->flags |= FLAG_TOP_DIR; - if (file->basename[0]) { flist->files[flist->count++] = file; send_file_entry(file, f, base_flags); --- 950,955 ---- *************** *** 1301,1313 **** * protocol version 15 */ recv_uid_list(f, flist); - if (!read_batch) { /* Recv the io_error flag */ if (lp_ignore_errors(module_id) || ignore_errors) read_int(f); else io_error |= read_int(f); ! } }...

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