t = time(NULL);
if (last_io && io_timeout && (t-last_io)>io_timeout) {
- fprintf(FERROR,"read timeout after %d second - exiting\n",
+ rprintf(FERROR,"read timeout after %d second - exiting\n",
(int)(t-last_io));
exit_cleanup(1);
}
tv.tv_sec = io_timeout;
tv.tv_usec = 0;
- if (select(fd+1, &fds, NULL, NULL, &tv) != 1) {
+ if (select(fd+1, &fds, NULL, NULL,
+ io_timeout?&tv:NULL) != 1) {
check_timeout();
}
}
}
-int read_int(int f)
+int32 read_int(int f)
{
int ret;
char b[4];
if ((ret=readfd(f,b,4)) != 4) {
if (verbose > 1)
- fprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
+ rprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
getpid(),4,ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
char b[8];
ret = read_int(f);
- if (ret != -1) return ret;
+ if ((int32)ret != (int32)0xffffffff) return ret;
-#ifndef HAVE_LONGLONG
- fprintf(FERROR,"Integer overflow - attempted 64 bit offset\n");
+#ifdef NO_INT64
+ rprintf(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)
- fprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
+ rprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
getpid(),8,ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
int ret;
if ((ret=readfd(f,buf,len)) != len) {
if (verbose > 1)
- fprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
+ rprintf(FERROR,"(%d) Error reading %d bytes : %s\n",
getpid(),len,ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
int sparse_end(int f)
{
if (last_sparse) {
- lseek(f,-1,SEEK_CUR);
+ do_lseek(f,-1,SEEK_CUR);
return (write(f,&last_byte,1) == 1 ? 0 : -1);
}
last_sparse = 0;
last_sparse=1;
if (l1 > 0)
- lseek(f,l1,SEEK_CUR);
+ do_lseek(f,l1,SEEK_CUR);
if (l1 == len)
return len;
}
if (l2 > 0)
- lseek(f,l2,SEEK_CUR);
+ do_lseek(f,l2,SEEK_CUR);
return len;
}
}
-static int writefd(int fd,char *buf,int len)
+static int writefd_unbuffered(int fd,char *buf,int len)
{
int total = 0;
fd_set w_fds, r_fds;
systems it seems (eg. IRIX) */
u_sleep(1000);
#if 0
- fprintf(FERROR,"write exception\n");
+ rprintf(FERROR,"write exception\n");
exit_cleanup(1);
#endif
}
&w_fds,NULL,&tv);
if (count == -1 && errno != EINTR) {
if (verbose > 1)
- fprintf(FERROR,"select error: %s\n", strerror(errno));
+ rprintf(FERROR,"select error: %s\n", strerror(errno));
exit_cleanup(1);
}
return total;
}
+static char *io_buffer;
+static int io_buffer_count;
+
+void io_start_buffering(int fd)
+{
+ io_buffer = (char *)malloc(IO_BUFFER_SIZE);
+ if (!io_buffer) out_of_memory("writefd");
+ io_buffer_count = 0;
+}
+
+void io_end_buffering(int fd)
+{
+ if (io_buffer_count) {
+ if (writefd_unbuffered(fd, io_buffer,
+ io_buffer_count) !=
+ io_buffer_count) {
+ rprintf(FERROR,"write failed\n");
+ exit_cleanup(1);
+ }
+ io_buffer_count = 0;
+ }
+ free(io_buffer);
+ io_buffer = NULL;
+}
+
+static int writefd(int fd,char *buf,int len1)
+{
+ int len = len1;
+
+ if (!io_buffer) return writefd_unbuffered(fd, buf, len);
+
+ while (len) {
+ int n = MIN(len, IO_BUFFER_SIZE-io_buffer_count);
+ if (n > 0) {
+ memcpy(io_buffer+io_buffer_count, buf, n);
+ buf += n;
+ len -= n;
+ io_buffer_count += n;
+ }
+
+ if (io_buffer_count == IO_BUFFER_SIZE) {
+ if (writefd_unbuffered(fd, io_buffer,
+ io_buffer_count) !=
+ io_buffer_count) {
+ return -1;
+ }
+ io_buffer_count = 0;
+ }
+ }
+
+ return len1;
+}
-void write_int(int f,int x)
+void write_int(int f,int32 x)
{
int ret;
char b[4];
SIVAL(b,0,x);
if ((ret=writefd(f,b,4)) != 4) {
- fprintf(FERROR,"write_int failed : %s\n",
+ rprintf(FERROR,"write_int failed : %s\n",
ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
SIVAL(b,4,((x>>32)&0xFFFFFFFF));
if ((ret=writefd(f,b,8)) != 8) {
- fprintf(FERROR,"write_longint failed : %s\n",
+ rprintf(FERROR,"write_longint failed : %s\n",
ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
{
int ret;
if ((ret=writefd(f,buf,len)) != len) {
- fprintf(FERROR,"write_buf failed : %s\n",
+ rprintf(FERROR,"write_buf failed : %s\n",
ret==-1?strerror(errno):"EOF");
exit_cleanup(1);
}
total_written += len;
}
+/* write a string to the connection */
+void write_sbuf(int f,char *buf)
+{
+ write_buf(f, buf, strlen(buf));
+}
+
void write_byte(int f,unsigned char c)
{
- write_buf(f,(char *)&c,1);
+ write_buf(f,(char *)&c,1);
}
void write_flush(int f)
}
+int read_line(int f, char *buf, int maxlen)
+{
+ while (maxlen) {
+ read_buf(f, buf, 1);
+ if (buf[0] == '\n') {
+ buf[0] = 0;
+ break;
+ }
+ if (buf[0] != '\r') {
+ buf++;
+ maxlen--;
+ }
+ }
+ if (maxlen == 0) {
+ *buf = 0;
+ return 0;
+ }
+ return 1;
+}
+
+
+void io_printf(int fd, const char *format, ...)
+{
+ va_list ap;
+ char buf[1024];
+ int len;
+
+ va_start(ap, format);
+ len = vslprintf(buf, sizeof(buf)-1, format, ap);
+ va_end(ap);
+
+ if (len < 0) exit_cleanup(1);
+
+ write_sbuf(fd, buf);
+}