diff options
| author |  J. Bruce Fields <bfields@citi.umich.edu> | 2007-01-14 19:27:28 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-01-14 19:27:28 -0500 |
| commit | 67583917e9a2a85605c1123a62c8883593e7e889 (patch) | |
| tree | 06f61d2f28e321063b8e1e206a0e418bc1ba0486 /upload-pack.c | |
| parent | user-manual: reindent (diff) | |
| parent | Merge branch 'jc/int' (diff) | |
| download | tgif-67583917e9a2a85605c1123a62c8883593e7e889.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c index c568ef066c..3a466c6a3e 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -55,6 +55,7 @@ static ssize_t send_client_data(int fd, const char *data, ssize_t sz) /* emergency quit */ fd = 2; if (fd == 2) { + /* XXX: are we happy to lose stuff here? */ xwrite(fd, data, sz); return sz; } @@ -242,7 +243,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 +268,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); |