From: David Edmondson <dme@dme.org>
To: notmuch@notmuchmail.org
Cc: David Edmondson <dme@dme.org>
Subject: [RFC PATCH] show: Add support for -format=raw -body=false
Date: Sun, 17 Jan 2021 18:37:10 +0000 [thread overview]
Message-ID: <20210117183710.29850-1-dme@dme.org> (raw)
Similar to other formats, allow the body to be omitted when outputting
raw messages.
This can be used by UI code to get the full headers of a message
without the need to consume the body, which may be large.
---
notmuch-show.c | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/notmuch-show.c b/notmuch-show.c
index dd836add..f52e6a40 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -888,6 +888,8 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp),
ssize_t ssize;
char buf[4096];
notmuch_status_t ret = NOTMUCH_STATUS_FILE_ERROR;
+ unsigned int cr_count = 0;
+ notmuch_bool_t done = false;
filename = notmuch_message_get_filename (node->envelope_file);
if (filename == NULL) {
@@ -901,13 +903,32 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp),
goto DONE;
}
- while (! g_mime_stream_eos (stream)) {
+ while (! done && ! g_mime_stream_eos (stream)) {
ssize = g_mime_stream_read (stream, buf, sizeof (buf));
if (ssize < 0) {
fprintf (stderr, "Error: Read failed from %s\n", filename);
goto DONE;
}
+ if (! params->output_body) {
+ /*
+ * Look for two adjacent newlines, as they mark the
+ * separation of the headers from the body.
+ */
+ for (ssize_t off = 0; off < ssize; off++) {
+ if (buf[off] == '\n') {
+ cr_count++;
+ } else {
+ cr_count = 0;
+ }
+ if (cr_count == 2) {
+ ssize = off;
+ done = true;
+ break;
+ }
+ }
+ }
+
if (ssize > 0 && fwrite (buf, ssize, 1, stdout) != 1) {
fprintf (stderr, "Error: Write %ld chars to stdout failed\n", ssize);
goto DONE;
@@ -1310,9 +1331,10 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
} else {
if (format != NOTMUCH_FORMAT_TEXT &&
format != NOTMUCH_FORMAT_JSON &&
- format != NOTMUCH_FORMAT_SEXP)
+ format != NOTMUCH_FORMAT_SEXP &&
+ format != NOTMUCH_FORMAT_RAW)
fprintf (stderr,
- "Warning: --body=false only implemented for format=text, format=json and format=sexp\n");
+ "Warning: --body=false is not implemented for format=mbox\n");
}
}
--
2.20.1
next reply other threads:[~2021-01-17 18:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-17 18:37 David Edmondson [this message]
2021-01-18 17:37 ` [RFC PATCH] show: Add support for -format=raw -body=false David Bremner
2021-01-18 17:58 ` David Edmondson
2021-01-18 18:28 ` David Bremner
2021-01-18 18:39 ` David Edmondson
2021-01-18 19:39 ` Tomi Ollila
2021-02-05 2:33 ` David Bremner
2021-02-05 8:23 ` David Edmondson
2021-02-15 21:19 ` David Bremner
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: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210117183710.29850-1-dme@dme.org \
--to=dme@dme.org \
--cc=notmuch@notmuchmail.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.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.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).