Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9614834
)
Fixed a couple compile glitches.
author
Wayne Davison
<wayned@samba.org>
Thu, 7 Dec 2006 04:43:43 +0000
(
04:43
+0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 7 Dec 2006 04:43:43 +0000
(
04:43
+0000)
link-by-hash.diff
patch
|
blob
|
blame
|
history
diff --git
a/link-by-hash.diff
b/link-by-hash.diff
index
0d052bd
..
4f8cf50
100644
(file)
--- a/
link-by-hash.diff
+++ b/
link-by-hash.diff
@@
-272,7
+272,7
@@
To use this patch, run these commands for a successful build:
+ char *linkname;
+ long last_fnbr;
+
+ char *linkname;
+ long last_fnbr;
+
-+ if (
file->length
== 0)
++ if (
F_LENGTH(file)
== 0)
+ return robust_rename(fnametmp, fname, NULL, 0644);
+
+ if (do_stat(hashname, &st) == -1) {
+ return robust_rename(fnametmp, fname, NULL, 0644);
+
+ if (do_stat(hashname, &st) == -1) {
@@
-452,12
+452,13
@@
To use this patch, run these commands for a successful build:
args[ac++] = "--files-from";
--- old/receiver.c
+++ new/receiver.c
args[ac++] = "--files-from";
--- old/receiver.c
+++ new/receiver.c
-@@ -124,12 +124,1
3
@@ int get_tmpname(char *fnametmp, char *fn
+@@ -124,12 +124,1
4
@@ int get_tmpname(char *fnametmp, char *fn
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
- char *fname, int fd, OFF_T total_size)
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
- char *fname, int fd, OFF_T total_size)
-+ char *fname, int fd, OFF_T total_size, char *md4)
++ const char *fname, int fd, OFF_T total_size,
++ const char *md4)
{
static char file_sum1[MD4_SUM_LENGTH];
static char file_sum2[MD4_SUM_LENGTH];
{
static char file_sum1[MD4_SUM_LENGTH];
static char file_sum2[MD4_SUM_LENGTH];
@@
-467,7
+468,7
@@
To use this patch, run these commands for a successful build:
int32 len;
OFF_T offset = 0;
OFF_T offset2;
int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -149,6 +15
0
,9 @@ static int receive_data(int f_in, char *
+@@ -149,6 +15
1
,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
} else
mapbuf = NULL;
@@
-477,7
+478,7
@@
To use this patch, run these commands for a successful build:
sum_init(checksum_seed);
if (append_mode) {
sum_init(checksum_seed);
if (append_mode) {
-@@ -191,6 +19
5
,8 @@ static int receive_data(int f_in, char *
+@@ -191,6 +19
6
,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);
@@
-486,7
+487,7
@@
To use this patch, run these commands for a successful build:
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;
-@@ -217,6 +22
3
,8 @@ static int receive_data(int f_in, char *
+@@ -217,6 +22
4
,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);
@@
-495,7
+496,7
@@
To use this patch, run these commands for a successful build:
}
if (updating_basis) {
}
if (updating_basis) {
-@@ -259,6 +26
7
,8 @@ static int receive_data(int f_in, char *
+@@ -259,6 +26
8
,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
}
sum_end(file_sum1);
@@
-504,7
+505,7
@@
To use this patch, run these commands for a successful build:
if (mapbuf)
unmap_file(mapbuf);
if (mapbuf)
unmap_file(mapbuf);
-@@ -274,7 +28
4
,7 @@ static int receive_data(int f_in, char *
+@@ -274,7 +28
5
,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)
{
@@
-513,6
+514,15
@@
To use this patch, run these commands for a successful build:
}
static void handle_delayed_updates(struct file_list *flist, char *local_name)
}
static void handle_delayed_updates(struct file_list *flist, char *local_name)
+@@ -609,7 +620,7 @@ int recv_files(int f_in, struct file_lis
+
+ /* recv file data */
+ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
+- fname, fd2, F_LENGTH(file));
++ fname, fd2, F_LENGTH(file), F_SUM(file));
+
+ log_item(log_code, file, &initial_stats, iflags, NULL);
+
--- old/rsync.c
+++ new/rsync.c
@@ -49,6 +49,7 @@ extern int inplace;
--- old/rsync.c
+++ new/rsync.c
@@ -49,6 +49,7 @@ extern int inplace;