debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch show: Switch to control character to mark sections of output

Browse source 
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.
This commit is contained in:
Carl Worth 2009-11-02 21:13:19 -08:00
parent 40382ed98c
commit a81849b5e2
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
notmuch.c
View file

@ -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);
}

2
notmuch.el
View file

@ -41,7 +41,7 @@
"Keymap for \"notmuch show\" buffers.")
(fset 'notmuch-show-mode-map notmuch-show-mode-map)
(defvar notmuch-show-message-begin-regexp "%message{")
(defvar notmuch-show-message-begin-regexp " message{")
(defun notmuch-show-next-message ()
"Advance point to the beginning of the next message in the buffer."