send pack check for failure to send revisions list

When passing the revisions list to pack-objects we do not check for
errors nor short writes.  Introduce a new write_in_full which will
handle short writes and report errors to the caller.  Use this to
short cut the send on failure, allowing us to wait for and report
the child in case the failure is its fault.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/cache.h b/cache.h
index 29dd290c9253bd96f086432e24d98cb0b43fa096..384f829b96a5056d843548c39c4e55976a9a7772 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -420,6 +420,7 @@ extern char *git_commit_encoding;
 extern char *git_log_output_encoding;
 
 extern int copy_fd(int ifd, int ofd);
 extern char *git_log_output_encoding;
 
 extern int copy_fd(int ifd, int ofd);

+extern int write_in_full(int fd, const void *buf, size_t count, const char *);

 extern void write_or_die(int fd, const void *buf, size_t count);
 extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg);
 
 extern void write_or_die(int fd, const void *buf, size_t count);
 extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg);
 

diff --git a/send-pack.c b/send-pack.c
index eaa6efbc0c844de78510d3c65a3bd6a83d9cdcef..c195d080db7c80420e1226f7591c9e9c3059536a 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -65,12 +65,16 @@ static int pack_objects(int fd, struct ref *refs)
                        memcpy(buf + 1, sha1_to_hex(refs->old_sha1), 40);
                        buf[0] = '^';
                        buf[41] = '\n';
                        memcpy(buf + 1, sha1_to_hex(refs->old_sha1), 40);
                        buf[0] = '^';
                        buf[41] = '\n';

-                       write(pipe_fd[1], buf, 42);
+                       if (!write_in_full(pipe_fd[1], buf, 42,
+                                               "send-pack: send refs"))
+                               break;

                }
                if (!is_null_sha1(refs->new_sha1)) {
                        memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
                        buf[40] = '\n';
                }
                if (!is_null_sha1(refs->new_sha1)) {
                        memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
                        buf[40] = '\n';

-                       write(pipe_fd[1], buf, 41);
+                       if (!write_in_full(pipe_fd[1], buf, 41,
+                                               "send-pack: send refs"))
+                               break;

                }
                refs = refs->next;
        }
                }
                refs = refs->next;
        }

diff --git a/write_or_die.c b/write_or_die.c
index bfe4eeb6494c7076bf7f319cf11628f586142aa5..650f13fc012b14a6aaa62534727d4ef9cdce58bd 100644 (file)
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -43,3 +43,26 @@ int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
 
        return 1;
 }
 
        return 1;
 }

+
+int write_in_full(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;
+       }
+
+       return 1;
+}