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_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;
}