Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The "ndx" variable now holds the unique, over-the-wire value, not
[rsync/rsync.git]
/
fileio.c
diff --git
a/fileio.c
b/fileio.c
index
5a3bf35
..
52e34bd
100644
(file)
--- a/
fileio.c
+++ b/
fileio.c
@@
-107,7
+107,7
@@
int write_file(int f,char *buf,size_t len)
while (len > 0) {
int r1;
while (len > 0) {
int r1;
- if (sparse_files) {
+ if (sparse_files
> 0
) {
int len1 = MIN(len, SPARSE_WRITE_SIZE);
r1 = write_sparse(f, buf, len1);
} else {
int len1 = MIN(len, SPARSE_WRITE_SIZE);
r1 = write_sparse(f, buf, len1);
} else {
@@
-190,7
+190,7
@@
char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
window_start = offset;
window_size = map->def_window_size;
if (window_start + window_size > map->file_size)
window_start = offset;
window_size = map->def_window_size;
if (window_start + window_size > map->file_size)
- window_size =
map->file_size - window_start
;
+ window_size =
(int32)(map->file_size - window_start)
;
if (len > window_size)
window_size = len;
if (len > window_size)
window_size = len;
@@
-208,7
+208,7
@@
char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
window_start < map->p_offset + map->p_len &&
window_start + window_size >= map->p_offset + map->p_len) {
read_start = map->p_offset + map->p_len;
window_start < map->p_offset + map->p_len &&
window_start + window_size >= map->p_offset + map->p_len) {
read_start = map->p_offset + map->p_len;
- read_offset =
read_start - window_start
;
+ read_offset =
(int32)(read_start - window_start)
;
read_size = window_size - read_offset;
memmove(map->p, map->p + (map->p_len - read_offset), read_offset);
} else {
read_size = window_size - read_offset;
memmove(map->p, map->p + (map->p_len - read_offset), read_offset);
} else {