emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* fix json, sexp output

This commit is contained in:
Dirk-Jan C. Binnema 2011-01-06 16:55:43 +02:00
parent f6de417117
commit c712267c0f
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mu-output.c
View File

@ -342,7 +342,7 @@ print_attr_sexp (const char* elm, const char *str, gboolean nl)
return; /* empty: don't include */ return; /* empty: don't include */
esc = mu_str_escape_c_literal (str); esc = mu_str_escape_c_literal (str);
g_print ("\t\t\t(:%s \"%s\")%s", elm, esc, nl ? "\n" : ""); g_print (" (:%s \"%s\")%s", elm, esc, nl ? "\n" : "");
g_free (esc); g_free (esc);
} }
@ -356,7 +356,7 @@ mu_output_sexp (MuMsgIter *iter, size_t *count)
g_return_val_if_fail (iter, FALSE); g_return_val_if_fail (iter, FALSE);
g_print ("(\n\t:messages\n"); g_print ("(:messages\n");
for (myiter = iter, mycount = 0; !mu_msg_iter_is_done (myiter); for (myiter = iter, mycount = 0; !mu_msg_iter_is_done (myiter);
mu_msg_iter_next (myiter), ++mycount) { mu_msg_iter_next (myiter), ++mycount) {
@ -364,14 +364,14 @@ mu_output_sexp (MuMsgIter *iter, size_t *count)
if (mycount != 0) if (mycount != 0)
g_print ("\n"); g_print ("\n");
g_print ("\t\t(:message\n"); g_print (" (:message\n");
print_attr_sexp ("from", mu_msg_iter_get_from (iter),TRUE); print_attr_sexp ("from", mu_msg_iter_get_from (iter),TRUE);
print_attr_sexp ("to", mu_msg_iter_get_to (iter),TRUE); print_attr_sexp ("to", mu_msg_iter_get_to (iter),TRUE);
print_attr_sexp ("cc", mu_msg_iter_get_cc (iter),TRUE); print_attr_sexp ("cc", mu_msg_iter_get_cc (iter),TRUE);
print_attr_sexp ("subject", mu_msg_iter_get_subject (iter),TRUE); print_attr_sexp ("subject", mu_msg_iter_get_subject (iter),TRUE);
g_print ("\t\t\t(:date %u)\n", g_print (" (:date %u)\n",
(unsigned) mu_msg_iter_get_date (iter)); (unsigned) mu_msg_iter_get_date (iter));
g_print ("\t\t\t(:size %u)\n", g_print (" (:size %u)\n",
(unsigned) mu_msg_iter_get_size (iter)); (unsigned) mu_msg_iter_get_size (iter));
print_attr_sexp ("msgid", mu_msg_iter_get_msgid (iter),TRUE); print_attr_sexp ("msgid", mu_msg_iter_get_msgid (iter),TRUE);
print_attr_sexp ("path", mu_msg_iter_get_path (iter),TRUE); print_attr_sexp ("path", mu_msg_iter_get_path (iter),TRUE);

10
src/mu-str.c
View File

@ -334,10 +334,6 @@ mu_str_size_parse_kmg (const char* str)
} }
char* char*
mu_str_ascii_xapian_escape_in_place (char *query) mu_str_ascii_xapian_escape_in_place (char *query)
{ {
@ -408,9 +404,9 @@ mu_str_escape_c_literal (const gchar* str)
tmp = g_string_sized_new (2 * strlen(str)); tmp = g_string_sized_new (2 * strlen(str));
for (cur = str; *cur; ++cur) for (cur = str; *cur; ++cur)
switch (*cur) { switch (*cur) {
case '\\': tmp = g_string_append (tmp, "\\\\"); case '\\': tmp = g_string_append (tmp, "\\\\"); break;
case '\"': tmp = g_string_append (tmp, "\\\""); case '"': tmp = g_string_append (tmp, "\\\""); break;
default: tmp = g_string_append_c (tmp, *cur); default: tmp = g_string_append_c (tmp, *cur);
} }
return g_string_free (tmp, FALSE); return g_string_free (tmp, FALSE);