From: Junio C Hamano <gitster@pobox.com>
To: Ben Peart <peartben@gmail.com>
Cc: git@vger.kernel.org, benpeart@microsoft.com,
christian.couder@gmail.com, larsxschneider@gmail.com
Subject: Re: [PATCH v6 1/8] pkt-line: add packet_read_line_gently()
Date: Sun, 23 Apr 2017 21:21:31 -0700 [thread overview]
Message-ID: <xmqqy3uqzb90.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170421172611.12152-2-benpeart@microsoft.com> (Ben Peart's message of "Fri, 21 Apr 2017 13:26:04 -0400")
Ben Peart <peartben@gmail.com> writes:
> 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 | 14 +++++++++++++-
> pkt-line.h | 10 ++++++++++
> 2 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/pkt-line.c b/pkt-line.c
> index d4b6bfe076..bfdb177b34 100644
> --- a/pkt-line.c
> +++ b/pkt-line.c
> @@ -315,7 +315,7 @@ static char *packet_read_line_generic(int fd,
> PACKET_READ_CHOMP_NEWLINE);
> if (dst_len)
> *dst_len = len;
> - return len ? packet_buffer : NULL;
> + return (len > 0) ? packet_buffer : NULL;
> }
The log does not seem to explain what this change is about.
Is this supposed to be a preliminary bugfix where this helper used
to return a non-NULL buffer when underlying packet_read() signaled
an error by returning a negative len? If so, this should probably
be a separate patch early in the series.
Should len==0 be considered an error? Especially given that
PACKET_READ_CHOMP_NEWLINE is in use, I would expect that len==0
should be treated similarly to positive length, i.e. the otherside
gave us an empty line.
> char *packet_read_line(int fd, int *len_p)
> @@ -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)
ERROR: "foo** bar" should be "foo **bar"
#29: FILE: pkt-line.c:326:
+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;
I have the same doubt as above for len == 0 case.
> + 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..ad30db101a 100644
> --- a/pkt-line.h
> +++ b/pkt-line.h
> @@ -74,6 +74,16 @@ 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 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.
> */
next prev parent reply other threads:[~2017-04-24 4:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 17:26 [PATCH v6 0/8] refactor the filter process code into a reusable module Ben Peart
2017-04-21 17:26 ` [PATCH v6 1/8] pkt-line: add packet_read_line_gently() Ben Peart
2017-04-24 4:21 ` Junio C Hamano [this message]
2017-04-24 20:33 ` Ben Peart
2017-04-25 2:19 ` Junio C Hamano
2017-04-25 15:09 ` Ben Peart
2017-04-21 17:26 ` [PATCH v6 2/8] convert: move packet_write_list() into pkt-line as packet_writel() Ben Peart
2017-04-21 17:26 ` [PATCH v6 3/8] convert: Split start_multi_file_filter into two separate functions Ben Peart
2017-04-24 4:31 ` Junio C Hamano
2017-04-24 20:57 ` Ben Peart
2017-04-21 17:26 ` [PATCH v6 4/8] convert: Separate generic structures and variables from the filter specific ones Ben Peart
2017-04-21 17:26 ` [PATCH v6 5/8] convert: Update generic functions to only use generic data structures Ben Peart
2017-04-21 17:26 ` [PATCH v6 6/8] convert: rename reusable sub-process functions Ben Peart
2017-04-21 17:26 ` [PATCH v6 7/8] sub-process: move sub-process functions into separate files Ben Peart
2017-04-21 17:26 ` [PATCH v6 8/8] convert: Update subprocess_read_status to not die on EOF Ben Peart
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy3uqzb90.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=peartben@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).