Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The patches for 3.0.0pre8.
[rsync/rsync-patches.git]
/
link-by-hash.diff
diff --git
a/link-by-hash.diff
b/link-by-hash.diff
index
7dcea6b
..
423c9a2
100644
(file)
--- a/
link-by-hash.diff
+++ b/
link-by-hash.diff
@@
-540,11
+540,11
@@
diff --git a/rsync.c b/rsync.c
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct chmod_mode_struct *daemon_chmod_modes;
#ifdef ICONV_OPTION
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct chmod_mode_struct *daemon_chmod_modes;
#ifdef ICONV_OPTION
-@@ -53
1,8 +532,15 @@ void
finish_transfer(const char *fname, const char *fnametmp,
+@@ -53
3,8 +534,15 @@ int
finish_transfer(const char *fname, const char *fnametmp,
/* move tmp file over real file */
if (verbose > 2)
rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
/* move tmp file over real file */
if (verbose > 2)
rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
-- ret = robust_rename(fnametmp, fname,
partialptr
,
+- ret = robust_rename(fnametmp, fname,
temp_copy_name
,
- file->mode & INITACCESSPERMS);
+#ifdef HAVE_LINK
+ if (link_by_hash_dir)
- file->mode & INITACCESSPERMS);
+#ifdef HAVE_LINK
+ if (link_by_hash_dir)
@@
-552,7
+552,7
@@
diff --git a/rsync.c b/rsync.c
+ else
+#endif
+ {
+ else
+#endif
+ {
-+ ret = robust_rename(fnametmp, fname,
partialptr
,
++ ret = robust_rename(fnametmp, fname,
temp_copy_name
,
+ file->mode & INITACCESSPERMS);
+ }
if (ret < 0) {
+ file->mode & INITACCESSPERMS);
+ }
if (ret < 0) {