From: Ben Peart <peartben@gmail•com>
To: git@vger•kernel.org
Cc: gitster@pobox•com, benpeart@microsoft•com,
christian.couder@gmail•com, larsxschneider@gmail•com,
peff@peff•net
Subject: [PATCH v7 03/10] pkt-line: add packet_read_line_gently()
Date: Fri, 5 May 2017 11:27:55 -0400 [thread overview]
Message-ID: <20170505152802.6724-4-benpeart@microsoft.com> (raw)
In-Reply-To: <20170505152802.6724-1-benpeart@microsoft.com>
Add packet_read_line_gently() to enable reading a line without dying on
EOF.
Signed-off-by: Ben Peart <benpeart@microsoft•com>
---
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
@@ -74,6 +74,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.12.2.gvfs.2.20.g3624a68d62.dirty
next prev parent reply other threads:[~2017-05-05 15:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-05 15:27 [PATCH v7 00/10] refactor the filter process code into a reusable module Ben Peart
2017-05-05 15:27 ` [PATCH v7 01/10] convert: remove erroneous tests for errno == EPIPE Ben Peart
2017-05-05 15:27 ` [PATCH v7 02/10] pkt-line: fix packet_read_line() to handle len < 0 errors Ben Peart
2017-05-05 15:27 ` Ben Peart [this message]
2017-05-05 15:27 ` [PATCH v7 04/10] convert: move packet_write_line() into pkt-line as packet_writel() Ben Peart
2017-05-13 9:04 ` Jeff King
2017-05-15 4:02 ` Junio C Hamano
2017-05-05 15:27 ` [PATCH v7 05/10] convert: split start_multi_file_filter() into two separate functions Ben Peart
2017-05-05 15:27 ` [PATCH v7 06/10] convert: Separate generic structures and variables from the filter specific ones Ben Peart
2017-05-05 15:27 ` [PATCH v7 07/10] convert: Update generic functions to only use generic data structures Ben Peart
2017-05-05 15:28 ` [PATCH v7 08/10] convert: rename reusable sub-process functions Ben Peart
2017-05-05 15:28 ` [PATCH v7 09/10] sub-process: move sub-process functions into separate files Ben Peart
2017-05-13 9:07 ` Jeff King
2017-05-05 15:28 ` [PATCH v7 10/10] convert: Update subprocess_read_status to not die on EOF Ben Peart
2017-05-08 1:58 ` [PATCH v7 00/10] refactor the filter process code into a reusable module Junio C Hamano
2017-05-13 9:16 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170505152802.6724-4-benpeart@microsoft.com \
--to=peartben@gmail$(echo .)com \
--cc=benpeart@microsoft$(echo .)com \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=larsxschneider@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox