=================================================================== RCS file: /cvs/mandoc/Attic/mlg.c,v retrieving revision 1.11 retrieving revision 1.15 diff -u -p -r1.11 -r1.15 --- mandoc/Attic/mlg.c 2008/12/05 19:45:15 1.11 +++ mandoc/Attic/mlg.c 2008/12/06 19:41:41 1.15 @@ -1,4 +1,4 @@ -/* $Id: mlg.c,v 1.11 2008/12/05 19:45:15 kristaps Exp $ */ +/* $Id: mlg.c,v 1.15 2008/12/06 19:41:41 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -59,6 +60,8 @@ struct md_mlg { }; +static char *mlg_literal(int); +static char *mlg_At_literal(const char *); static void mlg_roffmsg(void *arg, enum roffmsg, const char *, const char *, char *); static int mlg_roffhead(void *, const struct tm *, @@ -89,11 +92,14 @@ static void mlg_mode(struct md_mlg *, enum md_tok); static int mlg_data(struct md_mlg *, int, const char *, char *); static void mlg_err(struct md_mlg *, const char *, - const char *, char *); + const char *, const char *, ...); static void mlg_warn(struct md_mlg *, const char *, - const char *, 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, + const char *, const char *, + const char *, va_list); #ifdef __linux__ extern size_t strlcat(char *, const char *, size_t); @@ -101,6 +107,55 @@ extern size_t strlcpy(char *, const char *, size_t); #endif +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_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) @@ -421,14 +476,34 @@ mlg_roffspecial(void *arg, int tok, const char *start, 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")) + p->flags |= ML_OVERRIDE_ALL; + else + p->flags &= ~ML_OVERRIDE_ALL; + return(1); + default: + break; + } + + if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) + return(0); + + switch (tok) { case (ROFF_Xr): if ( ! *more) { mlg_err(p, start, start, "missing argument"); return(0); } - if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL)) - return(0); if ( ! ml_puts(p->mbuf, *more++, &p->pos)) return(0); if (*more) { @@ -443,26 +518,69 @@ mlg_roffspecial(void *arg, int tok, const char *start, mlg_err(p, start, start, "too many arguments"); return(0); } - if ( ! mlg_endtag(p, MD_NS_INLINE, tok)) + break; + case (ROFF_Sx): + /* FALLTHROUGH */ + case (ROFF_Nm): + assert(*more); + if ( ! ml_puts(p->mbuf, *more++, &p->pos)) return(0); + assert(NULL == *more); break; - case (ROFF_Fn): + case (ROFF_Ex): + assert(*more); + if ( ! ml_puts(p->mbuf, "The ", &p->pos)) + return(0); + if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Xr, NULL, NULL)) + return(0); + if ( ! ml_puts(p->mbuf, *more++, &p->pos)) + return(0); + if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Xr)) + return(0); + if ( ! ml_puts(p->mbuf, " utility exits 0 on success, " + "and >0 if an error " + "occurs.", &p->pos)) + return(0); + assert(NULL == *more); break; - case (ROFF_Ns): - p->flags |= ML_OVERRIDE_ONE; + case (ROFF_At): + if ( ! ml_puts(p->mbuf, mlg_At_literal(*more), &p->pos)) + return(0); break; - case (ROFF_Sm): - assert(*more); - if (0 == strcmp(*more, "on")) - p->flags |= ML_OVERRIDE_ALL; - else - p->flags &= ~ML_OVERRIDE_ALL; + case (ROFF_Bx): + /* FALLTHROUGH */ + case (ROFF_Bsx): + /* FALLTHROUGH */ + case (ROFF_Fx): + /* 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 ( ! ml_putstring(p->mbuf, *more++, &p->pos)) + return(0); + } break; - default: + case (ROFF_Bt): + /* FALLTHROUGH */ + case (ROFF_Ud): + /* FALLTHROUGH */ + case (ROFF_Ux): + assert(NULL == *more); + if ( ! ml_puts(p->mbuf, mlg_literal(tok), &p->pos)) + return(0); break; + default: + mlg_err(p, start, start, "`%s' not yet supported", + toknames[tok]); + return(0); } - return(1); + return(mlg_endtag(p, MD_NS_INLINE, tok)); } @@ -561,22 +679,41 @@ mlg_roffdata(void *arg, int space, const char *start, static void -mlg_err(struct md_mlg *p, const char *buf, const char *pos, char *msg) +mlg_vmsg(struct md_mlg *p, enum roffmsg lvl, const char *start, + const char *pos, const char *fmt, va_list ap) { + char buf[128]; - mlg_msg(p, ROFF_ERROR, buf, pos, msg); + (void)vsnprintf(buf, sizeof(buf), fmt, ap); + mlg_msg(p, lvl, start, pos, buf); } static void -mlg_warn(struct md_mlg *p, const char *buf, const char *pos, char *msg) +mlg_warn(struct md_mlg *p, const char *start, + const char *pos, const char *fmt, ...) { + va_list ap; - mlg_msg(p, ROFF_WARN, buf, pos, msg); + va_start(ap, fmt); + mlg_vmsg(p, ROFF_WARN, start, pos, fmt, ap); + va_end(ap); } static void +mlg_err(struct md_mlg *p, const char *start, + const char *pos, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap); + va_end(ap); +} + + +static void mlg_msg(struct md_mlg *p, enum roffmsg lvl, const char *buf, const char *pos, char *msg) { @@ -602,5 +739,4 @@ mlg_msg(struct md_mlg *p, enum roffmsg lvl, else (void)fprintf(stderr, "%s: %s: %s\n", p->rbuf->name, level, msg); - }