summaryrefslogtreecommitdiff
path: root/write_or_die.c
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2007-01-08 15:57:52 +0000
committerJunio C Hamano <junkio@cox.net>2007-01-08 15:44:47 -0800
commite08140568a131bcd26e64a0bc8188040847be998 (patch)
treed13dd8c34ea690726c0e45a63323d26a5d573c96 /write_or_die.c
parent0f018baba654347b5ce746253b99d59707f80184 (diff)
downloadgit-e08140568a131bcd26e64a0bc8188040847be998.tar.gz
short i/o: clean up the naming for the write_{in,or}_xxx family
We recently introduced a write_in_full() which would either write the specified object or emit an error message and fail. In order to fix the read side we now want to introduce a read_in_full() but without an error emit. This patch cleans up the naming of this family of calls: 1) convert the existing write_or_whine() to write_or_whine_pipe() to better indicate its pipe specific nature, 2) convert the existing write_in_full() calls to write_or_whine() to better indicate its nature, 3) introduce a write_in_full() providing a write or fail semantic, and 4) convert write_or_whine() and write_or_whine_pipe() to use write_in_full(). Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'write_or_die.c')
-rw-r--r--write_or_die.c72
1 files changed, 42 insertions, 30 deletions
diff --git a/write_or_die.c b/write_or_die.c
index 6db1d3123d..613c0c3f6e 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -35,49 +35,61 @@ void write_or_die(int fd, const void *buf, size_t count)
}
}
-int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
+int write_in_full(int fd, const void *buf, size_t count)
{
const char *p = buf;
- ssize_t written;
+ ssize_t total = 0;
+ ssize_t wcount = 0;
while (count > 0) {
- written = xwrite(fd, p, count);
- if (written == 0) {
- fprintf(stderr, "%s: disk full?\n", msg);
- return 0;
- }
- else if (written < 0) {
- if (errno == EPIPE)
- exit(0);
- fprintf(stderr, "%s: write error (%s)\n",
- msg, strerror(errno));
- return 0;
+ wcount = xwrite(fd, p, count);
+ if (wcount <= 0) {
+ if (total)
+ return total;
+ else
+ return wcount;
}
- count -= written;
- p += written;
+ count -= wcount;
+ p += wcount;
+ total += wcount;
+ }
+
+ return wcount;
+}
+
+int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
+{
+ ssize_t written;
+
+ written = write_in_full(fd, buf, count);
+ if (written == 0) {
+ fprintf(stderr, "%s: disk full?\n", msg);
+ return 0;
+ }
+ else if (written < 0) {
+ if (errno == EPIPE)
+ exit(0);
+ fprintf(stderr, "%s: write error (%s)\n",
+ msg, strerror(errno));
+ return 0;
}
return 1;
}
-int write_in_full(int fd, const void *buf, size_t count, const char *msg)
+int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
{
- const char *p = buf;
ssize_t written;
- while (count > 0) {
- written = xwrite(fd, p, count);
- if (written == 0) {
- fprintf(stderr, "%s: disk full?\n", msg);
- return 0;
- }
- else if (written < 0) {
- fprintf(stderr, "%s: write error (%s)\n",
- msg, strerror(errno));
- return 0;
- }
- count -= written;
- p += written;
+ written = write_in_full(fd, buf, count);
+ if (written == 0) {
+ fprintf(stderr, "%s: disk full?\n", msg);
+ return 0;
+ }
+ else if (written < 0) {
+ fprintf(stderr, "%s: write error (%s)\n",
+ msg, strerror(errno));
+ return 0;
}
return 1;