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
started to add some 64 bit file offset support - not complete yet
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
6537717
..
15cf2bc
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-53,6
+53,7
@@
struct map_struct *map_file(int fd,off_t len)
return ret;
}
return ret;
}
+
char *map_ptr(struct map_struct *map,off_t offset,int len)
{
int nread = -2;
char *map_ptr(struct map_struct *map,off_t offset,int len)
{
int nread = -2;
@@
-63,7
+64,8
@@
char *map_ptr(struct map_struct *map,off_t offset,int len)
if (len == 0)
return NULL;
if (len == 0)
return NULL;
- len = MIN(len,map->size-offset);
+ if (len > (map->size-offset))
+ len = map->size-offset;
if (offset >= map->p_offset &&
offset+len <= map->p_offset+map->p_len) {
if (offset >= map->p_offset &&
offset+len <= map->p_offset+map->p_len) {
@@
-71,7
+73,8
@@
char *map_ptr(struct map_struct *map,off_t offset,int len)
}
len = MAX(len,CHUNK_SIZE);
}
len = MAX(len,CHUNK_SIZE);
- len = MIN(len,map->size - offset);
+ if (len > (map->size-offset))
+ len = map->size-offset;
if (len > map->p_size) {
if (map->p) free(map->p);
if (len > map->p_size) {
if (map->p) free(map->p);