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
Adding --chown=USER:GROUP alias for simple usecases of the
[rsync/rsync-patches.git]
/
link-by-hash.diff
diff --git
a/link-by-hash.diff
b/link-by-hash.diff
index
96bea34
..
5735941
100644
(file)
--- a/
link-by-hash.diff
+++ b/
link-by-hash.diff
@@
-27,7
+27,7
@@
diff --git a/Makefile.in b/Makefile.in
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -7
0,6 +70,7 @@ extern int need_unsorted_flist
;
+@@ -7
1,6 +71,7 @@ extern int sender_symlink_iconv
;
extern int unsort_ndx;
extern struct stats stats;
extern char *filesfrom_host;
extern int unsort_ndx;
extern struct stats stats;
extern char *filesfrom_host;
@@
-35,7
+35,7
@@
diff --git a/flist.c b/flist.c
extern char curr_dir[MAXPATHLEN];
extern char curr_dir[MAXPATHLEN];
-@@ -8
30,7 +831
,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -8
44,7 +845
,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
extra_len += EXTRA_LEN;
#endif
extra_len += EXTRA_LEN;
#endif
@@
-43,7
+43,7
@@
diff --git a/flist.c b/flist.c
+ if ((always_checksum || link_by_hash_dir) && S_ISREG(mode))
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
+ if ((always_checksum || link_by_hash_dir) && S_ISREG(mode))
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
- if (file_length > 0xFFFFFFFFu && S_ISREG(mode))
+ #if SIZEOF_INT64 >= 8
diff --git a/hashlink.c b/hashlink.c
new file mode 100644
--- /dev/null
diff --git a/hashlink.c b/hashlink.c
new file mode 100644
--- /dev/null
@@
-443,7
+443,7
@@
diff --git a/options.c b/options.c
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -20
23,6 +2041
,11 @@ void server_options(char **args, int *argc_p)
+@@ -20
36,6 +2054
,11 @@ void server_options(char **args, int *argc_p)
} else if (inplace)
args[ac++] = "--inplace";
} else if (inplace)
args[ac++] = "--inplace";
@@
-540,7
+540,7
@@
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
-@@ -57
1,8 +572
,15 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -57
5,8 +576
,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);
@@
-561,7
+561,7
@@
diff --git a/rsync.c b/rsync.c
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
-@@ -8
24,6 +824
,14 @@ struct stats {
+@@ -8
30,6 +830
,14 @@ struct stats {
int num_transferred_files;
};
int num_transferred_files;
};