debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename do_show_raw to do_show_single, and create params.raw for raw message output

Browse source 
We rename here in order to make do_show_single into a generic function
for handling output of just a single message, or which format=raw is a
special case.  The raw case is handled by setting a new parameter,
params.raw, which is used to tell do_show_single to output a single
message as a raw file.

This is mostly in preparation for much improved part handling to
follow imminently.
This commit is contained in:
Jameson Graef Rollins 2011-05-22 20:04:02 -07:00 committed by Carl Worth
parent 6c2417cabc
commit 5a9d5f2f14
2 changed files with 38 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
notmuch-client.h
View file

@ -77,6 +77,7 @@ typedef struct notmuch_show_format {
typedef struct notmuch_show_params { typedef struct notmuch_show_params {
int entire_thread; int entire_thread;
int raw;
} notmuch_show_params_t; } notmuch_show_params_t;
/* There's no point in continuing when we've detected that we've done /* There's no point in continuing when we've detected that we've done

33
notmuch-show.c
View file

@ -565,16 +565,15 @@ show_messages (void *ctx,
fputs (format->message_set_end, stdout); fputs (format->message_set_end, stdout);
} }
/* Support for --format=raw */ /* Formatted output of single message */
static int static int
do_show_raw (unused(void *ctx), notmuch_query_t *query) do_show_single (void *ctx,
notmuch_query_t *query,
const notmuch_show_format_t *format,
notmuch_show_params_t *params)
{ {
notmuch_messages_t *messages; notmuch_messages_t *messages;
notmuch_message_t *message; notmuch_message_t *message;
const char *filename;
FILE *file;
size_t size;
char buf[4096];
if (notmuch_query_count_messages (query) != 1) { if (notmuch_query_count_messages (query) != 1) {
fprintf (stderr, "Error: search term did not match precisely one message.\n"); fprintf (stderr, "Error: search term did not match precisely one message.\n");
@ -589,6 +588,14 @@ do_show_raw (unused(void *ctx), notmuch_query_t *query)
return 1; return 1;
} }
/* Special case for --format=raw of full single message, just cat out file */
if (params->raw) {
const char *filename;
FILE *file;
size_t size;
char buf[4096];
filename = notmuch_message_get_filename (message); filename = notmuch_message_get_filename (message);
if (filename == NULL) { if (filename == NULL) {
fprintf (stderr, "Error: Cannot message filename.\n"); fprintf (stderr, "Error: Cannot message filename.\n");
@ -608,10 +615,12 @@ do_show_raw (unused(void *ctx), notmuch_query_t *query)
fclose (file); fclose (file);
}
return 0; return 0;
} }
/* Support for --format=text|json|mbox */ /* Formatted output of threads */
static int static int
do_show (void *ctx, do_show (void *ctx,
notmuch_query_t *query, notmuch_query_t *query,
@ -663,9 +672,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
const notmuch_show_format_t *format = &format_text; const notmuch_show_format_t *format = &format_text;
notmuch_show_params_t params; notmuch_show_params_t params;
int i; int i;
int raw = 0;
params.entire_thread = 0; params.entire_thread = 0;
params.raw = 0;
for (i = 0; i < argc && argv[i][0] == '-'; i++) { for (i = 0; i < argc && argv[i][0] == '-'; i++) {
if (strcmp (argv[i], "--") == 0) { if (strcmp (argv[i], "--") == 0) {
@ -682,7 +691,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
} else if (strcmp (opt, "mbox") == 0) { } else if (strcmp (opt, "mbox") == 0) {
format = &format_mbox; format = &format_mbox;
} else if (strcmp (opt, "raw") == 0) { } else if (strcmp (opt, "raw") == 0) {
raw = 1; params.raw = 1;
} else { } else {
fprintf (stderr, "Invalid value for --format: %s\n", opt); fprintf (stderr, "Invalid value for --format: %s\n", opt);
return 1; return 1;
@ -724,8 +733,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
return 1; return 1;
} }
if (raw) /* If --format=raw specified without specifying part, we can only
return do_show_raw (ctx, query); * output single message, so set part=0 */
if (params.raw)
return do_show_single (ctx, query, format, &params);
else else
return do_show (ctx, query, format, &params); return do_show (ctx, query, format, &params);