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
Signedness security patch from Sebastian Krahmer <krahmer@suse.de> --
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
e57d070
..
95fb73b
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;
@@
-236,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);
@@
-253,7
+253,7
@@
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;
int tag, ret=0;
{
static int remaining;
int tag, ret=0;
@@
-305,7
+305,7
@@
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;
@@
-356,12
+356,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;
@@
-375,7
+375,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;
@@
-483,7
+483,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;
@@
-533,7
+533,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;
@@
-587,7
+587,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);
}
@@
-606,7
+606,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;
@@
-664,7
+664,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;