fetch and pull: learn --progress

diff --git a/pkt-line.c b/pkt-line.c
index 355546a1ad844492234dc7ee91528c525af5610a..295ba2b16c8675d8c5c5d0a5ee6e61e044ce99dd 100644 (file)
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -28,7 +28,7 @@ ssize_t safe_write(int fd, const void *buf, ssize_t n)
                }
                if (!ret)
                        die("write error (disk full?)");
-               die("write error (%s)", strerror(errno));
+               die_errno("write error");
        }
        return nn;
 }
@@ -42,17 +42,19 @@ void packet_flush(int fd)
        safe_write(fd, "0000", 4);
 }
 
+void packet_buf_flush(struct strbuf *buf)
+{
+       strbuf_add(buf, "0000", 4);
+}
+
 #define hex(a) (hexchar[(a) & 15])
-void packet_write(int fd, const char *fmt, ...)
+static char buffer[1000];
+static unsigned format_packet(const char *fmt, va_list args)
 {
-       static char buffer[1000];
        static char hexchar[] = "0123456789abcdef";
-       va_list args;
        unsigned n;
 
-       va_start(args, fmt);
        n = vsnprintf(buffer + 4, sizeof(buffer) - 4, fmt, args);
-       va_end(args);
        if (n >= sizeof(buffer)-4)
                die("protocol error: impossibly long line");
        n += 4;
@@ -60,32 +62,45 @@ void packet_write(int fd, const char *fmt, ...)
        buffer[1] = hex(n >> 8);
        buffer[2] = hex(n >> 4);
        buffer[3] = hex(n);
+       return n;
+}
+
+void packet_write(int fd, const char *fmt, ...)
+{
+       va_list args;
+       unsigned n;
+
+       va_start(args, fmt);
+       n = format_packet(fmt, args);
+       va_end(args);
        safe_write(fd, buffer, n);
 }
 
-static void safe_read(int fd, void *buffer, unsigned size)
+void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
 {
-       size_t n = 0;
+       va_list args;
+       unsigned n;
 
-       while (n < size) {
-               ssize_t ret = xread(fd, (char *) buffer + n, size - n);
-               if (ret < 0)
-                       die("read error (%s)", strerror(errno));
-               if (!ret)
-                       die("The remote end hung up unexpectedly");
-               n += ret;
-       }
+       va_start(args, fmt);
+       n = format_packet(fmt, args);
+       va_end(args);
+       strbuf_add(buf, buffer, n);
 }
 
-int packet_read_line(int fd, char *buffer, unsigned size)
+static void safe_read(int fd, void *buffer, unsigned size)
 {
-       int n;
-       unsigned len;
-       char linelen[4];
+       ssize_t ret = read_in_full(fd, buffer, size);
+       if (ret < 0)
+               die_errno("read error");
+       else if (ret < size)
+               die("The remote end hung up unexpectedly");
+}
 
-       safe_read(fd, linelen, 4);
+static int packet_length(const char *linelen)
+{
+       int n;
+       int len = 0;
 
-       len = 0;
        for (n = 0; n < 4; n++) {
                unsigned char c = linelen[n];
                len <<= 4;
@@ -101,8 +116,20 @@ int packet_read_line(int fd, char *buffer, unsigned size)
                        len += c - 'A' + 10;
                        continue;
                }
-               die("protocol error: bad line length character");
+               return -1;
        }
+       return len;
+}
+
+int packet_read_line(int fd, char *buffer, unsigned size)
+{
+       int len;
+       char linelen[4];
+
+       safe_read(fd, linelen, 4);
+       len = packet_length(linelen);
+       if (len < 0)
+               die("protocol error: bad line length character: %.4s", linelen);
        if (!len)
                return 0;
        len -= 4;
@@ -112,3 +139,31 @@ int packet_read_line(int fd, char *buffer, unsigned size)
        buffer[len] = 0;
        return len;
 }
+
+int packet_get_line(struct strbuf *out,
+       char **src_buf, size_t *src_len)
+{
+       int len;
+
+       if (*src_len < 4)
+               return -1;
+       len = packet_length(*src_buf);
+       if (len < 0)
+               return -1;
+       if (!len) {
+               *src_buf += 4;
+               *src_len -= 4;
+               return 0;
+       }
+       if (*src_len < len)
+               return -2;
+
+       *src_buf += 4;
+       *src_len -= 4;
+       len -= 4;
+
+       strbuf_add(out, *src_buf, len);
+       *src_buf += len;
+       *src_len -= len;
+       return len;
+}