X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7aac6604c4642b93b619ac03c56e9877437bcce3..b3bf9b9df95137a3a43248be9599d919b04877af:/fileio.c diff --git a/fileio.c b/fileio.c index 11498164..0faa6195 100644 --- a/fileio.c +++ b/fileio.c @@ -1,71 +1,83 @@ /* - 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. + * + * Copyright (C) 1998 Andrew Tridgell + * Copyright (C) 2002 Martin Pool + * Copyright (C) 2004-2009 Wayne Davison + * + * 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 3 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, visit the http://fsf.org website. + */ -/* - File IO utilities used in rsync - */ #include "rsync.h" +#include "inums.h" + +#ifndef ENODATA +#define ENODATA EAGAIN +#endif extern int sparse_files; static char last_byte; -static int last_sparse; +static OFF_T sparse_seek = 0; int sparse_end(int f) { - if (last_sparse) { - do_lseek(f,-1,SEEK_CUR); - return (write(f,&last_byte,1) == 1 ? 0 : -1); - } - last_sparse = 0; - return 0; + int ret; + + if (!sparse_seek) + return 0; + + do_lseek(f, sparse_seek-1, SEEK_CUR); + sparse_seek = 0; + + do { + ret = write(f, "", 1); + } while (ret < 0 && errno == EINTR); + + return ret <= 0 ? -1 : 0; } -static int write_sparse(int f,char *buf,size_t len) +static int write_sparse(int f, char *buf, int len) { - size_t l1=0, l2=0; + int 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++) {} + /* XXX Riddle me this: why does this function SLOW DOWN when I + * remove the following (unneeded) line?? Core Duo weirdness? */ last_byte = buf[len-1]; - if (l1 == len || l2 > 0) - last_sparse=1; - - if (l1 > 0) { - do_lseek(f,l1,SEEK_CUR); - } + sparse_seek += l1; if (l1 == len) return len; - ret = write(f, buf + l1, len - (l1+l2)); - if (ret == -1 || ret == 0) + if (sparse_seek) + do_lseek(f, sparse_seek, SEEK_CUR); + sparse_seek = l2; + + while ((ret = write(f, buf + l1, len - (l1+l2))) <= 0) { + if (ret < 0 && errno == EINTR) + continue; return ret; - else if (ret != (int) (len - (l1+l2))) - return (l1+ret); + } - if (l2 > 0) - do_lseek(f,l2,SEEK_CUR); + if (ret != (int)(len - (l1+l2))) + return l1+ret; return len; } @@ -97,13 +109,13 @@ int flush_write_file(int f) * write_file does not allow incomplete writes. It loops internally * until len bytes are written or errno is set. */ -int write_file(int f,char *buf,size_t len) +int write_file(int f, char *buf, int len) { int ret = 0; 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 { @@ -114,7 +126,7 @@ int write_file(int f,char *buf,size_t len) if (!wf_writeBuf) out_of_memory("write_file"); } - r1 = MIN(len, wf_writeBufSize - wf_writeBufCnt); + r1 = (int)MIN((size_t)len, wf_writeBufSize - wf_writeBufCnt); if (r1) { memcpy(wf_writeBuf + wf_writeBufCnt, buf, r1); wf_writeBufCnt += r1; @@ -143,21 +155,20 @@ int write_file(int f,char *buf,size_t len) * 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, OFF_T map_size, +struct map_struct *map_file(int fd, OFF_T len, int32 read_size, int32 blk_size) { struct map_struct *map; - if (!(map = new(struct map_struct))) + if (!(map = new0(struct map_struct))) out_of_memory("map_file"); - if (blk_size && (map_size % blk_size)) - map_size += blk_size - (map_size % blk_size); + if (blk_size && (read_size % blk_size)) + read_size += blk_size - (read_size % blk_size); - memset(map, 0, sizeof map[0]); map->fd = fd; map->file_size = len; - map->def_window_size = map_size; + map->def_window_size = read_size; return map; } @@ -166,16 +177,17 @@ struct map_struct *map_file(int fd, OFF_T len, OFF_T map_size, /* slide the read window in the file */ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len) { - int nread; + int32 nread; OFF_T window_start, read_start; - int window_size, read_size, read_offset; + int32 window_size, read_size, read_offset; if (len == 0) return NULL; - - /* can't go beyond the end of file */ - if (len > map->file_size - offset) - len = map->file_size - offset; + if (len < 0) { + rprintf(FERROR, "invalid len passed to map_ptr: %ld\n", + (long)len); + exit_cleanup(RERR_FILEIO); + } /* in most cases the region will already be available */ if (offset >= map->p_offset && offset+len <= map->p_offset+map->p_len) @@ -184,11 +196,10 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len) /* nope, we are going to have to do a read. Work out our desired window */ window_start = offset; window_size = map->def_window_size; - if (window_start + window_size > map->file_size) { - window_size = map->file_size - window_start; - } - if (offset + len > window_start + window_size) - window_size = (offset+len) - window_start; + if (window_start + window_size > map->file_size) + window_size = (int32)(map->file_size - window_start); + if (len > window_size) + window_size = len; /* make sure we have allocated enough memory for the window */ if (window_size > map->p_size) { @@ -198,13 +209,13 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len) map->p_size = window_size; } - /* now try to avoid re-reading any bytes by reusing any bytes from the previous - buffer. */ + /* Now try to avoid re-reading any bytes by reusing any bytes + * from the previous buffer. */ if (window_start >= map->p_offset && 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 { @@ -214,33 +225,39 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len) } if (read_size <= 0) { - rprintf(FINFO,"Warning: unexpected read size of %d in map_ptr\n", read_size); - } else { - if (map->p_fd_offset != read_start) { - if (do_lseek(map->fd,read_start,SEEK_SET) != read_start) { - rprintf(FERROR,"lseek failed in map_ptr\n"); - exit_cleanup(RERR_FILEIO); - } - map->p_fd_offset = read_start; - } + rprintf(FERROR, "invalid read_size of %ld in map_ptr\n", + (long)read_size); + exit_cleanup(RERR_FILEIO); + } - if ((nread=read(map->fd,map->p + read_offset,read_size)) != read_size) { - 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); + if (map->p_fd_offset != read_start) { + OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET); + if (ret != read_start) { + rsyserr(FERROR, errno, "lseek returned %s, not %s", + big_num(ret), big_num(read_start)); + exit_cleanup(RERR_FILEIO); } - map->p_fd_offset += nread; + map->p_fd_offset = read_start; } - map->p_offset = window_start; map->p_len = window_size; - return map->p + (offset - map->p_offset); + while (read_size > 0) { + nread = read(map->fd, map->p + read_offset, read_size); + if (nread <= 0) { + if (!map->status) + map->status = nread ? errno : ENODATA; + /* The best we can do is zero the buffer -- the file + * has changed mid transfer! */ + memset(map->p + read_offset, 0, read_size); + break; + } + map->p_fd_offset += nread; + read_offset += nread; + read_size -= nread; + } + + return map->p; }