git-svnimport: fix edge revisions double importing

diff --git a/write_or_die.c b/write_or_die.c
index ab4cb8a69cd6e54c12dac647bb5af1df54fdf6c8..6db1d3123d1761dee4850e0a56a9b86b4bf1722a 100644 (file)
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -1,5 +1,21 @@
 #include "cache.h"
 
+void read_or_die(int fd, void *buf, size_t count)
+{
+       char *p = buf;
+       ssize_t loaded;
+
+       while (count > 0) {
+               loaded = xread(fd, p, count);
+               if (loaded == 0)
+                       die("unexpected end of file");
+               else if (loaded < 0)
+                       die("read error (%s)", strerror(errno));
+               count -= loaded;
+               p += loaded;
+       }
+}
+
 void write_or_die(int fd, const void *buf, size_t count)
 {
        const char *p = buf;
@@ -18,3 +34,51 @@ void write_or_die(int fd, const void *buf, size_t count)
                p += written;
        }
 }
+
+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) {
+                       if (errno == EPIPE)
+                               exit(0);
+                       fprintf(stderr, "%s: write error (%s)\n",
+                               msg, strerror(errno));
+                       return 0;
+               }
+               count -= written;
+               p += written;
+       }
+
+       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;
+}