Handle EINTR in a couple places where we handle the --file-from I/O.

[rsync/rsync.git] / fileio.c

diff --git a/fileio.c b/fileio.c
index bef7603..432336c 100644 (file)
--- a/fileio.c
+++ b/fileio.c
@@ -1,25 +1,24 @@
 /*
-   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-2007 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * 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.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
-/*
-  File IO utilities used in rsync
-  */
 #include "rsync.h"
 
 #ifndef ENODATA
@@ -107,7 +106,7 @@ int write_file(int f,char *buf,size_t len)
 
        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 {
@@ -190,7 +189,7 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
        window_start = offset;
        window_size = map->def_window_size;
        if (window_start + window_size > map->file_size)
-               window_size = map->file_size - window_start;
+               window_size = (int32)(map->file_size - window_start);
        if (len > window_size)
                window_size = len;
 
@@ -208,7 +207,7 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
            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 {