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
Improve error handling and get rid of a lingering fprintf().
[rsync/rsync.git]
/
fileio.c
diff --git
a/fileio.c
b/fileio.c
index
5a3bf35
..
0faa619
100644
(file)
--- a/
fileio.c
+++ b/
fileio.c
@@
-3,11
+3,11
@@
*
* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool
*
* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004
, 2005, 2006
Wayne Davison
+ * 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
*
* 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
+ * 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,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-16,11
+16,11
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* 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.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
*/
#include "rsync.h"
+#include "inums.h"
#ifndef ENODATA
#define ENODATA EAGAIN
#ifndef ENODATA
#define ENODATA EAGAIN
@@
-29,47
+29,55
@@
extern int sparse_files;
static char last_byte;
extern int sparse_files;
static char last_byte;
-static
int last_sparse
;
+static
OFF_T sparse_seek = 0
;
int sparse_end(int f)
{
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, in
t 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++) {}
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];
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;
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;
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;
}
return len;
}
@@
-101,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.
*/
* 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, in
t len)
{
int ret = 0;
while (len > 0) {
int r1;
{
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 {
int len1 = MIN(len, SPARSE_WRITE_SIZE);
r1 = write_sparse(f, buf, len1);
} else {
@@
-118,7
+126,7
@@
int write_file(int f,char *buf,size_t len)
if (!wf_writeBuf)
out_of_memory("write_file");
}
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;
if (r1) {
memcpy(wf_writeBuf + wf_writeBufCnt, buf, r1);
wf_writeBufCnt += r1;
@@
-152,13
+160,12
@@
struct map_struct *map_file(int fd, OFF_T len, int32 read_size,
{
struct map_struct *map;
{
struct map_struct *map;
- if (!(map = new(struct map_struct)))
+ if (!(map = new
0
(struct map_struct)))
out_of_memory("map_file");
if (blk_size && (read_size % blk_size))
read_size += blk_size - (read_size % blk_size);
out_of_memory("map_file");
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 = read_size;
map->fd = fd;
map->file_size = len;
map->def_window_size = read_size;
@@
-190,7
+197,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_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;
if (len > window_size)
window_size = len;
@@
-208,7
+215,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;
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 {
read_size = window_size - read_offset;
memmove(map->p, map->p + (map->p_len - read_offset), read_offset);
} else {
@@
-226,8
+233,8
@@
char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
if (map->p_fd_offset != read_start) {
OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET);
if (ret != read_start) {
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 %
.0f, not %.0f
",
-
(double)ret, (double)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 = read_start;
exit_cleanup(RERR_FILEIO);
}
map->p_fd_offset = read_start;