extern int sparse_files;
-unsigned int max_map_size = MAX_MAP_SIZE;
-
static char last_byte;
static int last_sparse;
}
}
if (r1 <= 0) {
- if (ret > 0) return ret;
+ if (ret > 0)
+ return ret;
return r1;
}
len -= r1;
read(). It gives sliding window access to a file. mmap() is not
used because of the possibility of another program (such as a
mailer) truncating the file thus giving us a SIGBUS */
-struct map_struct *map_file(int fd,OFF_T len)
+struct map_struct *map_file(int fd, OFF_T len, size_t block_size)
{
struct map_struct *map;
memset(map, 0, sizeof map[0]);
map->fd = fd;
map->file_size = len;
+ map->def_window_size = MAX(MAX_MAP_SIZE, block_size * 32);
return map;
}
OFF_T window_start, read_start;
int window_size, read_size, read_offset;
- if (len == 0) {
+ if (len == 0)
return NULL;
- }
/* can't go beyond the end of file */
if (len > (map->file_size - offset)) {
} else {
window_start = 0;
}
- window_size = max_map_size;
+ window_size = map->def_window_size;
if (window_start + window_size > map->file_size) {
window_size = map->file_size - window_start;
}
/* make sure we have allocated enough memory for the window */
if (window_size > map->p_size) {
map->p = realloc_array(map->p, char, window_size);
- if (!map->p) out_of_memory("map_ptr");
+ if (!map->p)
+ out_of_memory("map_ptr");
map->p_size = window_size;
}