From 93d26e4cb9cec2eb8abb4f37e6dda2c86fcceeac Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Mon, 8 Jan 2007 15:58:08 +0000 Subject: short i/o: fix calls to read to use xread or read_in_full We have a number of badly checked read() calls. Often we are expecting read() to read exactly the size we requested or fail, this fails to handle interrupts or short reads. Add a read_in_full() providing those semantics. Otherwise we at a minimum need to check for EINTR and EAGAIN, where this is appropriate use xread(). Signed-off-by: Andy Whitcroft Signed-off-by: Junio C Hamano --- ssh-fetch.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'ssh-fetch.c') diff --git a/ssh-fetch.c b/ssh-fetch.c index b006c5c980..72965d678a 100644 --- a/ssh-fetch.c +++ b/ssh-fetch.c @@ -82,7 +82,7 @@ int fetch(unsigned char *sha1) remote = conn_buf[0]; memmove(conn_buf, conn_buf + 1, --conn_buf_posn); } else { - if (read(fd_in, &remote, 1) < 1) + if (xread(fd_in, &remote, 1) < 1) return -1; } /* fprintf(stderr, "Got %d\n", remote); */ @@ -99,7 +99,7 @@ static int get_version(void) char type = 'v'; write(fd_out, &type, 1); write(fd_out, &local_version, 1); - if (read(fd_in, &remote_version, 1) < 1) { + if (xread(fd_in, &remote_version, 1) < 1) { return error("Couldn't read version from remote end"); } return 0; @@ -111,10 +111,13 @@ int fetch_ref(char *ref, unsigned char *sha1) char type = 'r'; write(fd_out, &type, 1); write(fd_out, ref, strlen(ref) + 1); - read(fd_in, &remote, 1); + + if (read_in_full(fd_in, &remote, 1) != 1) + return -1; if (remote < 0) return remote; - read(fd_in, sha1, 20); + if (read_in_full(fd_in, sha1, 20) != 20) + return -1; return 0; } -- cgit v1.2.3