fix unchecked snprintf(3) in page header printing:

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index 09f052c3d2cd89f79cd0bdb63050f3fa624b5939..a2ab4839c1be983e12d6d645fc327dc64f879ac9 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ascii.c,v 1.23 2014/03/30 19:47:48 schwarze Exp $ */
+/*     $Id: term_ascii.c,v 1.25 2014/04/20 16:46:05 schwarze Exp $ */

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


@@ -58,7 +58,7 @@ static        void              ascii_begin(struct termp *);
 static void              ascii_end(struct termp *);
 static void              ascii_endline(struct termp *);
 static void              ascii_letter(struct termp *, int);
 static void              ascii_end(struct termp *);
 static void              ascii_endline(struct termp *);
 static void              ascii_letter(struct termp *, int);

-static void              ascii_setwidth(struct termp *, size_t);
+static void              ascii_setwidth(struct termp *, int, size_t);

 
 #ifdef USE_WCHAR
 static void              locale_advance(struct termp *, size_t);
 
 #ifdef USE_WCHAR
 static void              locale_advance(struct termp *, size_t);


@@ -67,6 +67,7 @@ static        void              locale_letter(struct termp *, int);
 static size_t            locale_width(const struct termp *, int);
 #endif
 
 static size_t            locale_width(const struct termp *, int);
 #endif
 

+

 static struct termp *
 ascii_init(enum termenc enc, char *outopts)
 {
 static struct termp *
 ascii_init(enum termenc enc, char *outopts)
 {


@@ -94,8 +95,8 @@ ascii_init(enum termenc enc, char *outopts)
 #ifdef USE_WCHAR
        if (TERMENC_ASCII != enc) {
                v = TERMENC_LOCALE == enc ?
 #ifdef USE_WCHAR
        if (TERMENC_ASCII != enc) {
                v = TERMENC_LOCALE == enc ?

-                       setlocale(LC_ALL, "") :
-                       setlocale(LC_CTYPE, "en_US.UTF-8");
+                   setlocale(LC_ALL, "") :
+                   setlocale(LC_CTYPE, "en_US.UTF-8");

                if (NULL != v && MB_CUR_MAX > 1) {
                        p->enc = enc;
                        p->advance = locale_advance;
                if (NULL != v && MB_CUR_MAX > 1) {
                        p->enc = enc;
                        p->advance = locale_advance;


@@ -113,13 +114,13 @@ ascii_init(enum termenc enc, char *outopts)
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {

-               case (0):
+               case 0:

                        p->defindent = (size_t)atoi(v);
                        break;
                        p->defindent = (size_t)atoi(v);
                        break;

-               case (1):
+               case 1:

                        p->defrmargin = (size_t)atoi(v);
                        break;
                        p->defrmargin = (size_t)atoi(v);
                        break;

-               case (2):
+               case 2:

                        /*
                         * Temporary, undocumented mode
                         * to imitate mdoc(7) output style.
                        /*
                         * Temporary, undocumented mode
                         * to imitate mdoc(7) output style.


@@ -152,7 +153,6 @@ utf8_alloc(char *outopts)
        return(ascii_init(TERMENC_UTF8, outopts));
 }
 
        return(ascii_init(TERMENC_UTF8, outopts));
 }
 

-

 void *
 locale_alloc(char *outopts)
 {
 void *
 locale_alloc(char *outopts)
 {


@@ -161,17 +161,20 @@ locale_alloc(char *outopts)
 }
 
 static void
 }
 
 static void

-ascii_setwidth(struct termp *p, size_t width)
+ascii_setwidth(struct termp *p, int iop, size_t width)

 {
 {

-       size_t   lastwidth;

 
 

-       lastwidth = p->defrmargin;
-       p->rmargin = p->maxrmargin = p->defrmargin =
-           width ? width : p->lastrmargin;
-       p->lastrmargin = lastwidth;
+       p->rmargin = p->defrmargin;
+       if (0 < iop)
+               p->defrmargin += width;
+       else if (0 > iop)
+               p->defrmargin -= width;
+       else
+               p->defrmargin = width ? width : p->lastrmargin;
+       p->lastrmargin = p->rmargin;
+       p->rmargin = p->maxrmargin = p->defrmargin;

 }
 
 }
 

-/* ARGSUSED */

 static size_t
 ascii_width(const struct termp *p, int c)
 {
 static size_t
 ascii_width(const struct termp *p, int c)
 {


@@ -186,11 +189,10 @@ ascii_free(void *arg)
        term_free((struct termp *)arg);
 }
 
        term_free((struct termp *)arg);
 }
 

-/* ARGSUSED */

 static void
 ascii_letter(struct termp *p, int c)
 {
 static void
 ascii_letter(struct termp *p, int c)
 {

-       
+

        putchar(c);
 }
 
        putchar(c);
 }
 


@@ -208,7 +210,6 @@ ascii_end(struct termp *p)
        (*p->footf)(p, p->argf);
 }
 
        (*p->footf)(p, p->argf);
 }
 

-/* ARGSUSED */

 static void
 ascii_endline(struct termp *p)
 {
 static void
 ascii_endline(struct termp *p)
 {


@@ -216,17 +217,15 @@ ascii_endline(struct termp *p)
        putchar('\n');
 }
 
        putchar('\n');
 }
 

-/* ARGSUSED */

 static void
 ascii_advance(struct termp *p, size_t len)
 {
 static void
 ascii_advance(struct termp *p, size_t len)
 {

-       size_t          i;
+       size_t          i;

 
        for (i = 0; i < len; i++)
                putchar(' ');
 }
 
 
        for (i = 0; i < len; i++)
                putchar(' ');
 }
 

-/* ARGSUSED */

 static double
 ascii_hspan(const struct termp *p, const struct roffsu *su)
 {
 static double
 ascii_hspan(const struct termp *p, const struct roffsu *su)
 {


@@ -238,22 +237,22 @@ ascii_hspan(const struct termp *p, const struct roffsu *su)
         */
 
        switch (su->unit) {
         */
 
        switch (su->unit) {

-       case (SCALE_CM):
+       case SCALE_CM:

                r = 4 * su->scale;
                break;
                r = 4 * su->scale;
                break;

-       case (SCALE_IN):
+       case SCALE_IN:

                r = 10 * su->scale;
                break;
                r = 10 * su->scale;
                break;

-       case (SCALE_PC):
+       case SCALE_PC:

                r = (10 * su->scale) / 6;
                break;
                r = (10 * su->scale) / 6;
                break;

-       case (SCALE_PT):
+       case SCALE_PT:

                r = (10 * su->scale) / 72;
                break;
                r = (10 * su->scale) / 72;
                break;

-       case (SCALE_MM):
+       case SCALE_MM:

                r = su->scale / 1000;
                break;
                r = su->scale / 1000;
                break;

-       case (SCALE_VS):
+       case SCALE_VS:

                r = su->scale * 2 - 1;
                break;
        default:
                r = su->scale * 2 - 1;
                break;
        default:


@@ -265,7 +264,6 @@ ascii_hspan(const struct termp *p, const struct roffsu *su)
 }
 
 #ifdef USE_WCHAR
 }
 
 #ifdef USE_WCHAR

-/* ARGSUSED */

 static size_t
 locale_width(const struct termp *p, int c)
 {
 static size_t
 locale_width(const struct termp *p, int c)
 {


@@ -274,17 +272,15 @@ locale_width(const struct termp *p, int c)
        return((rc = wcwidth(c)) < 0 ? 0 : rc);
 }
 
        return((rc = wcwidth(c)) < 0 ? 0 : rc);
 }
 

-/* ARGSUSED */

 static void
 locale_advance(struct termp *p, size_t len)
 {
 static void
 locale_advance(struct termp *p, size_t len)
 {

-       size_t          i;
+       size_t          i;

 
        for (i = 0; i < len; i++)
                putwchar(L' ');
 }
 
 
        for (i = 0; i < len; i++)
                putwchar(L' ');
 }
 

-/* ARGSUSED */

 static void
 locale_endline(struct termp *p)
 {
 static void
 locale_endline(struct termp *p)
 {


@@ -292,11 +288,10 @@ locale_endline(struct termp *p)
        putwchar(L'\n');
 }
 
        putwchar(L'\n');
 }
 

-/* ARGSUSED */

 static void
 locale_letter(struct termp *p, int c)
 {
 static void
 locale_letter(struct termp *p, int c)
 {

-       
+

        putwchar(c);
 }
 #endif
        putwchar(c);
 }
 #endif