From: Michal Sojka <sojkam1@fel.cvut.cz>
To: notmuch@notmuchmail.org
Subject: [PATCH] Produce valid JSON output even if mail body is empty
Date: Sun, 14 Mar 2010 19:19:11 +0100 [thread overview]
Message-ID: <1268590751-7478-1-git-send-email-sojkam1@fel.cvut.cz> (raw)
In-Reply-To: <87mxyabwha.fsf@steelpick.localdomain>
Mails with empty body produced the following output:
"body": [{"id": 1, "content-type": "text/plain", "content": (null)}]
The (null) is not valid JSON syntax.
This patch changes the output to:
"body": [{"id": 1, "content-type": "text/plain", "content": ""}]
Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
---
notmuch-show.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/notmuch-show.c b/notmuch-show.c
index ff1fecb..cc2fb6a 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -323,7 +323,7 @@ format_part_json (GMimeObject *part, int *part_count)
show_part_content (part, stream_memory);
part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));
- printf (", \"content\": %s", json_quote_str (ctx, (char *) part_content->data));
+ printf (", \"content\": %s", json_quote_str (ctx, part_content->data ? (char *)part_content->data : ""));
}
fputs ("}", stdout);
--
1.7.0
next prev parent reply other threads:[~2010-03-14 18:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-11 15:25 Notmuch command interface Ben Gamari
2010-03-11 22:52 ` David A Benjamin
2010-03-12 0:52 ` Ben Gamari
2010-03-12 8:31 ` Michal Sojka
2010-03-12 14:46 ` Sebastian Spaeth
2010-03-12 15:03 ` Michal Sojka
2010-03-12 16:03 ` Sebastian Spaeth
2010-03-14 18:15 ` Michal Sojka
2010-03-14 18:19 ` Michal Sojka [this message]
2010-03-14 19:01 ` [PATCH] Produce valid JSON output even if mail body is empty James Westby
2010-03-14 20:44 ` [PATCH] Fix invalid JSON output for NULL strings Michal Sojka
2010-03-12 9:18 ` Notmuch command interface Sebastian Spaeth
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=1268590751-7478-1-git-send-email-sojkam1@fel.cvut.cz \
--to=sojkam1@fel.cvut.cz \
--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).