aboutsummaryrefslogtreecommitdiff
path: root/notmuch.c
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2009-11-02 21:13:19 -0800
committerCarl Worth <cworth@cworth.org>2009-11-02 21:13:19 -0800
commita81849b5e21632cfca7d634d718501f67219bb60 (patch)
treef8fdcc00fac666724005e47264249ddae654eb7b /notmuch.c
parent40382ed98cc0a801c5ecdde26088d4341e02bcde (diff)
notmuch show: Switch to control character to mark sections of output
We were previously using things like "%message{" which were not guaranteed to never appear in an email message. Using a control character (^L or '\f' instead of '%') gives us better assurance that our delimiter doesn't show up in an original email message. This still isn't entirely safe since we're decoding encoded text in the body of the email message so almost all bets are off really.
Diffstat (limited to 'notmuch.c')
-rw-r--r--notmuch.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/notmuch.c b/notmuch.c
index 30b3bba..581592c 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -952,18 +952,18 @@ show_message_part (GMimeObject *part, int *part_count)
const char *filename = g_mime_part_get_filename (GMIME_PART (part));
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
- printf ("%%attachment{ ID: %d, Content-type: %s, ",
+ printf ("\fattachment{ ID: %d, Content-type: %s, ",
*part_count,
g_mime_content_type_to_string (content_type));
printf ("Filename: %s ", filename);
- printf ("%%attachment}\n");
+ printf ("\fattachment}\n");
return;
}
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
- printf ("%%part{ ID: %d, Content-type: %s\n",
+ printf ("\fpart{ ID: %d, Content-type: %s\n",
*part_count,
g_mime_content_type_to_string (content_type));
@@ -978,7 +978,7 @@ show_message_part (GMimeObject *part, int *part_count)
g_mime_data_wrapper_write_to_stream (wrapper, stream);
}
- printf ("%%part}\n");
+ printf ("\fpart}\n");
g_object_unref (stream);
}
@@ -1081,9 +1081,9 @@ show_command (void *ctx, unused (int argc), unused (char *argv[]))
{
message = notmuch_messages_get (messages);
- printf ("%%message{\n");
+ printf ("\fmessage{\n");
- printf ("%%header{\n");
+ printf ("\fheader{\n");
printf ("%s\n", _get_one_line_summary (local, message));
@@ -1094,11 +1094,11 @@ show_command (void *ctx, unused (int argc), unused (char *argv[]))
printf ("%s: %s\n", name, value);
}
- printf ("%%header}\n");
+ printf ("\fheader}\n");
show_message_body (notmuch_message_get_filename (message));
- printf ("%%message}\n");
+ printf ("\fmessage}\n");
notmuch_message_destroy (message);
}