{
int n;
+ if (f == -1) return;
+
if (read_buffer_len == 0) {
read_buffer_p = read_buffer;
}
if ((n=num_waiting(f)) <= 0)
return;
+ /* things could deteriorate if we read in really small chunks */
+ if (n < 10) n = 1024;
+
if (read_buffer_p != read_buffer) {
memmove(read_buffer,read_buffer_p,read_buffer_len);
read_buffer_p = read_buffer;
{
int ret;
int total=0;
+
+ if (read_buffer_len < N)
+ read_check(buffer_f_in);
while (total < N)
{
- if (read_buffer_len > 0) {
+ if (read_buffer_len > 0 && buffer_f_in == fd) {
ret = MIN(read_buffer_len,N-total);
memcpy(buffer+total,read_buffer_p,ret);
read_buffer_p += ret;
return len;
}
-int read_write(int fd_in,int fd_out,int size)
-{
- static char *buf=NULL;
- int bufsize = sparse_files?SPARSE_WRITE_SIZE:WRITE_SIZE;
- int total=0;
-
- if (!buf) {
- buf = (char *)malloc(bufsize);
- if (!buf) out_of_memory("read_write");
- }
-
- while (total < size) {
- int n = MIN(size-total,bufsize);
- read_buf(fd_in,buf,n);
- if (write_sparse(fd_out,buf,n) != n)
- return total;
- total += n;
- }
- return total;
-}
-
static int writefd(int fd,char *buf,int len)
{
int total = 0;
- fd_set fds;
+ fd_set w_fds, r_fds;
+ int fd_count, count, got_select=0;
struct timeval tv;
if (buffer_f_in == -1)
if (ret == -1 && !(errno == EWOULDBLOCK || errno == EAGAIN))
return -1;
+ if (ret == -1 && got_select) {
+ /* hmmm, we got a write select on the fd and then failed to write.
+ Why doesn't that mean that the fd is dead? It doesn't on some
+ systems it seems (eg. IRIX) */
+#if 0
+ fprintf(FERROR,"write exception\n");
+ exit_cleanup(1);
+#endif
+ }
+
+ got_select = 0;
+
+
if (ret == -1) {
read_check(buffer_f_in);
- FD_ZERO(&fds);
- FD_SET(fd,&fds);
+ fd_count = fd+1;
+ FD_ZERO(&w_fds);
+ FD_ZERO(&r_fds);
+ FD_SET(fd,&w_fds);
+ if (buffer_f_in != -1) {
+ FD_SET(buffer_f_in,&r_fds);
+ if (buffer_f_in > fd)
+ fd_count = buffer_f_in+1;
+ }
+
tv.tv_sec = BLOCKING_TIMEOUT;
tv.tv_usec = 0;
- select(fd+1,NULL,&fds,NULL,&tv);
+ count = select(fd_count,buffer_f_in == -1? NULL: &r_fds,
+ &w_fds,NULL,&tv);
+ if (count == -1 && errno != EINTR) {
+ if (verbose > 1)
+ fprintf(FERROR,"select error: %s\n", strerror(errno));
+ exit_cleanup(1);
+ }
+
+ if (count == 0) continue;
+
+ if (FD_ISSET(fd, &w_fds)) {
+ got_select = 1;
+ }
} else {
total += ret;
}