From 825b9226bf7a962bc76571319b1444bc02fdcdf8 Mon Sep 17 00:00:00 2001 From: Ben Peart Date: Fri, 5 May 2017 11:27:55 -0400 Subject: [PATCH] pkt-line: add packet_read_line_gently() Add packet_read_line_gently() to enable reading a line without dying on EOF. Signed-off-by: Ben Peart Signed-off-by: Junio C Hamano --- pkt-line.c | 12 ++++++++++++ pkt-line.h | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/pkt-line.c b/pkt-line.c index 6f05b1a4a8..7db9119573 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -323,6 +323,18 @@ char *packet_read_line(int fd, int *len_p) return packet_read_line_generic(fd, NULL, NULL, len_p); } +int packet_read_line_gently(int fd, int *dst_len, char **dst_line) +{ + int len = packet_read(fd, NULL, NULL, + packet_buffer, sizeof(packet_buffer), + PACKET_READ_CHOMP_NEWLINE|PACKET_READ_GENTLE_ON_EOF); + if (dst_len) + *dst_len = len; + if (dst_line) + *dst_line = (len > 0) ? packet_buffer : NULL; + return len; +} + 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); diff --git a/pkt-line.h b/pkt-line.h index 18eac64830..66ef610fc4 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -73,6 +73,17 @@ int packet_read(int fd, char **src_buffer, size_t *src_len, char */ char *packet_read_line(int fd, int *size); +/* + * Convenience wrapper for packet_read that sets the PACKET_READ_GENTLE_ON_EOF + * and CHOMP_NEWLINE options. The return value specifies the number of bytes + * read into the buffer or -1 on truncated input. If the *dst_line parameter + * is not NULL it will return NULL for a flush packet or when the number of + * bytes copied is zero and otherwise points to a static buffer (that may be + * overwritten by subsequent calls). If the size parameter is not NULL, the + * length of the packet is written to it. + */ +int packet_read_line_gently(int fd, int *size, char **dst_line); + /* * Same as packet_read_line, but read from a buf rather than a descriptor; * see packet_read for details on how src_* is used. -- 2.43.2