From 7f134e093fe20357e6698e21ebaf05ef85a51f7a Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 17 Jul 2010 12:01:43 +0000 Subject: Avoid letter-by-letter encoding by using strcspn() in term_word(). --- term.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/term.c b/term.c index 8788953b..9894ac07 100644 --- a/term.c +++ b/term.c @@ -503,14 +503,13 @@ term_word(struct termp *p, const char *word) p->flags &= ~TERMP_SENTENCE; - /* FIXME: use strcspn. */ - while (*word) { - if ('\\' != *word) { - encode(p, word, 1); - word++; + if ((ssz = strcspn(word, "\\")) > 0) + encode(p, word, ssz); + + word += ssz; + if ('\\' != *word) continue; - } seq = ++word; sz = a2roffdeco(&deco, &seq, &ssz); @@ -547,7 +546,7 @@ term_word(struct termp *p, const char *word) * Note that we don't process the pipe: the parser sees it as * punctuation, but we don't in terms of typography. */ - if (sv[0] && 0 == sv[1]) + if (sv[0] && '\0' == sv[1]) switch (sv[0]) { case('('): /* FALLTHROUGH */ -- cgit