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
Do a better job of writing out the BATCH.sh file (i.e. quote special
[rsync/rsync.git]
/
fileio.c
diff --git
a/fileio.c
b/fileio.c
index
925e74b
..
44ec8ef
100644
(file)
--- a/
fileio.c
+++ b/
fileio.c
@@
-22,9
+22,12
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
+extern int sparse_files;
+
+unsigned int max_map_size = MAX_MAP_SIZE;
+
static char last_byte;
static int last_sparse;
static char last_byte;
static int last_sparse;
-extern int sparse_files;
int sparse_end(int f)
{
int sparse_end(int f)
{
@@
-91,6
+94,7
@@
int flush_write_file(int f)
return ret;
}
return ret;
}
+
/*
* write_file does not allow incomplete writes. It loops internally
* until len bytes are written or errno is set.
/*
* write_file does not allow incomplete writes. It loops internally
* until len bytes are written or errno is set.
@@
-106,9
+110,9
@@
int write_file(int f,char *buf,size_t len)
r1 = write_sparse(f, buf, len1);
} else {
if (!wf_writeBuf) {
r1 = write_sparse(f, buf, len1);
} else {
if (!wf_writeBuf) {
- wf_writeBufSize =
MAX_MAP_SIZE
;
+ wf_writeBufSize =
WRITE_SIZE * 8
;
wf_writeBufCnt = 0;
wf_writeBufCnt = 0;
- wf_writeBuf = new_array(char,
MAX_MAP_SIZE
);
+ wf_writeBuf = new_array(char,
wf_writeBufSize
);
if (!wf_writeBuf)
out_of_memory("write_file");
}
if (!wf_writeBuf)
out_of_memory("write_file");
}
@@
-136,7
+140,6
@@
int write_file(int f,char *buf,size_t len)
}
}
-
/* this provides functionality somewhat similar to mmap() but using
read(). It gives sliding window access to a file. mmap() is not
used because of the possibility of another program (such as a
/* this provides functionality somewhat similar to mmap() but using
read(). It gives sliding window access to a file. mmap() is not
used because of the possibility of another program (such as a
@@
-144,21
+147,18
@@
int write_file(int f,char *buf,size_t len)
struct map_struct *map_file(int fd,OFF_T len)
{
struct map_struct *map;
struct map_struct *map_file(int fd,OFF_T len)
{
struct map_struct *map;
- map = new(struct map_struct);
- if (!map) out_of_memory("map_file");
+ if (!(map = new(struct map_struct)))
+ out_of_memory("map_file");
+
+ memset(map, 0, sizeof map[0]);
map->fd = fd;
map->file_size = len;
map->fd = fd;
map->file_size = len;
- map->p = NULL;
- map->p_size = 0;
- map->p_offset = 0;
- map->p_fd_offset = 0;
- map->p_len = 0;
- map->status = 0;
return map;
}
return map;
}
+
/* slide the read window in the file */
char *map_ptr(struct map_struct *map,OFF_T offset,int len)
{
/* slide the read window in the file */
char *map_ptr(struct map_struct *map,OFF_T offset,int len)
{
@@
-181,7
+181,6
@@
char *map_ptr(struct map_struct *map,OFF_T offset,int len)
return (map->p + (offset - map->p_offset));
}
return (map->p + (offset - map->p_offset));
}
-
/* nope, we are going to have to do a read. Work out our desired window */
if (offset > 2*CHUNK_SIZE) {
window_start = offset - 2*CHUNK_SIZE;
/* nope, we are going to have to do a read. Work out our desired window */
if (offset > 2*CHUNK_SIZE) {
window_start = offset - 2*CHUNK_SIZE;
@@
-189,7
+188,7
@@
char *map_ptr(struct map_struct *map,OFF_T offset,int len)
} else {
window_start = 0;
}
} else {
window_start = 0;
}
- window_size =
MAX_MAP_SIZE
;
+ window_size =
max_map_size
;
if (window_start + window_size > map->file_size) {
window_size = map->file_size - window_start;
}
if (window_start + window_size > map->file_size) {
window_size = map->file_size - window_start;
}
@@
-259,9
+258,8
@@
int unmap_file(struct map_struct *map)
map->p = NULL;
}
ret = map->status;
map->p = NULL;
}
ret = map->status;
- memset(map, 0, sizeof
(*map)
);
+ memset(map, 0, sizeof
map[0]
);
free(map);
return ret;
}
free(map);
return ret;
}
-