[PATCH 7/8] wrap_in_html(): use strbuf_addstr_xml_quoted()
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Nov 25, 2012, 11:08 UTC
- Message-ID
- <1353841721-16269-8-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1353841721-16269-1-git-send-email-mhagger@alum.mit.edu>
Use the new function to quote characters as they are being added to buf, rather than quoting them in *p and then copying them into buf. This increases code sharing, and changes the algorithm from O(N^2) to O(N) in the number of characters in a line.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- imap-send.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/imap-send.c b/imap-send.c index a5e0e33..b73c913 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1339,21 +1339,6 @@ static int imap_store_msg(struct store *gctx, struct msg_data *msg) return DRV_OK; } -static void encode_html_chars(struct strbuf *p) -{ - int i; - for (i = 0; i < p->len; i++) { - if (p->buf[i] == '&') - strbuf_splice(p, i, 1, "&", 5); - if (p->buf[i] == '<') - strbuf_splice(p, i, 1, "<", 4); - if (p->buf[i] == '>') - strbuf_splice(p, i, 1, ">", 4); - if (p->buf[i] == '"') - strbuf_splice(p, i, 1, """, 6); - } -} - static void wrap_in_html(struct strbuf *msg) { struct strbuf buf = STRBUF_INIT; @@ -1372,12 +1357,12 @@ static void wrap_in_html(struct strbuf *msg) strbuf_addbuf(&buf, *p); strbuf_addstr(&buf, pre_open); added_header = 1; - continue; + } else { + strbuf_addbuf(&buf, *p); } + } else { + strbuf_addstr_xml_quoted(&buf, (*p)->buf); } - else - encode_html_chars(*p); - strbuf_addbuf(&buf, *p); } strbuf_addstr(&buf, pre_close); strbuf_list_free(lines);
-- 1.8.0