=================================================================== RCS file: /cvs/mandoc/Attic/mlg.c,v retrieving revision 1.19 retrieving revision 1.26 diff -u -p -r1.19 -r1.26 --- mandoc/Attic/mlg.c 2008/12/07 21:30:49 1.19 +++ mandoc/Attic/mlg.c 2008/12/10 12:05:33 1.26 @@ -1,4 +1,4 @@ -/* $Id: mlg.c,v 1.19 2008/12/07 21:30:49 kristaps Exp $ */ +/* $Id: mlg.c,v 1.26 2008/12/10 12:05:33 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -24,16 +24,10 @@ #include #include -#include "libmdocml.h" -#include "private.h" #include "ml.h" /* TODO: literal tokens. */ -#define COLUMNS 72 -#define INDENT 4 -#define MAXINDENT 10 - enum md_tok { MD_TEXT, MD_INLINE_IN, @@ -59,35 +53,48 @@ struct md_mlg { void *data; }; - -static char *mlg_literal(int); -static char *mlg_At_literal(const char *); -static char *mlg_fmt(int); -static char *mlg_St_literal(int); -static void mlg_roffmsg(void *arg, enum roffmsg, - const char *, const char *, char *); +static int mlg_roffmsg(void *arg, + enum roffmsg, const char *, + const char *, const char *); static int mlg_roffhead(void *, const struct tm *, const char *, const char *, - const char *, const char *); -static int mlg_rofftail(void *); -static int mlg_roffin(void *, int, int *, char **); + enum roffmsec, enum roffvol); +static int mlg_rofftail(void *, const struct tm *, + const char *, const char *, + enum roffmsec, enum roffvol); +static int mlg_roffin(void *, int, + int *, const char **); static int mlg_roffdata(void *, int, - const char *, char *); + const char *, const char *); static int mlg_roffout(void *, int); -static int mlg_roffblkin(void *, int, int *, char **); +static int mlg_roffblkin(void *, int, int *, + const char **); static int mlg_roffblkout(void *, int); static int mlg_roffspecial(void *, int, const char *, const int *, - const char **, char **); + const char **, const char **); static int mlg_roffblkheadin(void *, int, - int *, char **); + int *, const char **); static int mlg_roffblkheadout(void *, int); static int mlg_roffblkbodyin(void *, int, - int *, char **); + int *, const char **); static int mlg_roffblkbodyout(void *, int); +static int mlg_ref_special(struct md_mlg *, int, + const char *, const char **); +static int mlg_formatted_special(struct md_mlg *, + int, const char *, const int *, + const char **, const char **); +static int mlg_literal_special(struct md_mlg *, + int, const char *, const int *, + const char **, const char **); +static int mlg_function_special(struct md_mlg *, + const char *, const char **); +static int mlg_atom_special(struct md_mlg *, int, + const char *, const char **); + static int mlg_begintag(struct md_mlg *, enum md_ns, - int, int *, char **); + int, int *, const char **); static int mlg_endtag(struct md_mlg *, enum md_ns, int); static int mlg_indent(struct md_mlg *); static int mlg_newline(struct md_mlg *); @@ -97,12 +104,13 @@ static int mlg_nstring(struct md_mlg *, static int mlg_string(struct md_mlg *, const char *, const char *); static int mlg_data(struct md_mlg *, int, - const char *, char *); -static void mlg_err(struct md_mlg *, const char *, + const char *, const char *); +static int mlg_err(struct md_mlg *, const char *, const char *, const char *, ...); -static void mlg_msg(struct md_mlg *, enum roffmsg, - const char *, const char *, char *); -static void mlg_vmsg(struct md_mlg *, enum roffmsg, +static int mlg_msg(struct md_mlg *, + enum roffmsg, const char *, + const char *, const char *); +static int mlg_vmsg(struct md_mlg *, enum roffmsg, const char *, const char *, const char *, va_list); @@ -112,173 +120,9 @@ extern size_t strlcpy(char *, const char *, size_t); #endif -static char * -mlg_St_literal(int argc) -{ - - switch (argc) { - case(ROFF_p1003_1_88): - return("IEEE Std 1003.1-1988 (“POSIX”)"); - case(ROFF_p1003_1_90): - return("IEEE Std 1003.1-1990 (“POSIX”)"); - case(ROFF_p1003_1_96): - return("ISO/IEC 9945-1:1996 (“POSIX”)"); - case(ROFF_p1003_1_2001): - return("IEEE Std 1003.1-2001 (“POSIX”)"); - case(ROFF_p1003_1_2004): - return("IEEE Std 1003.1-2004 (“POSIX”)"); - case(ROFF_p1003_1): - return("IEEE Std 1003.1 (“POSIX”)"); - case(ROFF_p1003_1b): - return("IEEE Std 1003.1b (“POSIX”)"); - case(ROFF_p1003_1b_93): - return("IEEE Std 1003.1b-1993 (“POSIX”)"); - case(ROFF_p1003_1c_95): - return("IEEE Std 1003.1c-1995 (“POSIX”)"); - case(ROFF_p1003_1g_2000): - return("IEEE Std 1003.1g-2000 (“POSIX”)"); - case(ROFF_p1003_2_92): - return("IEEE Std 1003.2-1992 (“POSIX.2”)"); - case(ROFF_p1387_2_95): - return("IEEE Std 1387.2-1995 (“POSIX.7.2”)"); - case(ROFF_p1003_2): - return("IEEE Std 1003.2 (“POSIX.2”)"); - case(ROFF_p1387_2): - return("IEEE Std 1387.2 (“POSIX.7.2”)"); - case(ROFF_isoC_90): - return("ISO/IEC 9899:1990 (“ISO C90”)"); - case(ROFF_isoC_amd1): - return("ISO/IEC 9899/AMD1:1995 (“ISO C90”)"); - case(ROFF_isoC_tcor1): - return("ISO/IEC 9899/TCOR1:1994 (“ISO C90”)"); - case(ROFF_isoC_tcor2): - return("ISO/IEC 9899/TCOR2:1995 (“ISO C90”)"); - case(ROFF_isoC_99): - return("ISO/IEC 9899:1999 (“ISO C99”)"); - case(ROFF_ansiC): - return("ANSI X3.159-1989 (“ANSI C”)"); - case(ROFF_ansiC_89): - return("ANSI X3.159-1989 (“ANSI C”)"); - case(ROFF_ansiC_99): - return("ANSI/ISO/IEC 9899-1999 (“ANSI C99”)"); - case(ROFF_ieee754): - return("IEEE Std 754-1985"); - case(ROFF_iso8802_3): - return("ISO 8802-3: 1989"); - case(ROFF_xpg3): - return("X/Open Portability Guide Issue 3 (“XPG3”)"); - case(ROFF_xpg4): - return("X/Open Portability Guide Issue 4 (“XPG4”)"); - case(ROFF_xpg4_2): - return("X/Open Portability Guide Issue 4.2 (“XPG4.2”)"); - case(ROFF_xpg4_3): - return("X/Open Portability Guide Issue 4.3 (“XPG4.3”)"); - case(ROFF_xbd5): - return("X/Open System Interface Definitions Issue 5 (“XBD5”)"); - case(ROFF_xcu5): - return("X/Open Commands and Utilities Issue 5 (“XCU5”)"); - case(ROFF_xsh5): - return("X/Open System Interfaces and Headers Issue 5 (“XSH5”)"); - case(ROFF_xns5): - return("X/Open Networking Services Issue 5 (“XNS5”)"); - case(ROFF_xns5_2d2_0): - return("X/Open Networking Services Issue 5.2 Draft 2.0 (“XNS5.2D2.0”)"); - case(ROFF_xcurses4_2): - return("X/Open Curses Issue 4 Version 2 (“XCURSES4.2”)"); - case(ROFF_susv2): - return("Version 2 of the Single UNIX Specification"); - case(ROFF_susv3): - return("Version 3 of the Single UNIX Specification"); - case(ROFF_svid4): - return("System V Interface Definition, Fourth Edition (“SVID4”)"); - default: - break; - } - - abort(); - /* NOTREACHED */ -} - - -static char * -mlg_At_literal(const char *p) -{ - - if (NULL == p) - return("AT&T UNIX"); - if (0 == strcmp(p, "v6")) - return("Version 6 AT&T UNIX"); - else if (0 == strcmp(p, "v7")) - return("Version 7 AT&T UNIX"); - else if (0 == strcmp(p, "32v")) - return("Version 32v AT&T UNIX"); - else if (0 == strcmp(p, "V.1")) - return("AT&T System V.1 UNIX"); - else if (0 == strcmp(p, "V.4")) - return("AT&T System V.4 UNIX"); - - abort(); - /* NOTREACHED */ -} - - -static char * -mlg_fmt(int tok) -{ - - switch (tok) { - case (ROFF_Ex): - return ("The %s utility exits 0 on success, and " - ">0 if an error occurs."); - case (ROFF_Rv): - return ("The %s() function returns the value 0 if " - "successful; otherwise the value -1 " - "is returned and the global variable " - "errno " - "is set to indicate the error."); - case (ROFF_In): - return("#include <%s>"); - default: - break; - } - - abort(); - /* NOTREACHED */ -} - - -static char * -mlg_literal(int tok) -{ - - switch (tok) { - case (ROFF_Bt): - return("is currently in beta test."); - case (ROFF_Ud): - return("currently under development."); - case (ROFF_Fx): - return("FreeBSD"); - case (ROFF_Nx): - return("NetBSD"); - case (ROFF_Ox): - return("OpenBSD"); - case (ROFF_Ux): - return("UNIX"); - case (ROFF_Bx): - return("BSD"); - case (ROFF_Bsx): - return("BSDI BSD/OS"); - default: - break; - } - abort(); - /* NOTREACHED */ -} - - static int mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, - int *argc, char **argv) + int *argc, const char **argv) { ssize_t res; @@ -317,8 +161,8 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, if ( ! ml_nputs(p->mbuf, "<", 1, &p->pos)) return(0); - res = (*p->cbs.ml_begintag)(p->mbuf, p->data, p->args, ns, tok, - argc, (const char **)argv); + res = (*p->cbs.ml_begintag)(p->mbuf, p->data, + p->args, ns, tok, argc, argv); if (-1 == res) return(0); @@ -392,14 +236,10 @@ mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok) static int mlg_indent(struct md_mlg *p) { - size_t count; - count = p->indent > MAXINDENT ? - (size_t)MAXINDENT : p->indent; - count *= INDENT; - assert(0 == p->pos); - return(ml_putchars(p->mbuf, ' ', count, &p->pos)); + return(ml_putchars(p->mbuf, ' ', INDENT_SZ * + INDENT(p->indent), &p->pos)); } @@ -443,12 +283,11 @@ mlg_nstring(struct md_mlg *p, const char *start, if (-1 == res) return(0); - if (0 == (c = ml_nputstring(p->mbuf, buf, sz, &p->pos))) { - mlg_err(p, start, buf, "bad string " - "encoding: `%s'", buf); + if (0 == (c = ml_nputstring(p->mbuf, buf, sz, &p->pos))) + return(mlg_err(p, start, buf, "bad string " + "encoding: `%s'", buf)); + else if (-1 == c) return(0); - } else if (-1 == c) - return(0); res = (*p->cbs.ml_endstring)(p->mbuf, p->args, buf, sz); if (-1 == res) @@ -459,7 +298,8 @@ mlg_nstring(struct md_mlg *p, const char *start, static int -mlg_data(struct md_mlg *p, int space, const char *start, char *buf) +mlg_data(struct md_mlg *p, int space, + const char *start, const char *buf) { size_t sz; @@ -478,7 +318,7 @@ mlg_data(struct md_mlg *p, int space, const char *star if ( ! mlg_nstring(p, start, buf, sz)) return(0); - if (p->indent * INDENT + sz >= COLUMNS) + if (INDENT(p->indent) * INDENT_SZ + sz >= COLUMNS) if ( ! mlg_newline(p)) return(0); @@ -513,10 +353,10 @@ mlg_exit(struct md_mlg *p, int flush) int c; c = roff_free(p->tree, flush); - free(p); - (*p->cbs.ml_free)(p->data); + free(p); + return(c); } @@ -566,7 +406,7 @@ mlg_alloc(const struct md_args *args, static int mlg_roffhead(void *arg, const struct tm *tm, const char *os, - const char *title, const char *sec, const char *vol) + const char *title, enum roffmsec sec, enum roffvol vol) { struct md_mlg *p; @@ -575,7 +415,8 @@ mlg_roffhead(void *arg, const struct tm *tm, const cha mlg_mode(p, MD_BLK_IN); - if ( ! (*p->cbs.ml_begin)(p->mbuf, p->args, tm, os, title, sec, vol)) + if ( ! (*p->cbs.ml_begin)(p->mbuf, p->args, + tm, os, title, sec, vol)) return(0); p->indent++; @@ -584,7 +425,8 @@ mlg_roffhead(void *arg, const struct tm *tm, const cha static int -mlg_rofftail(void *arg) +mlg_rofftail(void *arg, const struct tm *tm, const char *os, + const char *title, enum roffmsec sec, enum roffvol vol) { struct md_mlg *p; @@ -595,34 +437,166 @@ mlg_rofftail(void *arg) if ( ! mlg_newline(p)) return(0); - if ( ! (*p->cbs.ml_end)(p->mbuf, p->args)) + if ( ! (*p->cbs.ml_end)(p->mbuf, p->args, + tm, os, title, sec, vol)) return(0); mlg_mode(p, MD_BLK_OUT); - return(mlg_newline(p)); } +static int +mlg_literal_special(struct md_mlg *p, int tok, const char *start, + const int *argc, const char **argv, const char **more) +{ + char *lit; + + if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) + return(0); + + lit = roff_literal(tok, argc, argv, more); + assert(lit); + + if ( ! mlg_string(p, start, lit)) + return(0); + + while (*more) { + if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) + return(0); + if ( ! mlg_string(p, start, *more++)) + return(0); + } + + return(mlg_endtag(p, MD_NS_INLINE, tok)); +} + + +static int +mlg_ref_special(struct md_mlg *p, int tok, + const char *start, const char **more) +{ + + if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) + return(0); + + assert(*more); + if ( ! ml_puts(p->mbuf, *more++, &p->pos)) + return(0); + + if (*more) { + if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) + return(0); + if ( ! mlg_string(p, start, *more++)) + return(0); + if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos)) + return(0); + } + + assert(NULL == *more); + return(mlg_endtag(p, MD_NS_INLINE, tok)); +} + + +static int +mlg_formatted_special(struct md_mlg *p, int tok, const char *start, + const int *argc, const char **argv, const char **more) +{ + char buf[256], *lit; + + if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) + return(0); + + lit = roff_fmtstring(tok); + + assert(lit); + assert(*more); + (void)snprintf(buf, sizeof(buf), lit, *more++); + assert(NULL == *more); + + if ( ! mlg_string(p, start, buf)) + return(0); + + return(mlg_endtag(p, MD_NS_INLINE, tok)); +} + + +static int +mlg_atom_special(struct md_mlg *p, int tok, + const char *start, const char **more) +{ + + if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) + return(0); + + assert(*more); + if ( ! mlg_string(p, start, *more++)) + return(0); + + /*assert(NULL == *more);*/ /* FIXME: ROFF_Sx */ + return(mlg_endtag(p, MD_NS_INLINE, tok)); +} + + +static int +mlg_function_special(struct md_mlg *p, + const char *start, const char **more) +{ + + assert(*more); + + if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fn, NULL, more)) + return(0); + if ( ! mlg_string(p, start, *more++)) + return(0); + if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fn)) + return(0); + + if (NULL == *more) + return(1); + + if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) + return(0); + + p->flags |= ML_OVERRIDE_ONE; + + if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fa, NULL, more)) + return(0); + if ( ! mlg_string(p, start, *more++)) + return(0); + if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fa)) + return(0); + + while (*more) { + if ( ! ml_nputs(p->mbuf, ", ", 2, &p->pos)) + return(0); + if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fa, NULL, more)) + return(0); + if ( ! mlg_string(p, start, *more++)) + return(0); + if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fa)) + return(0); + } + + return(ml_nputs(p->mbuf, ")", 1, &p->pos)); +} + + /* ARGSUSED */ static int mlg_roffspecial(void *arg, int tok, const char *start, - const int *argc, const char **argv, char **more) + const int *argc, const char **argv, const char **more) { struct md_mlg *p; - char buf[256]; assert(arg); p = (struct md_mlg *)arg; - /* - * First handle macros without content. - */ - switch (tok) { case (ROFF_Ns): p->flags |= ML_OVERRIDE_ONE; return(1); + case (ROFF_Sm): assert(*more); if (0 == strcmp(*more, "on")) @@ -630,124 +604,34 @@ mlg_roffspecial(void *arg, int tok, const char *start, else p->flags &= ~ML_OVERRIDE_ALL; return(1); - default: - break; - } - /* - * Handle macros put into different-token tags. - */ - - switch (tok) { case (ROFF_Fn): - assert(*more); - if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) - return(0); - if ( ! mlg_string(p, start, *more++)) - return(0); - if ( ! mlg_endtag(p, MD_NS_INLINE, tok)) - return(0); - if (*more) { - if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) - return(0); - p->flags |= ML_OVERRIDE_ONE; - if ( ! mlg_begintag(p, MD_NS_INLINE, - ROFF_Fa, NULL, more)) - return(0); - if ( ! mlg_string(p, start, *more++)) - return(0); - if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fa)) - return(0); - while (*more) { - if ( ! ml_nputs(p->mbuf, ", ", 2, &p->pos)) - return(0); - if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fa, NULL, more)) - return(0); - if ( ! mlg_string(p, start, *more++)) - return(0); - if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fa)) - return(0); - } - if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos)) - return(0); - } - return(1); - default: - break; - } + return(mlg_function_special(p, start, more)); - /* - * Now handle macros in their environments. - */ - - if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) - return(0); - - switch (tok) { - case (ROFF_St): - assert(NULL == *argv); - assert(ROFF_ARGMAX != *argc); - if ( ! ml_puts(p->mbuf, mlg_St_literal(*argc), - &p->pos)) - return(0); - while (*more) { - if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) - return(0); - if ( ! mlg_string(p, start, *more++)) - return(0); - } - break; - case (ROFF_Xr): - if ( ! *more) { - mlg_err(p, start, start, "missing argument"); - return(0); - } - if ( ! ml_puts(p->mbuf, *more++, &p->pos)) - return(0); - if (*more) { - if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) - return(0); - if ( ! mlg_string(p, start, *more++)) - return(0); - if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos)) - return(0); - } - if (*more) { - mlg_err(p, start, start, "too many arguments"); - return(0); - } - break; - - case (ROFF_Sx): + return(mlg_ref_special(p, tok, start, more)); + + case (ROFF_Sx): /* FIXME */ /* FALLTHROUGH */ case (ROFF_Nm): - assert(*more); - if ( ! mlg_string(p, start, *more++)) - return(0); - assert(NULL == *more); - break; + return(mlg_atom_special(p, tok, start, more)); case (ROFF_In): /* NOTREACHED */ case (ROFF_Ex): /* NOTREACHED */ case (ROFF_Rv): - assert(*more); - /* FIXME: *more must be ml-filtered. */ - (void)snprintf(buf, sizeof(buf), - mlg_fmt(tok), *more++); - if ( ! ml_puts(p->mbuf, buf, &p->pos)) - return(0); - assert(NULL == *more); - break; + return(mlg_formatted_special(p, tok, start, + argc, argv, more)); case (ROFF_At): - /* FIXME: *more must be ml-filtered. */ - if ( ! ml_puts(p->mbuf, mlg_At_literal(*more), &p->pos)) - return(0); - break; - + /* FALLTHROUGH */ + case (ROFF_Bt): + /* FALLTHROUGH */ + case (ROFF_Ud): + /* FALLTHROUGH */ + case (ROFF_Ux): + /* FALLTHROUGH */ case (ROFF_Bx): /* FALLTHROUGH */ case (ROFF_Bsx): @@ -756,39 +640,23 @@ mlg_roffspecial(void *arg, int tok, const char *start, /* FALLTHROUGH */ case (ROFF_Nx): /* FALLTHROUGH */ - case (ROFF_Ox): - if ( ! ml_puts(p->mbuf, mlg_literal(tok), &p->pos)) - return(0); - while (*more) { - if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) - return(0); - if ( ! mlg_string(p, start, *more++)) - return(0); - } - break; - - case (ROFF_Bt): + case (ROFF_St): /* FALLTHROUGH */ - case (ROFF_Ud): - /* FALLTHROUGH */ - case (ROFF_Ux): - assert(NULL == *more); - if ( ! ml_puts(p->mbuf, mlg_literal(tok), &p->pos)) - return(0); - break; - + case (ROFF_Ox): + return(mlg_literal_special(p, tok, start, + argc, argv, more)); default: - mlg_err(p, start, start, "`%s' not yet supported", - toknames[tok]); - return(0); + break; } - return(mlg_endtag(p, MD_NS_INLINE, tok)); + return(mlg_err(p, start, start, "`%s' not yet supported", + toknames[tok])); } static int -mlg_roffblkin(void *arg, int tok, int *argc, char **argv) +mlg_roffblkin(void *arg, int tok, + int *argc, const char **argv) { return(mlg_begintag((struct md_mlg *)arg, @@ -805,7 +673,8 @@ mlg_roffblkout(void *arg, int tok) static int -mlg_roffblkbodyin(void *arg, int tok, int *argc, char **argv) +mlg_roffblkbodyin(void *arg, int tok, + int *argc, const char **argv) { return(mlg_begintag((struct md_mlg *)arg, @@ -822,7 +691,8 @@ mlg_roffblkbodyout(void *arg, int tok) static int -mlg_roffblkheadin(void *arg, int tok, int *argc, char **argv) +mlg_roffblkheadin(void *arg, int tok, + int *argc, const char **argv) { return(mlg_begintag((struct md_mlg *)arg, @@ -839,7 +709,7 @@ mlg_roffblkheadout(void *arg, int tok) static int -mlg_roffin(void *arg, int tok, int *argc, char **argv) +mlg_roffin(void *arg, int tok, int *argc, const char **argv) { return(mlg_begintag((struct md_mlg *)arg, @@ -855,17 +725,18 @@ mlg_roffout(void *arg, int tok) } -static void -mlg_roffmsg(void *arg, enum roffmsg lvl, - const char *buf, const char *pos, char *msg) +static int +mlg_roffmsg(void *arg, enum roffmsg lvl, const char *buf, + const char *pos, const char *msg) { - mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg); + return(mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg)); } static int -mlg_roffdata(void *arg, int space, const char *start, char *buf) +mlg_roffdata(void *arg, int space, + const char *start, const char *buf) { struct md_mlg *p; @@ -876,58 +747,82 @@ mlg_roffdata(void *arg, int space, const char *start, return(0); mlg_mode(p, MD_TEXT); - return(1); } -static void +static int mlg_vmsg(struct md_mlg *p, enum roffmsg lvl, const char *start, const char *pos, const char *fmt, va_list ap) { char buf[128]; (void)vsnprintf(buf, sizeof(buf), fmt, ap); - mlg_msg(p, lvl, start, pos, buf); + return(mlg_msg(p, lvl, start, pos, buf)); } -static void +static int mlg_err(struct md_mlg *p, const char *start, const char *pos, const char *fmt, ...) { va_list ap; + int c; va_start(ap, fmt); - mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap); + c = mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap); va_end(ap); + return(c); } -static void +static int mlg_msg(struct md_mlg *p, enum roffmsg lvl, - const char *buf, const char *pos, char *msg) + const char *buf, const char *pos, const char *msg) { char *level; + char b[256]; + int i; switch (lvl) { case (ROFF_WARN): - if ( ! (MD_WARN_ALL & p->args->warnings)) - return; level = "warning"; + if ( ! (MD_WARN_ALL & p->args->warnings)) + return(1); break; case (ROFF_ERROR): level = "error"; break; default: abort(); + /* NOTREACHED */ } - - if (pos) - (void)fprintf(stderr, "%s:%zu: %s: %s (column %zu)\n", - p->rbuf->name, p->rbuf->line, level, - msg, pos - buf); - else - (void)fprintf(stderr, "%s: %s: %s\n", + + if (pos) { + assert(pos >= buf); + if (0 < p->args->verbosity) { + (void)snprintf(b, sizeof(b), + "%s:%zu: %s: %s\n", + p->rbuf->name, p->rbuf->line, + level, msg); + (void)strlcat(b, "Error at: ", sizeof(b)); + (void)strlcat(b, p->rbuf->linebuf, sizeof(b)); + + (void)strlcat(b, "\n ", sizeof(b)); + for (i = 0; i < pos - buf; i++) + (void)strlcat(b, " ", sizeof(b)); + (void)strlcat(b, "^", sizeof(b)); + + } else + (void)snprintf(b, sizeof(b), + "%s:%zu: %s: %s (col %zu)", + p->rbuf->name, p->rbuf->line, + level, msg, pos - buf); + } else + (void)snprintf(b, sizeof(b), "%s: %s: %s", p->rbuf->name, level, msg); + + (void)fprintf(stderr, "%s\n", b); + return(lvl == ROFF_WARN ? 1 : 0); } +