search for: free_sums

...-- sender.c.orig Mon May 27 20:36:34 2002 +++ sender.c Mon May 27 20:35:33 2002 @@ -184,7 +184,7 @@ rprintf(FERROR,"send_files failed to open %s: %s\n", fname,strerror(errno)); free_sums(s); - continue; + return; } /* map the local file */ and the errorlevel is returned properly, but there are additional messages: send_files failed to open /etc/shadow: Permissio...

...*/ --- 26,36 ---- extern int io_error; extern int dry_run; extern int am_server; + extern int preserve_atime; /* receive the checksums for a buffer */ *************** *** 184,189 **** --- 197,204 ---- rprintf(FERROR,"fstat failed : %s\n",strerror(errno)); free_sums(s); close(fd); + if (preserve_atime) + set_modtime(fname, file->modtime, file->acctime); return; } *************** *** 266,271 **** --- 281,288 ---- if (!read_batch) { /* dw */ if (buf) unmap_file(buf); close(fd); + if (preserve_atime)...

...c 2002/04/09 06:03:50 1.17 +++ sender.c 2002/05/04 19:20:29 @@ -26,6 +26,7 @@ extern int io_error; extern int dry_run; extern int am_server; +extern int move_files; /** @@ -184,6 +185,7 @@ rprintf(FERROR,"send_files failed to open %s: %s\n", fname,strerror(errno)); free_sums(s); + file->flags |= FLAG_NO_DELETE; continue; } @@ -265,6 +267,7 @@ rprintf (FINFO,"readbatch & checksums don't match\n"); rprintf (FINFO,"filename=%s is being skipped\n", fname); + file...

...rprintf(FINFO,"sending sums for %d\n",i); + rprintf(FINFO,"generating and sending sums for %d\n",i); - write_int(f_out,i); - send_sums(s,f_out); + generate_and_send_sums(buf,st.st_size,adapt_block_size(file, block_size),f_out); close(fd); if (buf) unmap_file(buf); - - free_sums(s); }

I've run into a bug in the IO handling when reading a file. Suppose I have a file that lives on an NFS filesystem. That filesystem is NOT being exported with auth=0 permissions. So, if I try to access a file as root, it successfully opens the file, but subsequent reads fail with EACCES. This produces a destination file full of null bytes. I noticed this with 2.5.7, but checked 2.6.2 as

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

...t; getxattr \ > extattr_get_link sigaction sigprocmask setattrlist > do > as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` > diff -up a/proto.h b/proto.h > --- a/proto.h > +++ b/proto.h > @@ -269,6 +269,8 @@ int read_ndx_and_attrs(int f_in, int *if > void free_sums(struct sum_struct *s); > mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, > int exists); > +int make_mutable(const char *fname, mode_t mode, uint32 fileflags, > uint32 iflags); > +int undo_make_mutable(const char *fname, uint32 fileflags); > int set_fi...

...unlink_tmp = 1; + } + } + } + if (fd == -1) { io_error = 1; rprintf(FERROR,"send_files failed to open %s: %s\n", @@ -275,6 +323,7 @@ if (!read_batch) { /* dw */ if (buf) unmap_file(buf); close(fd); + if (unlink_tmp) unlink(tmp); } free_sums(s);

...fname(fname)); } } +/* reset original access and modtime if preserve_atime=1 */ + if (preserve_atime) { + if (set_modtime(fname,st.st_mtime,st.st_atime) != 0) { + rsyserr(FERROR, errno, + "failed to set times on %s", + full_fname(fname)); + } + } close(fd); free_sums(s); diff -uNr rsync-2.6.6/util.c rsync-2.6.6_patch/util.c --- rsync-2.6.6/util.c 2005-07-07 21:49:14.000000000 +0200 +++ rsync-2.6.6_patch/util.c 2005-11-23 23:59:42.000000000 +0100 @@ -128,7 +128,7 @@ -int set_modtime(char *fname, time_t modtime) +int set_modtime(char *fname, time_t modtime,...

...;--compress-level=%d", def_compress_level) < 0) diff -brpu rsync-3.0.0pre9/proto.h rsync-3.0.0pre9-flags/proto.h --- rsync-3.0.0pre9/proto.h Mon Feb 11 05:12:39 2008 +++ rsync-3.0.0pre9-flags/proto.h Fri Feb 15 19:35:16 2008 @@ -267,6 +267,8 @@ int read_ndx_and_attrs(int f_in, int *if void free_sums(struct sum_struct *s); mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, int exists); +void make_mutable(const char *fname, mode_t mode, uint32 fileflags); +void undo_make_mutable(const char *fname, mode_t mode, uint32 fileflags); int set_file_attrs(const char *fname, stru...