From: Lars Schneider <larsxschneider@xxxxxxxxx>
packet_write_stream_with_flush_from_fd() and
packet_write_stream_with_flush_from_buf() write a stream of packets. All
content packets use the maximal packet size except for the last one.
After the last content packet a `flush` control packet is written.
packet_read_till_flush() reads arbitrary sized packets until it detects
a `flush` packet.
Signed-off-by: Lars Schneider <larsxschneider@xxxxxxxxx>
---
pkt-line.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pkt-line.h | 7 +++++
2 files changed, 98 insertions(+)
diff --git a/pkt-line.c b/pkt-line.c
index 7e8a803..3033aa3 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -176,6 +176,47 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
va_end(args);
}
+int packet_write_stream_with_flush_from_fd(int fd_in, int fd_out)
+{
+ int err = 0;
+ ssize_t bytes_to_write;
+
+ while (!err) {
+ bytes_to_write = xread(fd_in, packet_write_buffer, sizeof(packet_write_buffer) - 4);
+ if (bytes_to_write < 0)
+ return COPY_READ_ERROR;
+ if (bytes_to_write == 0)
+ break;
+ if (bytes_to_write > sizeof(packet_write_buffer) - 4)
+ return COPY_WRITE_ERROR;
+ err = packet_write_gently(fd_out, packet_write_buffer, bytes_to_write);
+ }
+ if (!err)
+ err = packet_flush_gently(fd_out);
+ return err;
+}
+
+int packet_write_stream_with_flush_from_buf(const char *src_in, size_t len, int fd_out)
+{
+ int err = 0;
+ size_t bytes_written = 0;
+ size_t bytes_to_write;
+
+ while (!err) {
+ if ((len - bytes_written) > sizeof(packet_write_buffer) - 4)
+ bytes_to_write = sizeof(packet_write_buffer) - 4;
+ else
+ bytes_to_write = len - bytes_written;
+ if (bytes_to_write == 0)
+ break;
+ err = packet_write_gently(fd_out, src_in + bytes_written, bytes_to_write);
+ bytes_written += bytes_to_write;
+ }
+ if (!err)
+ err = packet_flush_gently(fd_out);
+ return err;
+}
+
static int get_packet_data(int fd, char **src_buf, size_t *src_size,
void *dst, unsigned size, int options)
{
@@ -285,3 +326,53 @@ char *packet_read_line_buf(char **src, size_t *src_len, int *dst_len)
{
return packet_read_line_generic(-1, src, src_len, dst_len);
}
+
+ssize_t packet_read_till_flush(int fd_in, struct strbuf *sb_out)
+{
+ int len, ret;
+ int options = PACKET_READ_GENTLE_ON_EOF;
+ char linelen[4];
+
+ size_t oldlen = sb_out->len;
+ size_t oldalloc = sb_out->alloc;
+
+ for (;;) {
+ /* Read packet header */
+ ret = get_packet_data(fd_in, NULL, NULL, linelen, 4, options);
+ if (ret < 0)
+ goto done;
+ len = packet_length(linelen);
+ if (len < 0)
+ die("protocol error: bad line length character: %.4s", linelen);
+ if (!len) {
+ /* Found a flush packet - Done! */
+ packet_trace("0000", 4, 0);
+ break;
+ }
+ len -= 4;
+
+ /* Read packet content */
+ strbuf_grow(sb_out, len);
+ ret = get_packet_data(fd_in, NULL, NULL, sb_out->buf + sb_out->len, len, options);
+ if (ret < 0)
+ goto done;
+
+ if (ret != len) {
+ error("protocol error: incomplete read (expected %d, got %d)", len, ret);
+ goto done;
+ }
+
+ packet_trace(sb_out->buf + sb_out->len, len, 0);
+ sb_out->len += len;
+ }
+
+done:
+ if (ret < 0) {
+ if (oldalloc == 0)
+ strbuf_release(sb_out);
+ else
+ strbuf_setlen(sb_out, oldlen);
+ return ret; /* unexpected EOF */
+ }
+ return sb_out->len - oldlen;
+}
diff --git a/pkt-line.h b/pkt-line.h
index 3fa0899..9616117 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -25,6 +25,8 @@ void packet_buf_flush(struct strbuf *buf);
void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
int packet_flush_gently(int fd);
int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
+int packet_write_stream_with_flush_from_fd(int fd_in, int fd_out);
+int packet_write_stream_with_flush_from_buf(const char *src_in, size_t len, int fd_out);
/*
* Read a packetized line into the buffer, which must be at least size bytes
@@ -77,6 +79,11 @@ char *packet_read_line(int fd, int *size);
*/
char *packet_read_line_buf(char **src_buf, size_t *src_len, int *size);
+/*
+ * Reads a stream of variable sized packets until a flush packet is detected.
+ */
+ssize_t packet_read_till_flush(int fd_in, struct strbuf *sb_out);
+
#define DEFAULT_PACKET_MAX 1000
#define LARGE_PACKET_MAX 65520
extern char packet_buffer[LARGE_PACKET_MAX];
--
2.9.2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html