read_buffer_p += ret;
read_buffer_len -= ret;
} else {
- if ((ret = read(fd,buffer + total,N - total)) == -1)
- return -1;
+ while ((ret = read(fd,buffer + total,N - total)) == -1) {
+ fd_set fds;
+
+ if (errno != EAGAIN && errno != EWOULDBLOCK)
+ return -1;
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
+ select(fd+1, &fds, NULL, NULL, NULL);
+ }
}
if (ret <= 0)
if (verbose > 1)
fprintf(stderr,"Error reading %d bytes : %s\n",
4,ret==-1?strerror(errno):"EOF");
- exit(1);
+ exit_cleanup(1);
}
total_read += 4;
return IVAL(b,0);
if (verbose > 1)
fprintf(stderr,"Error reading %d bytes : %s\n",
len,ret==-1?strerror(errno):"EOF");
- exit(1);
+ exit_cleanup(1);
}
total_read += len;
}
return (unsigned char)c;
}
+
+static char last_byte=0;
+static int last_sparse = 0;
+
+int sparse_end(int f)
+{
+#if SPARSE_FILES
+ if (last_sparse) {
+ lseek(f,-1,SEEK_CUR);
+ return (write(f,&last_byte,1) == 1 ? 0 : -1);
+ }
+#endif
+ return 0;
+}
+
+int write_sparse(int f,char *buf,int len)
+{
+ int l=0;
+
+#if SPARSE_FILES
+ for (l=0;l<len && buf[l]==0;l++) ;
+
+ if (l > 0)
+ lseek(f,l,SEEK_CUR);
+
+ last_byte = buf[len-1];
+#endif
+
+ if (l == len) {
+ last_sparse = 1;
+ return len;
+ }
+
+ last_sparse = 0;
+
+ return (l + write(f,buf+l,len-l));
+}
+
int read_write(int fd_in,int fd_out,int size)
{
static char *buf=NULL;
- static int bufsize = WRITE_BLOCK_SIZE;
+ static int bufsize = CHUNK_SIZE;
int total=0;
if (!buf) {
while (total < size) {
int n = MIN(size-total,bufsize);
read_buf(fd_in,buf,n);
- if (write(fd_out,buf,n) != n)
+ if (write_sparse(fd_out,buf,n) != n)
return total;
total += n;
}
FD_SET(fd,&fds);
tv.tv_sec = BLOCKING_TIMEOUT;
tv.tv_usec = 0;
- select(16,NULL,&fds,NULL,&tv);
+ select(fd+1,NULL,&fds,NULL,&tv);
} else {
total += ret;
}
if ((ret=writefd(f,b,4)) != 4) {
fprintf(stderr,"write_int failed : %s\n",
ret==-1?strerror(errno):"EOF");
- exit(1);
+ exit_cleanup(1);
}
total_written += 4;
}
if ((ret=writefd(f,buf,len)) != len) {
fprintf(stderr,"write_buf failed : %s\n",
ret==-1?strerror(errno):"EOF");
- exit(1);
+ exit_cleanup(1);
}
total_written += len;
}