diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-22 10:25:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-22 10:25:51 -0700 |
| commit | 16bf4e1f1ed040ae9f745408d6585b7806a1bfb0 (patch) | |
| tree | e89138977bbaebc05b30af850d90fba31bb592a4 /pkt-line.c | |
| parent | b879de1812f390e20f5ac7eb3aad9f83db02fae1 (diff) | |
| parent | ba0012c36705dcf847865759af69bba783afb69d (diff) | |
| download | git-16bf4e1f1ed040ae9f745408d6585b7806a1bfb0.tar.gz | |
Merge branch 'jc/upload-corrupt'
* jc/upload-corrupt:
daemon: send stderr to /dev/null instead of closing.
upload-pack/fetch-pack: support side-band communication
Retire git-clone-pack
upload-pack: prepare for sideband message support.
upload-pack: avoid sending an incomplete pack upon failure
Diffstat (limited to 'pkt-line.c')
| -rw-r--r-- | pkt-line.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkt-line.c b/pkt-line.c index 44d42969e5..c1e81f976f 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -16,8 +16,9 @@ * The writing side could use stdio, but since the reading * side can't, we stay with pure read/write interfaces. */ -static void safe_write(int fd, const void *buf, unsigned n) +ssize_t safe_write(int fd, const void *buf, ssize_t n) { + ssize_t nn = n; while (n) { int ret = xwrite(fd, buf, n); if (ret > 0) { @@ -29,6 +30,7 @@ static void safe_write(int fd, const void *buf, unsigned n) die("write error (disk full?)"); die("write error (%s)", strerror(errno)); } + return nn; } /* |