From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 23 May 2011 03:04:02 +0000 (-0700)
Subject: rename do_show_raw to do_show_single, and create params.raw for raw message output
X-Git-Tag: debian/0.6_254~135
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=5a9d5f2f149b4c3122e2796e782c13a32571696b;ds=sidebyside

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

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.
---

diff --git a/notmuch-client.h b/notmuch-client.h
index 5e8e3e53..47a4e570 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -77,6 +77,7 @@ typedef struct notmuch_show_format {
 
 typedef struct notmuch_show_params {
     int entire_thread;
+    int raw;
 } notmuch_show_params_t;
 
 /* There's no point in continuing when we've detected that we've done
diff --git a/notmuch-show.c b/notmuch-show.c
index 412f908d..27587f87 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -565,16 +565,15 @@ show_messages (void *ctx,
     fputs (format->message_set_end, stdout);
 }
 
-/* Support for --format=raw */
+/* Formatted output of single message */
 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_message_t *message;
-    const char *filename;
-    FILE *file;
-    size_t size;
-    char buf[4096];
 
     if (notmuch_query_count_messages (query) != 1) {
 	fprintf (stderr, "Error: search term did not match precisely one message.\n");
@@ -589,29 +588,39 @@ do_show_raw (unused(void *ctx), notmuch_query_t *query)
 	return 1;
     }
 
-    filename = notmuch_message_get_filename (message);
-    if (filename == NULL) {
-	fprintf (stderr, "Error: Cannot message filename.\n");
-	return 1;
-    }
+    /* Special case for --format=raw of full single message, just cat out file */
+    if (params->raw) {
 
-    file = fopen (filename, "r");
-    if (file == NULL) {
-	fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno));
-	return 1;
-    }
+	const char *filename;
+	FILE *file;
+	size_t size;
+	char buf[4096];
 
-    while (!feof (file)) {
-	size = fread (buf, 1, sizeof (buf), file);
-	fwrite (buf, size, 1, stdout);
-    }
+	filename = notmuch_message_get_filename (message);
+	if (filename == NULL) {
+	    fprintf (stderr, "Error: Cannot message filename.\n");
+	    return 1;
+	}
 
-    fclose (file);
+	file = fopen (filename, "r");
+	if (file == NULL) {
+	    fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno));
+	    return 1;
+	}
+
+	while (!feof (file)) {
+	    size = fread (buf, 1, sizeof (buf), file);
+	    fwrite (buf, size, 1, stdout);
+	}
+
+	fclose (file);
+
+    }
 
     return 0;
 }
 
-/* Support for --format=text|json|mbox */
+/* Formatted output of threads */
 static int
 do_show (void *ctx,
 	 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;
     notmuch_show_params_t params;
     int i;
-    int raw = 0;
 
     params.entire_thread = 0;
+    params.raw = 0;
 
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
 	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) {
 		format = &format_mbox;
 	    } else if (strcmp (opt, "raw") == 0) {
-		raw = 1;
+		params.raw = 1;
 	    } else {
 		fprintf (stderr, "Invalid value for --format: %s\n", opt);
 		return 1;
@@ -724,8 +733,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
 	return 1;
     }
 
-    if (raw)
-	return do_show_raw (ctx, query);
+    /* If --format=raw specified without specifying part, we can only
+     * output single message, so set part=0 */
+    if (params.raw)
+	return do_show_single (ctx, query, format, &params);
     else
 	return do_show (ctx, query, format, &params);