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.5pre1.
[rsync/rsync-patches.git]
/
link-by-hash.diff
diff --git
a/link-by-hash.diff
b/link-by-hash.diff
index
14db3e9
..
16e80bc
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
34,7 +83
5,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -8
44,7 +84
5,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
extra_len += EXTRA_LEN;
#endif
extra_len += EXTRA_LEN;
#endif
@@
-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
28,6 +2046
,11 @@ void server_options(char **args, int *argc_p)
+@@ -20
37,6 +2055
,11 @@ void server_options(char **args, int *argc_p)
} else if (inplace)
args[ac++] = "--inplace";
} else if (inplace)
args[ac++] = "--inplace";
@@
-458,7
+458,7
@@
diff --git a/options.c b/options.c
diff --git a/receiver.c b/receiver.c
--- a/receiver.c
+++ b/receiver.c
diff --git a/receiver.c b/receiver.c
--- a/receiver.c
+++ b/receiver.c
-@@ -16
2,12 +162
,14 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
+@@ -16
3,12 +163
,14 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
}
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
}
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
@@
-474,7
+474,7
@@
diff --git a/receiver.c b/receiver.c
int32 len, sum_len;
OFF_T offset = 0;
OFF_T offset2;
int32 len, sum_len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -18
7,6 +189
,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -18
8,6 +190
,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
} else
mapbuf = NULL;
} else
mapbuf = NULL;
@@
-484,7
+484,7
@@
diff --git a/receiver.c b/receiver.c
sum_init(checksum_seed);
if (append_mode > 0) {
sum_init(checksum_seed);
if (append_mode > 0) {
-@@ -23
1,6 +236
,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -23
2,6 +237
,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
cleanup_got_literal = 1;
sum_update(data, i);
cleanup_got_literal = 1;
sum_update(data, i);
@@
-493,7
+493,7
@@
diff --git a/receiver.c b/receiver.c
if (fd != -1 && write_file(fd,data,i) != i)
goto report_write_error;
if (fd != -1 && write_file(fd,data,i) != i)
goto report_write_error;
-@@ -25
7,6 +264
,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -25
8,6 +265
,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
see_token(map, len);
sum_update(map, len);
see_token(map, len);
sum_update(map, len);
@@
-502,7
+502,7
@@
diff --git a/receiver.c b/receiver.c
}
if (updating_basis_or_equiv) {
}
if (updating_basis_or_equiv) {
-@@ -
299,6 +308
,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -
300,6 +309
,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
}
sum_len = sum_end(file_sum1);
}
sum_len = sum_end(file_sum1);
@@
-511,7
+511,7
@@
diff --git a/receiver.c b/receiver.c
if (mapbuf)
unmap_file(mapbuf);
if (mapbuf)
unmap_file(mapbuf);
-@@ -31
4,7 +325
,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -31
5,7 +326
,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
static void discard_receive_data(int f_in, OFF_T length)
{
static void discard_receive_data(int f_in, OFF_T length)
{
@@
-520,7
+520,7
@@
diff --git a/receiver.c b/receiver.c
}
static void handle_delayed_updates(char *local_name)
}
static void handle_delayed_updates(char *local_name)
-@@ -
676,7 +687
,7 @@ int recv_files(int f_in, char *local_name)
+@@ -
705,7 +716
,7 @@ int recv_files(int f_in, char *local_name)
/* 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,
@@
-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
5,8 +576
,15 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -57
8,8 +579
,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
28,6 +828
,14 @@ struct stats {
+@@ -8
30,6 +830
,14 @@ struct stats {
int num_transferred_files;
};
int num_transferred_files;
};
@@
-575,7
+575,7
@@
diff --git a/rsync.h b/rsync.h
+
struct chmod_mode_struct;
+
struct chmod_mode_struct;
- #define EMPTY_ITEM_LIST {NULL, 0, 0}
+ struct flist_ndx_item {
diff --git a/rsync.yo b/rsync.yo
--- a/rsync.yo
+++ b/rsync.yo
diff --git a/rsync.yo b/rsync.yo
--- a/rsync.yo
+++ b/rsync.yo