time_t t;
err_list_push();
-
+
if (!io_timeout) return;
if (!last_io) {
while (len) {
n = len;
- if (n > (sizeof(buf)-1))
- n = sizeof(buf)-1;
+ if (n > (sizeof buf - 1))
+ n = sizeof buf - 1;
read_loop(fd, buf, n);
rwrite((enum logcode)tag, buf, n);
len -= n;
* program where that is a problem (start_socket_client),
* kludge_around_eof is True and we just exit.
*/
-static void whine_about_eof (void)
+static void whine_about_eof(void)
{
if (kludge_around_eof)
- exit_cleanup (0);
+ exit_cleanup(0);
else {
- rprintf (FERROR,
- "%s: connection unexpectedly closed "
- "(%.0f bytes read so far)\n",
- RSYNC_NAME, (double)stats.total_read);
-
- exit_cleanup (RERR_STREAMIO);
+ rprintf(FERROR,
+ "%s: connection unexpectedly closed "
+ "(%.0f bytes read so far)\n",
+ RSYNC_NAME, (double)stats.total_read);
+
+ exit_cleanup(RERR_STREAMIO);
}
}
-static void die_from_readerr (int err)
+static void die_from_readerr(int err)
{
/* this prevents us trying to write errors on a dead socket */
io_multiplexing_close();
-
+
rprintf(FERROR, "%s: read error: %s\n",
- RSYNC_NAME, strerror (err));
+ RSYNC_NAME, strerror(err));
exit_cleanup(RERR_STREAMIO);
}
* give a better explanation. We can tell whether the connection has
* started by looking e.g. at whether the remote version is known yet.
*/
-static int read_timeout (int fd, char *buf, size_t len)
+static int read_timeout(int fd, char *buf, size_t len)
{
int n, ret=0;
continue;
}
-
if (io_error_fd != -1 && FD_ISSET(io_error_fd, &r_fds)) {
read_error_fd();
}
last_io = time(NULL);
continue;
} else if (n == 0) {
- whine_about_eof ();
+ whine_about_eof();
return -1; /* doesn't return */
} else if (n == -1) {
if (errno == EINTR || errno == EWOULDBLOCK ||
errno == EAGAIN)
continue;
- else
- die_from_readerr (errno);
+ die_from_readerr(errno);
}
}
extern int io_timeout;
extern int eol_nulls;
extern char *remote_filesfrom_file;
- extern int am_server;
- int reading_remotely = remote_filesfrom_file || (am_server && fd == 0);
+ int reading_remotely = remote_filesfrom_file != NULL;
int nulls = eol_nulls || reading_remotely;
start:
}
*s = '\0';
- /* Dump comments. */
- if (*fname == '#' || *fname == ';')
+ /* Dump comments if reading locally. */
+ if (!reading_remotely && (*fname == '#' || *fname == ';'))
goto start;
return s - fname;
* Continue trying to read len bytes - don't return until len has been
* read.
**/
-static void read_loop (int fd, char *buf, size_t len)
+static void read_loop(int fd, char *buf, size_t len)
{
while (len) {
int n = read_timeout(fd, buf, len);
exit_cleanup(RERR_STREAMIO);
}
- if (remaining > sizeof(line) - 1) {
- rprintf(FERROR, "multiplexing overflow %d\n\n",
- remaining);
+ if (remaining > sizeof line - 1) {
+ rprintf(FERROR, "multiplexing overflow %ld\n\n",
+ (long)remaining);
exit_cleanup(RERR_STREAMIO);
}
* have been read. If all @p n can't be read then exit with an
* error.
**/
-static void readfd (int fd, char *buffer, size_t N)
+static void readfd(int fd, char *buffer, size_t N)
{
int ret;
size_t total=0;
-
+
while (total < N) {
io_flush();
- ret = read_unbuffered (fd, buffer + total, N-total);
+ ret = read_unbuffered(fd, buffer + total, N-total);
total += ret;
}
int64 read_longint(int f)
{
- extern int remote_version;
int64 ret;
char b[8];
ret = read_int(f);
rprintf(FERROR,"Integer overflow - attempted 64 bit offset\n");
exit_cleanup(RERR_UNSUPPORTED);
#else
- if (remote_version >= 16) {
- readfd(f,b,8);
- ret = IVAL(b,0) | (((int64)IVAL(b,4))<<32);
- }
+ readfd(f,b,8);
+ ret = IVAL(b,0) | (((int64)IVAL(b,4))<<32);
#endif
return ret;
void read_sbuf(int f,char *buf,size_t len)
{
- read_buf (f,buf,len);
+ read_buf(f,buf,len);
buf[len] = 0;
}
unsigned char read_byte(int f)
{
unsigned char c;
- read_buf (f, (char *)&c, 1);
+ read_buf(f, (char *)&c, 1);
return c;
}
assert(bytes_written > 0);
assert(bwlimit > 0);
-
+
tv.tv_usec = bytes_written * 1000 / bwlimit;
tv.tv_sec = tv.tv_usec / 1000000;
tv.tv_usec = tv.tv_usec % 1000000;
{
if (io_buffer) return;
multiplex_out_fd = fd;
- io_buffer = (char *)malloc(IO_BUFFER_SIZE);
+ io_buffer = new_array(char, IO_BUFFER_SIZE);
if (!io_buffer) out_of_memory("writefd");
io_buffer_count = 0;
}
SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len);
- if (n > (sizeof(buffer)-4)) {
- n = sizeof(buffer)-4;
+ if (n > (sizeof buffer - 4)) {
+ n = sizeof buffer - 4;
}
memcpy(&buffer[4], buf, n);
len -= n;
io_buffer_count += n;
}
-
+
if (io_buffer_count == IO_BUFFER_SIZE) io_flush();
}
}
*/
void write_longint(int f, int64 x)
{
- extern int remote_version;
char b[8];
- if (remote_version < 16 || x <= 0x7FFFFFFF) {
+ if (x <= 0x7FFFFFFF) {
write_int(f, (int)x);
return;
}
va_list ap;
char buf[1024];
int len;
-
+
va_start(ap, format);
- len = vsnprintf(buf, sizeof(buf), format, ap);
+ len = vsnprintf(buf, sizeof buf, format, ap);
va_end(ap);
if (len < 0) exit_cleanup(RERR_STREAMIO);