From: Jeff King <peff@peff.net>
To: Mike Hommey <mh@glandium.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] gpg-interface: Add some output from gpg when it errors out.
Date: Thu, 26 Jan 2017 00:21:03 -0500 [thread overview]
Message-ID: <20170126052103.mpudt63l7dynf3h6@sigill.intra.peff.net> (raw)
In-Reply-To: <20170125235410.byxwmo7o7zdszzot@glandium.org>
On Thu, Jan 26, 2017 at 08:54:10AM +0900, Mike Hommey wrote:
> > Implementation-wise, I'd be happier if we do not add any new
> > callsites of strbuf_split(), which is a horrible interface. But
> > that is a minor detail.
>
> What would you suggest otherwise?
Try string_list_split() (or its in_place() variant, since it is probably
OK to hack up the string for your use case). Like this:
diff --git a/gpg-interface.c b/gpg-interface.c
index 2768bb307..051bb7d3e 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -158,14 +158,16 @@ static int pipe_gpg_command(struct child_process *cmd,
/* Print out any line that doesn't start with [GNUPG:] if the gpg
* command failed. */
if (ret) {
- struct strbuf **err_lines = strbuf_split(err, '\n');
- for (struct strbuf **line = err_lines; *line; line++) {
- if (memcmp((*line)->buf, "[GNUPG:]", 8)) {
- strbuf_rtrim(*line);
- fprintf(stderr, "%s\n", (*line)->buf);
- }
+ struct string_list lines = STRING_LIST_INIT_NODUP;
+ int i;
+
+ string_list_split_in_place(&lines, err->buf, '\n', 0);
+ for (i = 0; i < lines.nr; i++) {
+ const char *line = lines.items[i].string;
+ if (!starts_with(line, "[GNUPG:]"))
+ fprintf(stderr, "%s\n", line);
}
- strbuf_list_free(err_lines);
+ string_list_clear(&lines, 0);
}
return ret;
}
Note that I also replaced the memcmp with starts_with(). That avoids the
magic number "8". I also suspect your original can read off the end of
the buffer when the line is shorter than 8 characters (e.g., if memcmp
does 64-bit loads).
-Peff
prev parent reply other threads:[~2017-01-26 5:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 3:04 [PATCH] gpg-interface: Add some output from gpg when it errors out Mike Hommey
2017-01-25 23:04 ` Junio C Hamano
2017-01-25 23:54 ` Mike Hommey
2017-01-26 2:37 ` Junio C Hamano
2017-01-26 2:55 ` Mike Hommey
2017-01-26 18:29 ` Junio C Hamano
2017-01-26 5:21 ` Jeff King [this message]
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=20170126052103.mpudt63l7dynf3h6@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mh@glandium.org \
/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.
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 NNTP newsgroup(s).