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
Updated to apply cleanly.
[rsync/rsync-patches.git]
/
link-by-hash.diff
diff --git
a/link-by-hash.diff
b/link-by-hash.diff
index
d8bd437
..
903827b
100644
(file)
--- a/
link-by-hash.diff
+++ b/
link-by-hash.diff
@@
-365,7
+365,7
@@
the file's name.
+}
+
+#endif
+}
+
+#endif
---- orig/options.c 2005-0
1-28 19:08:20
+--- orig/options.c 2005-0
2-01 10:39:22
+++ options.c 2005-01-28 19:32:26
@@ -132,6 +132,7 @@ char *log_format = NULL;
char *password_file = NULL;
+++ options.c 2005-01-28 19:32:26
@@ -132,6 +132,7 @@ char *log_format = NULL;
char *password_file = NULL;
@@
-422,7
+422,7
@@
the file's name.
default:
/* A large opt value means that set_refuse_options()
* turned this option off (opt-BASE is its index). */
default:
/* A large opt value means that set_refuse_options()
* turned this option off (opt-BASE is its index). */
-@@ -1
299,6 +1317
,11 @@ void server_options(char **args,int *arg
+@@ -1
305,6 +1323
,11 @@ void server_options(char **args,int *arg
}
}
}
}
@@
-434,9
+434,9
@@
the file's name.
if (files_from && (!am_sender || remote_filesfrom_file)) {
if (remote_filesfrom_file) {
args[ac++] = "--files-from";
if (files_from && (!am_sender || remote_filesfrom_file)) {
if (remote_filesfrom_file) {
args[ac++] = "--files-from";
---- orig/receiver.c 2005-0
1-28 19:08
:20
+--- orig/receiver.c 2005-0
2-03 02:04
:20
+++ receiver.c 2005-01-15 21:29:13
+++ receiver.c 2005-01-15 21:29:13
-@@ -3
6,6 +36
,7 @@ extern int preserve_hard_links;
+@@ -3
5,6 +35
,7 @@ extern int preserve_hard_links;
extern int preserve_perms;
extern int io_error;
extern char *tmpdir;
extern int preserve_perms;
extern int io_error;
extern char *tmpdir;
@@
-444,7
+444,7
@@
the file's name.
extern char *partial_dir;
extern char *basis_dir[];
extern int basis_dir_cnt;
extern char *partial_dir;
extern char *basis_dir[];
extern int basis_dir_cnt;
-@@ -13
2,12 +133
,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -13
6,12 +137
,13 @@ static int get_tmpname(char *fnametmp, c
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,
@@
-459,7
+459,7
@@
the file's name.
int32 len;
OFF_T offset = 0;
OFF_T offset2;
int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -1
57,6 +159
,9 @@ static int receive_data(int f_in, char *
+@@ -1
61,6 +163
,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
} else
mapbuf = NULL;
@@
-469,7
+469,7
@@
the file's name.
sum_init(checksum_seed);
while ((i = recv_token(f_in, &data)) != 0) {
sum_init(checksum_seed);
while ((i = recv_token(f_in, &data)) != 0) {
-@@ -17
3,6 +178
,8 @@ static int receive_data(int f_in, char *
+@@ -17
7,6 +182
,8 @@ static int receive_data(int f_in, char *
cleanup_got_literal = 1;
sum_update(data, i);
cleanup_got_literal = 1;
sum_update(data, i);
@@
-478,7
+478,7
@@
the file's name.
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;
-@@ -
199,6 +206
,8 @@ static int receive_data(int f_in, char *
+@@ -
203,6 +210
,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
see_token(map, len);
sum_update(map, len);
@@
-487,7
+487,7
@@
the file's name.
}
if (inplace) {
}
if (inplace) {
-@@ -2
39,6 +248
,8 @@ static int receive_data(int f_in, char *
+@@ -2
43,6 +252
,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
}
sum_end(file_sum1);
@@
-496,7
+496,7
@@
the file's name.
if (mapbuf)
unmap_file(mapbuf);
if (mapbuf)
unmap_file(mapbuf);
-@@ -25
4,7 +265
,7 @@ static int receive_data(int f_in, char *
+@@ -25
8,7 +269
,7 @@ static int receive_data(int f_in, char *
static void discard_receive_data(int f_in, OFF_T length)
{
static void discard_receive_data(int f_in, OFF_T length)
{
@@
-505,7
+505,7
@@
the file's name.
}
}
-@@ -
495,8 +506
,12 @@ int recv_files(int f_in, struct file_lis
+@@ -
500,8 +511
,12 @@ int recv_files(int f_in, struct file_lis
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
@@
-519,9
+519,9
@@
the file's name.
log_recv(file, &initial_stats);
log_recv(file, &initial_stats);
---- orig/rsync.c 2005-0
1-28 19:08:20
+--- orig/rsync.c 2005-0
2-01 10:39:22
+++ rsync.c 2004-08-13 18:14:34
+++ rsync.c 2004-08-13 18:14:34
-@@ -3
5,6 +35
,7 @@ extern int force_delete;
+@@ -3
6,6 +36
,7 @@ extern int force_delete;
extern int recurse;
extern int keep_dirlinks;
extern int make_backups;
extern int recurse;
extern int keep_dirlinks;
extern int make_backups;
@@
-529,7
+529,7
@@
the file's name.
extern char *backup_dir;
extern int inplace;
extern char *backup_dir;
extern int inplace;
-@@ -28
1,7 +282
,12 @@ void finish_transfer(char *fname, char *
+@@ -28
2,7 +283
,12 @@ void finish_transfer(char *fname, char *
/* 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);
@@
-543,9
+543,9
@@
the file's name.
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
---- orig/rsync.h 2005-0
1-28 19:08
:20
+--- orig/rsync.h 2005-0
2-03 02:04
:20
+++ rsync.h 2004-07-03 20:20:15
+++ rsync.h 2004-07-03 20:20:15
-@@ -59
9,6 +599
,14 @@ struct stats {
+@@ -59
8,6 +598
,14 @@ struct stats {
int current_file_index;
};
int current_file_index;
};
@@
-558,11
+558,11
@@
the file's name.
+};
+
+};
+
- /* we need this function because of the silly way in which duplicate
- entries are handled in the file lists - we can't change this
---- orig/rsync.yo 2005-0
1-28 17:12:14
+ #include "byteorder.h"
+ #include "lib/mdfour.h"
+--- orig/rsync.yo 2005-0
2-01 10:39:23
+++ rsync.yo 2005-01-28 19:32:45
+++ rsync.yo 2005-01-28 19:32:45
-@@ -3
65,6 +365,7 @@ verb(
+@@ -3
54,6 +354,7 @@ to the detailed description below for a
--compare-dest=DIR also compare received files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
--compare-dest=DIR also compare received files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged