const char *item_sep;
const char *item_end;
const char *results_end;
+ const char *results_null;
} search_format_t;
static void
"%s", " ",
")", "\n",
"",
+ "\n",
"",
};
"]", ",\n",
"}",
"]\n",
+ "]\n",
};
static void
printf ("%s%s", item_type, item_id);
}
+static char *
+sanitize_string (const void *ctx, const char *str)
+{
+ char *out, *loop;
+
+ if (NULL == str)
+ return NULL;
+
+ loop = out = talloc_strdup (ctx, str);
+
+ for (; *loop; loop++) {
+ if ((unsigned char)(*loop) < 32)
+ *loop = '?';
+ }
+ return out;
+}
+
static void
format_thread_text (const void *ctx,
const char *thread_id,
const char *authors,
const char *subject)
{
+ void *ctx_quote = talloc_new (ctx);
+
printf ("thread:%s %12s [%d/%d] %s; %s",
thread_id,
notmuch_time_relative_date (ctx, date),
matched,
total,
- authors,
- subject);
+ sanitize_string (ctx_quote, authors),
+ sanitize_string (ctx_quote, subject));
+
+ talloc_free (ctx_quote);
}
static void
notmuch_thread_destroy (thread);
}
- fputs (format->results_end, stdout);
+ if (first_thread)
+ fputs (format->results_null, stdout);
+ else
+ fputs (format->results_end, stdout);
return 0;
}
{
notmuch_message_t *message;
notmuch_messages_t *messages;
+ notmuch_filenames_t *filenames;
int first_message = 1;
messages = notmuch_query_search_messages (query);
{
message = notmuch_messages_get (messages);
- if (! first_message)
- fputs (format->item_sep, stdout);
-
if (output == OUTPUT_FILES) {
- format->item_id (message, "",
- notmuch_message_get_filename (message));
+ filenames = notmuch_message_get_filenames (message);
+
+ for (;
+ notmuch_filenames_valid (filenames);
+ notmuch_filenames_move_to_next (filenames))
+ {
+ if (! first_message)
+ fputs (format->item_sep, stdout);
+
+ format->item_id (message, "",
+ notmuch_filenames_get (filenames));
+
+ first_message = 0;
+ }
+
+ notmuch_filenames_destroy( filenames );
+
} else { /* output == OUTPUT_MESSAGES */
+ if (! first_message)
+ fputs (format->item_sep, stdout);
+
format->item_id (message, "id:",
notmuch_message_get_message_id (message));
+ first_message = 0;
}
- first_message = 0;
-
notmuch_message_destroy (message);
}
notmuch_messages_destroy (messages);
- fputs (format->results_end, stdout);
+ if (first_message)
+ fputs (format->results_null, stdout);
+ else
+ fputs (format->results_end, stdout);
return 0;
}
if (messages)
notmuch_messages_destroy (messages);
- fputs (format->results_end, stdout);
+ if (first_tag)
+ fputs (format->results_null, stdout);
+ else
+ fputs (format->results_end, stdout);
return 0;
}