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
Updated exit codes as Jon Jensen and J.W. suggested.
[rsync/rsync.git]
/
fileio.c
diff --git
a/fileio.c
b/fileio.c
index
c39d6b0
..
088ed63
100644
(file)
--- a/
fileio.c
+++ b/
fileio.c
@@
-1,5
+1,6
@@
/*
Copyright (C) Andrew Tridgell 1998
/*
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
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
@@
-36,9
+37,9
@@
int sparse_end(int f)
}
}
-static int write_sparse(int f,char *buf,
in
t len)
+static int write_sparse(int f,char *buf,
size_
t len)
{
{
-
int l1=0,
l2=0;
+
size_t l1=0,
l2=0;
int ret;
for (l1=0;l1<len && buf[l1]==0;l1++) ;
int ret;
for (l1=0;l1<len && buf[l1]==0;l1++) ;
@@
-56,10
+57,11
@@
static int write_sparse(int f,char *buf,int len)
if (l1 == len)
return len;
if (l1 == len)
return len;
- if ((ret=write(f,buf+l1,len-(l1+l2))) != len-(l1+l2)) {
- if (ret == -1 || ret == 0) return ret;
+ ret = write(f, buf + l1, len - (l1+l2));
+ if (ret == -1 || ret == 0)
+ return ret;
+ else if (ret != (int) (len - (l1+l2)))
return (l1+ret);
return (l1+ret);
- }
if (l2 > 0)
do_lseek(f,l2,SEEK_CUR);
if (l2 > 0)
do_lseek(f,l2,SEEK_CUR);
@@
-67,19
+69,22
@@
static int write_sparse(int f,char *buf,int len)
return len;
}
return len;
}
-
-
-int write_file(int f,char *buf,int len)
+/*
+ * 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 ret = 0;
{
int ret = 0;
- if (!sparse_files) {
- return write(f,buf,len);
- }
-
while (len>0) {
while (len>0) {
- int len1 = MIN(len, SPARSE_WRITE_SIZE);
- int r1 = write_sparse(f, buf, len1);
+ 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 (r1 <= 0) {
if (ret > 0) return ret;
return r1;
if (r1 <= 0) {
if (ret > 0) return ret;
return r1;
@@
-110,6
+115,7
@@
struct map_struct *map_file(int fd,OFF_T len)
map->p_offset = 0;
map->p_fd_offset = 0;
map->p_len = 0;
map->p_offset = 0;
map->p_fd_offset = 0;
map->p_len = 0;
+ map->status = 0;
return map;
}
return map;
}
@@
-186,7
+192,11
@@
char *map_ptr(struct map_struct *map,OFF_T offset,int len)
}
if ((nread=read(map->fd,map->p + read_offset,read_size)) != read_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);
/* 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);
@@
-201,13
+211,18
@@
char *map_ptr(struct map_struct *map,OFF_T offset,int len)
}
}
-
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;
}
if (map->p) {
free(map->p);
map->p = NULL;
}
+ ret = map->status;
memset(map, 0, sizeof(*map));
free(map);
memset(map, 0, sizeof(*map));
free(map);
+
+ return ret;
}
}