int indent, const notmuch_show_params_t *params);
static const notmuch_show_format_t format_text = {
- .message_set_start = "",
.part = format_part_text,
- .message_set_sep = "",
- .message_set_end = ""
};
static notmuch_status_t
int indent, const notmuch_show_params_t *params);
static const notmuch_show_format_t format_mbox = {
- .message_set_start = "",
.part = format_part_mbox,
- .message_set_sep = "",
- .message_set_end = ""
};
static notmuch_status_t
unused (const notmuch_show_params_t *params));
static const notmuch_show_format_t format_raw = {
- .message_set_start = "",
.part = format_part_raw,
- .message_set_sep = "",
- .message_set_end = ""
};
static const char *
int indent,
notmuch_show_params_t *params)
{
- if (format->part) {
- void *local = talloc_new (ctx);
- mime_node_t *root, *part;
- notmuch_status_t status;
-
- status = mime_node_open (local, message, params->cryptoctx,
- params->decrypt, &root);
- if (status)
- goto DONE;
- part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
- if (part)
- status = format->part (local, part, indent, params);
- DONE:
- talloc_free (local);
- return status;
- }
-
- if (params->part <= 0) {
- fputs (format->message_start, stdout);
- if (format->message)
- format->message(ctx, message, indent);
-
- fputs (format->header_start, stdout);
- if (format->header)
- format->header(ctx, message);
- fputs (format->header_end, stdout);
-
- fputs (format->body_start, stdout);
- }
-
- if (format->part_content)
- show_message_body (message, format, params);
-
- if (params->part <= 0) {
- fputs (format->body_end, stdout);
-
- fputs (format->message_end, stdout);
- }
+ void *local = talloc_new (ctx);
+ mime_node_t *root, *part;
+ notmuch_status_t status;
- return NOTMUCH_STATUS_SUCCESS;
+ status = mime_node_open (local, message, params->cryptoctx,
+ params->decrypt, &root);
+ if (status)
+ goto DONE;
+ part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
+ if (part)
+ status = format->part (local, part, indent, params);
+ DONE:
+ talloc_free (local);
+ return status;
}
static notmuch_status_t
int next_indent;
notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;
- fputs (format->message_set_start, stdout);
+ if (format->message_set_start)
+ fputs (format->message_set_start, stdout);
for (;
notmuch_messages_valid (messages);
notmuch_messages_move_to_next (messages))
{
- if (!first_set)
+ if (!first_set && format->message_set_sep)
fputs (format->message_set_sep, stdout);
first_set = 0;
- fputs (format->message_set_start, stdout);
+ if (format->message_set_start)
+ fputs (format->message_set_start, stdout);
message = notmuch_messages_get (messages);
res = status;
next_indent = indent + 1;
- if (!status)
+ if (!status && format->message_set_sep)
fputs (format->message_set_sep, stdout);
}
notmuch_message_destroy (message);
- fputs (format->message_set_end, stdout);
+ if (format->message_set_end)
+ fputs (format->message_set_end, stdout);
}
- fputs (format->message_set_end, stdout);
+ if (format->message_set_end)
+ fputs (format->message_set_end, stdout);
return res;
}
int first_toplevel = 1;
notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;
- fputs (format->message_set_start, stdout);
+ if (format->message_set_start)
+ fputs (format->message_set_start, stdout);
for (threads = notmuch_query_search_threads (query);
notmuch_threads_valid (threads);
INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",
notmuch_thread_get_thread_id (thread));
- if (!first_toplevel)
+ if (!first_toplevel && format->message_set_sep)
fputs (format->message_set_sep, stdout);
first_toplevel = 0;
}
- fputs (format->message_set_end, stdout);
+ if (format->message_set_end)
+ fputs (format->message_set_end, stdout);
return res != NOTMUCH_STATUS_SUCCESS;
}
}
notmuch_query_destroy (query);
- notmuch_database_close (notmuch);
+ notmuch_database_destroy (notmuch);
if (params.cryptoctx)
g_object_unref(params.cryptoctx);