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
some large systematic changes to make socket conversion easier. The
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
1b2fb22
..
f5816ed
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-113,7
+113,7
@@
static void check_timeout(void)
t = time(NULL);
if (last_io && io_timeout && (t-last_io)>io_timeout) {
t = time(NULL);
if (last_io && io_timeout && (t-last_io)>io_timeout) {
-
f
printf(FERROR,"read timeout after %d second - exiting\n",
+
r
printf(FERROR,"read timeout after %d second - exiting\n",
(int)(t-last_io));
exit_cleanup(1);
}
(int)(t-last_io));
exit_cleanup(1);
}
@@
-164,13
+164,13
@@
static int readfd(int fd,char *buffer,int N)
}
}
-int read_int(int f)
+int
32
read_int(int f)
{
int ret;
char b[4];
if ((ret=readfd(f,b,4)) != 4) {
if (verbose > 1)
{
int ret;
char b[4];
if ((ret=readfd(f,b,4)) != 4) {
if (verbose > 1)
-
f
printf(FERROR,"(%d) Error reading %d bytes : %s\n",
+
r
printf(FERROR,"(%d) Error reading %d bytes : %s\n",
getpid(),4,ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
getpid(),4,ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
@@
-185,16
+185,16
@@
int64 read_longint(int f)
char b[8];
ret = read_int(f);
char b[8];
ret = read_int(f);
- if (
ret != -1
) return ret;
+ if (
(int32)ret != (int32)0xffffffff
) return ret;
-#if
ndef HAVE_LONGLONG
-
f
printf(FERROR,"Integer overflow - attempted 64 bit offset\n");
+#if
def NO_INT64
+
r
printf(FERROR,"Integer overflow - attempted 64 bit offset\n");
exit_cleanup(1);
#else
if (remote_version >= 16) {
if ((ret=readfd(f,b,8)) != 8) {
if (verbose > 1)
exit_cleanup(1);
#else
if (remote_version >= 16) {
if ((ret=readfd(f,b,8)) != 8) {
if (verbose > 1)
-
f
printf(FERROR,"(%d) Error reading %d bytes : %s\n",
+
r
printf(FERROR,"(%d) Error reading %d bytes : %s\n",
getpid(),8,ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
getpid(),8,ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
@@
-211,7
+211,7
@@
void read_buf(int f,char *buf,int len)
int ret;
if ((ret=readfd(f,buf,len)) != len) {
if (verbose > 1)
int ret;
if ((ret=readfd(f,buf,len)) != len) {
if (verbose > 1)
-
f
printf(FERROR,"(%d) Error reading %d bytes : %s\n",
+
r
printf(FERROR,"(%d) Error reading %d bytes : %s\n",
getpid(),len,ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
getpid(),len,ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
@@
-237,45
+237,66
@@
static int last_sparse;
int sparse_end(int f)
{
int sparse_end(int f)
{
- if (last_sparse) {
- lseek(f,-1,SEEK_CUR);
- return (write(f,&last_byte,1) == 1 ? 0 : -1);
- }
- last_sparse = 0;
- return 0;
+
if (last_sparse) {
+
do_
lseek(f,-1,SEEK_CUR);
+
return (write(f,&last_byte,1) == 1 ? 0 : -1);
+
}
+
last_sparse = 0;
+
return 0;
}
}
-int write_sparse(int f,char *buf,int len)
+
+static int write_sparse(int f,char *buf,int len)
{
{
- int l1=0,l2=0;
- int ret;
+
int l1=0,l2=0;
+
int ret;
- if (!sparse_files)
-
return write(f,buf,len)
;
+ 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_byte = buf[len-1];
+ if (l1 == len || l2 > 0)
+ last_sparse=1;
-
if (l1 == len || l2
> 0)
- last_sparse=1;
+
if (l1
> 0)
+ do_lseek(f,l1,SEEK_CUR);
- if (l1 > 0)
- lseek(f,l1,SEEK_CUR);
+ 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;
+ return (l1+ret);
+ }
- if ((ret=write(f,buf+l1,len-(l1+l2))) != len-(l1+l2)) {
- if (ret == -1 || ret == 0) return ret;
- return (l1+ret);
- }
+ if (l2 > 0)
+ do_lseek(f,l2,SEEK_CUR);
+
+ return len;
+}
+
+
+
+int write_file(int f,char *buf,int len)
+{
+ int ret = 0;
- if (l2 > 0)
-
lseek(f,l2,SEEK_CUR
);
+ if (!sparse_files)
+
return write(f,buf,len
);
- return len;
+ while (len>0) {
+ int len1 = MIN(len, SPARSE_WRITE_SIZE);
+ int r1 = write_sparse(f, buf, len1);
+ if (r1 <= 0) {
+ if (ret > 0) return ret;
+ return r1;
+ }
+ len -= r1;
+ buf += r1;
+ ret += r1;
+ }
+ return ret;
}
}
@@
-303,7
+324,7
@@
static int writefd(int fd,char *buf,int len)
systems it seems (eg. IRIX) */
u_sleep(1000);
#if 0
systems it seems (eg. IRIX) */
u_sleep(1000);
#if 0
-
f
printf(FERROR,"write exception\n");
+
r
printf(FERROR,"write exception\n");
exit_cleanup(1);
#endif
}
exit_cleanup(1);
#endif
}
@@
-330,7
+351,7
@@
static int writefd(int fd,char *buf,int len)
&w_fds,NULL,&tv);
if (count == -1 && errno != EINTR) {
if (verbose > 1)
&w_fds,NULL,&tv);
if (count == -1 && errno != EINTR) {
if (verbose > 1)
-
f
printf(FERROR,"select error: %s\n", strerror(errno));
+
r
printf(FERROR,"select error: %s\n", strerror(errno));
exit_cleanup(1);
}
exit_cleanup(1);
}
@@
-355,13
+376,13
@@
static int writefd(int fd,char *buf,int len)
-void write_int(int f,int x)
+void write_int(int f,int
32
x)
{
int ret;
char b[4];
SIVAL(b,0,x);
if ((ret=writefd(f,b,4)) != 4) {
{
int ret;
char b[4];
SIVAL(b,0,x);
if ((ret=writefd(f,b,4)) != 4) {
-
f
printf(FERROR,"write_int failed : %s\n",
+
r
printf(FERROR,"write_int failed : %s\n",
ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
@@
-384,7
+405,7
@@
void write_longint(int f, int64 x)
SIVAL(b,4,((x>>32)&0xFFFFFFFF));
if ((ret=writefd(f,b,8)) != 8) {
SIVAL(b,4,((x>>32)&0xFFFFFFFF));
if ((ret=writefd(f,b,8)) != 8) {
-
f
printf(FERROR,"write_longint failed : %s\n",
+
r
printf(FERROR,"write_longint failed : %s\n",
ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
@@
-395,7
+416,7
@@
void write_buf(int f,char *buf,int len)
{
int ret;
if ((ret=writefd(f,buf,len)) != len) {
{
int ret;
if ((ret=writefd(f,buf,len)) != len) {
-
f
printf(FERROR,"write_buf failed : %s\n",
+
r
printf(FERROR,"write_buf failed : %s\n",
ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}