aboutsummaryrefslogtreecommitdiffhomepage
path: root/notmuch-show.c
diff options
context:
space:
mode:
authorMark Walters <markwalters1009@gmail.com>2012-06-16 11:21:43 +0100
committerDavid Bremner <bremner@debian.org>2012-06-29 22:31:53 -0300
commit4d3bfba98316ef703c430bb3202dc4e258f05ae5 (patch)
tree6f2356dc5765f7ccfd6000047304daf0c918fe8e /notmuch-show.c
parent779ce3e9300c8f656e798ee77459b4425dbf35a6 (diff)
cli: Let json output "null" messages for non --entire-thread
All formats except Json can output empty messages for non entire-thread, but in Json format we output "null" to keep the other elements (e.g. the replies to the omitted message) in the correct place.
Diffstat (limited to 'notmuch-show.c')
-rw-r--r--notmuch-show.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/notmuch-show.c b/notmuch-show.c
index 8247f1d5..b0044684 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -37,7 +37,8 @@ static const notmuch_show_format_t format_json = {
.message_set_start = "[",
.part = format_part_json_entry,
.message_set_sep = ", ",
- .message_set_end = "]"
+ .message_set_end = "]",
+ .null_message = "null"
};
static notmuch_status_t
@@ -800,6 +801,15 @@ format_part_raw (unused (const void *ctx), mime_node_t *node,
}
static notmuch_status_t
+show_null_message (const notmuch_show_format_t *format)
+{
+ /* Output a null message. Currently empty for all formats except Json */
+ if (format->null_message)
+ printf ("%s", format->null_message);
+ return NOTMUCH_STATUS_SUCCESS;
+}
+
+static notmuch_status_t
show_message (void *ctx,
const notmuch_show_format_t *format,
notmuch_message_t *message,
@@ -861,11 +871,13 @@ show_messages (void *ctx,
if (status && !res)
res = status;
next_indent = indent + 1;
-
- if (!status && format->message_set_sep)
- fputs (format->message_set_sep, stdout);
+ } else {
+ status = show_null_message (format);
}
+ if (!status && format->message_set_sep)
+ fputs (format->message_set_sep, stdout);
+
status = show_messages (ctx,
format,
notmuch_message_get_replies (message),