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
My improved version of a connection-timeout patch.
[rsync/rsync-patches.git]
/
link-by-hash.diff
diff --git
a/link-by-hash.diff
b/link-by-hash.diff
index
ed365c4
..
9e5ffac
100644
(file)
--- a/
link-by-hash.diff
+++ b/
link-by-hash.diff
@@
-25,15
+25,15
@@
To use this patch, run these commands for a successful build:
popt/popthelp.o popt/poptparse.o
--- old/flist.c
+++ new/flist.c
popt/popthelp.o popt/poptparse.o
--- old/flist.c
+++ new/flist.c
-@@ -6
5,6 +65,7 @@ extern int protocol_version
;
- extern int
sanitize_paths
;
+@@ -6
7,6 +67,7 @@ extern int need_unsorted_flist
;
+ extern int
unsort_ndx
;
extern struct stats stats;
extern char *filesfrom_host;
+extern char *link_by_hash_dir;
extern struct stats stats;
extern char *filesfrom_host;
+extern char *link_by_hash_dir;
- #ifdef ICONV_OPTION
- extern char
*iconv_opt
;
- #endif
-@@ -81
8,7 +819
,7 @@ static struct file_struct *recv_file_ent
+
+ extern char
curr_dir[MAXPATHLEN]
;
+
+@@ -81
5,7 +816
,7 @@ static struct file_struct *recv_file_ent
extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
#endif
extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
#endif
@@
-495,7
+495,7
@@
To use this patch, run these commands for a successful build:
+ mdfour_update(&mdfour_data, (uchar*)map, len);
}
+ mdfour_update(&mdfour_data, (uchar*)map, len);
}
- if (updating_basis) {
+ if (updating_basis
_or_equiv
) {
@@ -299,6 +308,8 @@ static int receive_data(int f_in, char *
}
@@ -299,6 +308,8 @@ static int receive_data(int f_in, char *
}
@@
-514,7
+514,7
@@
To use this patch, run these commands for a successful build:
}
static void handle_delayed_updates(char *local_name)
}
static void handle_delayed_updates(char *local_name)
-@@ -6
67,7 +678
,7 @@ int recv_files(int f_in, char *local_nam
+@@ -6
73,7 +684
,7 @@ int recv_files(int f_in, char *local_nam
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,