From: Ben Peart <peartben@gmail.com>
To: Junio C Hamano <gitster@pobox.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: Tue, 25 Apr 2017 11:09:11 -0400 [thread overview]
Message-ID: <4cadf613-7923-e8bb-c889-34e1bf5eb47c@gmail.com> (raw)
In-Reply-To: <xmqqbmrlxm8m.fsf@gitster.mtv.corp.google.com>
Sorry if you get this twice, somehow Thunderbird converted my response
to HTML
On 4/24/2017 10:19 PM, Junio C Hamano wrote:
> Ben Peart <peartben@gmail.com> writes:
>
>> On 4/24/2017 12:21 AM, Junio C Hamano wrote:
>>> Ben Peart <peartben@gmail.com> writes:
>>>
>>> +{
>>>> + 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.
>> packet_read() returns -1 when PACKET_READ_GENTLE_ON_EOF is passed and
>> it hits truncated output from the remote process.
> I know, but that is irrelevant to my question, which is about
> CHOMP_NEWLINE. I didn't even ask "why a negative len treated
> specially?" My question is about the case where len == 0. Your
> patch treats len==0 just like len==-1, i.e. an error, but I do not
> know if that is correct, hence my question. We both know len < 0
> is an error and you do not need to waste time elaborating on it.
>
>
The packet_read_line() function returns NULL when len == 0 and
PACKET_READ_CHOMP_NEWLINE is passed so I wrote the similar
packet_read_line_gently() function to behave the same.
How about I update the comment in the function header to make this more
clear:
diff --git a/pkt-line.h b/pkt-line.h
index 7c278a158b..b2965869ad 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -78,9 +78,10 @@ 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.
+ * 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);
next prev parent reply other threads:[~2017-04-25 15:09 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
2017-04-24 20:33 ` Ben Peart
2017-04-25 2:19 ` Junio C Hamano
2017-04-25 15:09 ` Ben Peart [this message]
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=4cadf613-7923-e8bb-c889-34e1bf5eb47c@gmail.com \
--to=peartben@gmail.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@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).