Remove function calls to res() and so forth in term_word(). These were

only used once and simply bloated the binary.  Also fix mchars_num2char
to correctly render the character instead of using atoi().  This makes
the conversation more strict, but it's more correct.

diff --git a/chars.c b/chars.c
index 41b02e3483f048ce32d410d3a0c3e3fb0e00b1ea..06a2a923f691958889c9142fdfbea4028c03c735 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,4 +1,4 @@
-/*     $Id: chars.c,v 1.42 2011/05/15 15:47:46 kristaps Exp $ */
+/*     $Id: chars.c,v 1.43 2011/05/15 22:29:50 kristaps Exp $ */

 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "mandoc.h"
 #include <string.h>
 
 #include "mandoc.h"

+#include "libmandoc.h"

 
 #define        PRINT_HI         126
 #define        PRINT_LO         32
 
 #define        PRINT_HI         126
 #define        PRINT_LO         32


@@ -148,11 +149,9 @@ mchars_num2char(const char *p, size_t sz)
 {
        int               i;
 
 {
        int               i;
 

-       if (sz > 3)
+       if ((i = mandoc_strntou(p, sz, 10)) < 0)

                return('\0');
 
                return('\0');
 

-       i = atoi(p);
-       /* LINTED */

        return(isprint(i) ? i : '\0');
 }
 
        return(isprint(i) ? i : '\0');
 }
 

diff --git a/term.c b/term.c
index 110bbc468749a52a4a87d08807187f46f61407ed..0ea561cb8959775e5d758599a441ae694c3543aa 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.190 2011/05/15 15:47:46 kristaps Exp $ */
+/*     $Id: term.c,v 1.191 2011/05/15 22:29:50 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -33,12 +33,9 @@
 #include "term.h"
 #include "main.h"
 
 #include "term.h"
 #include "main.h"
 

-static void              spec(struct termp *, const char *, size_t);
-static void              res(struct termp *, const char *, size_t);
-static void              bufferc(struct termp *, char);
-static void              adjbuf(struct termp *p, int);
-static void              encode(struct termp *, const char *, size_t);
-
+static void             adjbuf(struct termp *p, int);
+static void             bufferc(struct termp *, char);
+static void             encode(struct termp *, const char *, size_t);

 
 void
 term_free(struct termp *p)
 
 void
 term_free(struct termp *p)


@@ -344,43 +341,6 @@ term_vspace(struct termp *p)
        (*p->endline)(p);
 }
 
        (*p->endline)(p);
 }
 

-
-static void
-numbered(struct termp *p, const char *word, size_t len)
-{
-       char             c;
-
-       if ('\0' != (c = mchars_num2char(word, len)))
-               encode(p, &c, 1);
-}
-
-
-static void
-spec(struct termp *p, const char *word, size_t len)
-{
-       const char      *rhs;
-       size_t           sz;
-
-       rhs = mchars_spec2str(p->symtab, word, len, &sz);
-       if (rhs) 
-               encode(p, rhs, sz);
-       else if (1 == len)
-               encode(p, word, len);
-}
-
-
-static void
-res(struct termp *p, const char *word, size_t len)
-{
-       const char      *rhs;
-       size_t           sz;
-
-       rhs = mchars_res2str(p->symtab, word, len, &sz);
-       if (rhs)
-               encode(p, rhs, sz);
-}
-
-

 void
 term_fontlast(struct termp *p)
 {
 void
 term_fontlast(struct termp *p)
 {


@@ -445,7 +405,6 @@ term_fontpop(struct termp *p)
        p->fonti--;
 }
 
        p->fonti--;
 }
 

-

 /*
  * Handle pwords, partial words, which may be either a single word or a
  * phrase that cannot be broken down (such as a literal string).  This
 /*
  * Handle pwords, partial words, which may be either a single word or a
  * phrase that cannot be broken down (such as a literal string).  This


@@ -454,7 +413,8 @@ term_fontpop(struct termp *p)
 void
 term_word(struct termp *p, const char *word)
 {
 void
 term_word(struct termp *p, const char *word)
 {

-       const char      *seq;
+       const char      *seq, *cp;
+       char             c;

        int              sz;
        size_t           ssz;
        enum mandoc_esc  esc;
        int              sz;
        size_t           ssz;
        enum mandoc_esc  esc;


@@ -492,13 +452,20 @@ term_word(struct termp *p, const char *word)
 
                switch (esc) {
                case (ESCAPE_NUMBERED):
 
                switch (esc) {
                case (ESCAPE_NUMBERED):

-                       numbered(p, seq, sz);
+                       if ('\0' != (c = mchars_num2char(seq, sz)))
+                               encode(p, &c, 1);

                        break;
                case (ESCAPE_PREDEF):
                        break;
                case (ESCAPE_PREDEF):

-                       res(p, seq, sz);
+                       cp = mchars_res2str(p->symtab, seq, sz, &ssz);
+                       if (NULL != cp)
+                               encode(p, cp, ssz);

                        break;
                case (ESCAPE_SPECIAL):
                        break;
                case (ESCAPE_SPECIAL):

-                       spec(p, seq, sz);
+                       cp = mchars_spec2str(p->symtab, seq, sz, &ssz);
+                       if (NULL != cp) 
+                               encode(p, cp, ssz);
+                       else if (1 == ssz)
+                               encode(p, seq, sz);

                        break;
                case (ESCAPE_FONTBOLD):
                        term_fontrepl(p, TERMFONT_BOLD);
                        break;
                case (ESCAPE_FONTBOLD):
                        term_fontrepl(p, TERMFONT_BOLD);


@@ -522,7 +489,6 @@ term_word(struct termp *p, const char *word)
        }
 }
 
        }
 }
 

-

 static void
 adjbuf(struct termp *p, int sz)
 {
 static void
 adjbuf(struct termp *p, int sz)
 {


@@ -536,7 +502,6 @@ adjbuf(struct termp *p, int sz)
                (p->buf, sizeof(int) * (size_t)p->maxcols);
 }
 
                (p->buf, sizeof(int) * (size_t)p->maxcols);
 }
 

-

 static void
 bufferc(struct termp *p, char c)
 {
 static void
 bufferc(struct termp *p, char c)
 {


@@ -547,7 +512,6 @@ bufferc(struct termp *p, char c)
        p->buf[p->col++] = c;
 }
 
        p->buf[p->col++] = c;
 }
 

-

 static void
 encode(struct termp *p, const char *word, size_t sz)
 {
 static void
 encode(struct termp *p, const char *word, size_t sz)
 {


@@ -592,7 +556,6 @@ encode(struct termp *p, const char *word, size_t sz)
        }
 }
 
        }
 }
 

-

 size_t
 term_len(const struct termp *p, size_t sz)
 {
 size_t
 term_len(const struct termp *p, size_t sz)
 {