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
indent -kr -i8
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
a451c13
..
6085745
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-49,7
+49,7
@@
int kludge_around_eof = False;
static int io_error_fd = -1;
static int io_error_fd = -1;
-static void read_loop(int fd, char *buf,
in
t len);
+static void read_loop(int fd, char *buf,
size_
t len);
static void check_timeout(void)
{
static void check_timeout(void)
{
@@
-163,7
+163,7
@@
static void die_from_readerr (int err)
* give a better explanation. We can tell whether the connection has
* started by looking e.g. at whether the remote version is known yet.
*/
* 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,
in
t len)
+static int read_timeout (int fd, char *buf,
size_
t len)
{
int n, ret=0;
{
int n, ret=0;
@@
-174,6
+174,7
@@
static int read_timeout (int fd, char *buf, int len)
fd_set fds;
struct timeval tv;
int fd_count = fd+1;
fd_set fds;
struct timeval tv;
int fd_count = fd+1;
+ int count;
FD_ZERO(&fds);
FD_SET(fd, &fds);
FD_ZERO(&fds);
FD_SET(fd, &fds);
@@
-187,11
+188,16
@@
static int read_timeout (int fd, char *buf, int len)
errno = 0;
errno = 0;
- if (select(fd_count, &fds, NULL, NULL, &tv) < 1) {
+ count = select(fd_count, &fds, NULL, NULL, &tv);
+
+ if (count == 0) {
+ check_timeout();
+ }
+
+ if (count <= 0) {
if (errno == EBADF) {
exit_cleanup(RERR_SOCKETIO);
}
if (errno == EBADF) {
exit_cleanup(RERR_SOCKETIO);
}
- check_timeout();
continue;
}
continue;
}
@@
-230,7
+236,7
@@
static int read_timeout (int fd, char *buf, int len)
/*! Continue trying to read len bytes - don't return until len has
been read. */
/*! Continue trying to read len bytes - don't return until len has
been read. */
-static void read_loop (int fd, char *buf,
in
t len)
+static void read_loop (int fd, char *buf,
size_
t len)
{
while (len) {
int n = read_timeout(fd, buf, len);
{
while (len) {
int n = read_timeout(fd, buf, len);
@@
-247,10
+253,10
@@
static void read_loop (int fd, char *buf, int len)
*
* Never returns <= 0.
*/
*
* Never returns <= 0.
*/
-static int read_unbuffered(int fd, char *buf,
in
t len)
+static int read_unbuffered(int fd, char *buf,
size_
t len)
{
static int remaining;
{
static int remaining;
- int tag, ret
=
0;
+ int tag, ret
=
0;
char line[1024];
if (!io_multiplexing_in || fd != multiplex_in_fd)
char line[1024];
if (!io_multiplexing_in || fd != multiplex_in_fd)
@@
-265,23
+271,24
@@
static int read_unbuffered(int fd, char *buf, int len)
continue;
}
continue;
}
- read_loop
(fd, line, 4);
+ read_loop(fd, line, 4);
tag = IVAL(line, 0);
remaining = tag & 0xFFFFFF;
tag = tag >> 24;
tag = IVAL(line, 0);
remaining = tag & 0xFFFFFF;
tag = tag >> 24;
- if (tag == MPLEX_BASE) continue;
+ if (tag == MPLEX_BASE)
+ continue;
tag -= MPLEX_BASE;
if (tag != FERROR && tag != FINFO) {
tag -= MPLEX_BASE;
if (tag != FERROR && tag != FINFO) {
- rprintf(FERROR,"unexpected tag %d\n", tag);
+ rprintf(FERROR,
"unexpected tag %d\n", tag);
exit_cleanup(RERR_STREAMIO);
}
exit_cleanup(RERR_STREAMIO);
}
- if (remaining > sizeof(line)
-
1) {
- rprintf(FERROR,
"multiplexing overflow %d\n\n",
+ if (remaining > sizeof(line)
-
1) {
+ rprintf(FERROR,
"multiplexing overflow %d\n\n",
remaining);
exit_cleanup(RERR_STREAMIO);
}
remaining);
exit_cleanup(RERR_STREAMIO);
}
@@
-289,7
+296,7
@@
static int read_unbuffered(int fd, char *buf, int len)
read_loop(fd, line, remaining);
line[remaining] = 0;
read_loop(fd, line, remaining);
line[remaining] = 0;
- rprintf((enum logcode)
tag,
"%s", line);
+ rprintf((enum logcode)
tag,
"%s", line);
remaining = 0;
}
remaining = 0;
}
@@
-297,9
+304,10
@@
static int read_unbuffered(int fd, char *buf, int len)
}
}
+
/* do a buffered read from fd. don't return until all N bytes
have been read. If all N can't be read then exit with an error */
/* do a buffered read from fd. don't return until all N bytes
have been read. If all N can't be read then exit with an error */
-static void readfd (int fd, char *buffer,
in
t N)
+static void readfd (int fd, char *buffer,
size_
t N)
{
int ret;
int total=0;
{
int ret;
int total=0;
@@
-350,12
+358,12
@@
int64 read_longint(int f)
return ret;
}
return ret;
}
-void read_buf(int f,char *buf,
in
t len)
+void read_buf(int f,char *buf,
size_
t len)
{
readfd(f,buf,len);
}
{
readfd(f,buf,len);
}
-void read_sbuf(int f,char *buf,
in
t len)
+void read_sbuf(int f,char *buf,
size_
t len)
{
read_buf (f,buf,len);
buf[len] = 0;
{
read_buf (f,buf,len);
buf[len] = 0;
@@
-369,7
+377,7
@@
unsigned char read_byte(int f)
}
/* write len bytes to fd */
}
/* write len bytes to fd */
-static void writefd_unbuffered(int fd,char *buf,
in
t len)
+static void writefd_unbuffered(int fd,char *buf,
size_
t len)
{
int total = 0;
fd_set w_fds, r_fds;
{
int total = 0;
fd_set w_fds, r_fds;
@@
-402,11
+410,14
@@
static void writefd_unbuffered(int fd,char *buf,int len)
&w_fds,NULL,
&tv);
&w_fds,NULL,
&tv);
+ if (count == 0) {
+ check_timeout();
+ }
+
if (count <= 0) {
if (errno == EBADF) {
exit_cleanup(RERR_SOCKETIO);
}
if (count <= 0) {
if (errno == EBADF) {
exit_cleanup(RERR_SOCKETIO);
}
- check_timeout();
continue;
}
continue;
}
@@
-474,7
+485,7
@@
void io_start_buffering(int fd)
/* write an message to a multiplexed stream. If this fails then rsync
exits */
/* write an message to a multiplexed stream. If this fails then rsync
exits */
-static void mplex_write(int fd, enum logcode code, char *buf,
in
t len)
+static void mplex_write(int fd, enum logcode code, char *buf,
size_
t len)
{
char buffer[4096];
int n = len;
{
char buffer[4096];
int n = len;
@@
-524,7
+535,7
@@
void io_end_buffering(int fd)
}
}
}
}
-static void writefd(int fd,char *buf,
in
t len)
+static void writefd(int fd,char *buf,
size_
t len)
{
stats.total_written += len;
{
stats.total_written += len;
@@
-578,7
+589,7
@@
void write_longint(int f, int64 x)
writefd(f,b,8);
}
writefd(f,b,8);
}
-void write_buf(int f,char *buf,
in
t len)
+void write_buf(int f,char *buf,
size_
t len)
{
writefd(f,buf,len);
}
{
writefd(f,buf,len);
}
@@
-597,7
+608,7
@@
void write_byte(int f,unsigned char c)
-int read_line(int f, char *buf,
in
t maxlen)
+int read_line(int f, char *buf,
size_
t maxlen)
{
while (maxlen) {
buf[0] = 0;
{
while (maxlen) {
buf[0] = 0;
@@
-655,7
+666,7
@@
void io_start_multiplex_in(int fd)
}
/* write an message to the multiplexed error stream */
}
/* write an message to the multiplexed error stream */
-int io_multiplex_write(enum logcode code, char *buf,
in
t len)
+int io_multiplex_write(enum logcode code, char *buf,
size_
t len)
{
if (!io_multiplexing_out) return 0;
{
if (!io_multiplexing_out) return 0;