diff options
| author | Andy Whitcroft <apw@shadowen.org> | 2007-01-08 18:58:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-09 02:44:47 +0300 |
| commit | 93d26e4cb9cec2eb8abb4f37e6dda2c86fcceeac (patch) | |
| tree | 8d3cda91ddd8242531995cb304f37578bfaa7cf0 /upload-pack.c | |
| parent | e08140568a131bcd26e64a0bc8188040847be998 (diff) | |
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 <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c index c568ef066c..03a4156e19 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -242,7 +242,7 @@ static void create_pack_file(void) *cp++ = buffered; outsz++; } - sz = read(pu_pipe[0], cp, + sz = xread(pu_pipe[0], cp, sizeof(data) - outsz); if (0 < sz) ; @@ -267,7 +267,7 @@ static void create_pack_file(void) /* Status ready; we ship that in the side-band * or dump to the standard error. */ - sz = read(pe_pipe[0], progress, + sz = xread(pe_pipe[0], progress, sizeof(progress)); if (0 < sz) send_client_data(2, progress, sz); |