-/*
+/*
Copyright (C) Andrew Tridgell 1998
Copyright (C) 2002 by Martin Pool
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/*
- File IO utilities used in rsync
+ File IO utilities used in rsync
*/
#include "rsync.h"
+extern int sparse_files;
+
static char last_byte;
static int last_sparse;
-extern int sparse_files;
int sparse_end(int f)
{
size_t l1=0, l2=0;
int ret;
- for (l1=0;l1<len && buf[l1]==0;l1++) ;
- for (l2=0;l2<(len-l1) && buf[len-(l2+1)]==0;l2++) ;
+ for (l1 = 0; l1 < len && buf[l1] == 0; l1++) {}
+ for (l2 = 0; l2 < len-l1 && buf[len-(l2+1)] == 0; l2++) {}
last_byte = buf[len-1];
last_sparse=1;
if (l1 > 0) {
- do_lseek(f,l1,SEEK_CUR);
+ do_lseek(f,l1,SEEK_CUR);
}
- if (l1 == len)
+ if (l1 == len)
return len;
ret = write(f, buf + l1, len - (l1+l2));
if (ret == -1 || ret == 0)
return ret;
- else if (ret != (int) (len - (l1+l2)))
+ else if (ret != (int) (len - (l1+l2)))
return (l1+ret);
if (l2 > 0)
do_lseek(f,l2,SEEK_CUR);
-
+
return len;
}
+
+static char *wf_writeBuf;
+static size_t wf_writeBufSize;
+static size_t wf_writeBufCnt;
+
+int flush_write_file(int f)
+{
+ int ret = 0;
+ char *bp = wf_writeBuf;
+
+ while (wf_writeBufCnt > 0) {
+ if ((ret = write(f, bp, wf_writeBufCnt)) < 0) {
+ if (errno == EINTR)
+ continue;
+ return ret;
+ }
+ wf_writeBufCnt -= ret;
+ bp += ret;
+ }
+ return ret;
+}
+
+
/*
* write_file does not allow incomplete writes. It loops internally
* until len bytes are written or errno is set.
{
int ret = 0;
- while (len>0) {
+ while (len > 0) {
int r1;
if (sparse_files) {
int len1 = MIN(len, SPARSE_WRITE_SIZE);
r1 = write_sparse(f, buf, len1);
} else {
- r1 = write(f, buf, len);
+ if (!wf_writeBuf) {
+ wf_writeBufSize = WRITE_SIZE * 8;
+ wf_writeBufCnt = 0;
+ wf_writeBuf = new_array(char, wf_writeBufSize);
+ if (!wf_writeBuf)
+ out_of_memory("write_file");
+ }
+ r1 = MIN(len, wf_writeBufSize - wf_writeBufCnt);
+ if (r1) {
+ memcpy(wf_writeBuf + wf_writeBufCnt, buf, r1);
+ wf_writeBufCnt += r1;
+ }
+ if (wf_writeBufCnt == wf_writeBufSize) {
+ if (flush_write_file(f) < 0)
+ return -1;
+ if (!r1 && len)
+ continue;
+ }
}
if (r1 <= 0) {
- if (ret > 0) return ret;
+ if (ret > 0)
+ return ret;
return r1;
}
len -= r1;
}
-
/* 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
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;
- map = (struct map_struct *)malloc(sizeof(*map));
- 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->p = NULL;
- map->p_size = 0;
- map->p_offset = 0;
- map->p_fd_offset = 0;
- map->p_len = 0;
+ map->def_window_size = MAX(MAX_MAP_SIZE, block_size * 32);
return map;
}
+
/* slide the read window in the file */
char *map_ptr(struct map_struct *map,OFF_T offset,int len)
{
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)) {
}
/* in most cases the region will already be available */
- if (offset >= map->p_offset &&
+ if (offset >= map->p_offset &&
offset+len <= map->p_offset+map->p_len) {
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;
} 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 = (char *)Realloc(map->p, window_size);
- if (!map->p) out_of_memory("map_ptr");
+ map->p = realloc_array(map->p, char, window_size);
+ if (!map->p)
+ out_of_memory("map_ptr");
map->p_size = window_size;
}
}
if ((nread=read(map->fd,map->p + read_offset,read_size)) != read_size) {
- if (nread < 0) nread = 0;
+ if (nread < 0) {
+ nread = 0;
+ if (!map->status)
+ map->status = errno;
+ }
/* the best we can do is zero the buffer - the file
has changed mid transfer! */
memset(map->p+read_offset+nread, 0, read_size - nread);
map->p_offset = window_start;
map->p_len = window_size;
-
- return map->p + (offset - map->p_offset);
+
+ return map->p + (offset - map->p_offset);
}
-void unmap_file(struct map_struct *map)
+int unmap_file(struct map_struct *map)
{
+ int ret;
+
if (map->p) {
free(map->p);
map->p = NULL;
}
- memset(map, 0, sizeof(*map));
+ ret = map->status;
+ memset(map, 0, sizeof map[0]);
free(map);
-}
+ return ret;
+}