=================================================================== RCS file: /cvs/mandoc/Attic/xml.c,v retrieving revision 1.6 retrieving revision 1.9 diff -u -p -r1.6 -r1.9 --- mandoc/Attic/xml.c 2008/12/02 00:10:37 1.6 +++ mandoc/Attic/xml.c 2008/12/02 18:26:57 1.9 @@ -1,4 +1,4 @@ -/* $Id: xml.c,v 1.6 2008/12/02 00:10:37 kristaps Exp $ */ +/* $Id: xml.c,v 1.9 2008/12/02 18:26:57 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -28,13 +28,8 @@ #include "libmdocml.h" #include "private.h" -#define MAXINDENT 8 #define COLUMNS 72 -#ifdef __linux__ /* FIXME */ -#define strlcat strncat -#endif - enum md_ns { MD_NS_BLOCK, MD_NS_INLINE, @@ -42,12 +37,11 @@ enum md_ns { }; enum md_tok { - MD_BLKIN, + MD_BLKIN, /* Controls spacing. */ MD_BLKOUT, MD_IN, MD_OUT, - MD_TEXT, - MD_OVERRIDE + MD_TEXT }; struct md_xml { @@ -60,7 +54,9 @@ struct md_xml { size_t pos; enum md_tok last; int flags; -#define MD_LITERAL (1 << 0) /* FIXME */ +#define MD_LITERAL (1 << 0) /* TODO */ +#define MD_OVERRIDE_ONE (1 << 1) +#define MD_OVERRIDE_ALL (1 << 2) }; static void roffmsg(void *arg, enum roffmsg, @@ -72,166 +68,141 @@ static int roffdata(void *, int, char *); static int roffout(void *, int); static int roffblkin(void *, int, int *, char **); static int roffblkout(void *, int); -static int roffspecial(void *, int); +static int roffspecial(void *, int, int *, char **, char **); +static void mbuf_mode(struct md_xml *, enum md_ns); static int mbuf_newline(struct md_xml *); -static int mbuf_indent(struct md_xml *); +static int xml_indent(struct md_xml *); static int mbuf_data(struct md_xml *, int, char *); -static int mbuf_putstring(struct md_xml *, - const char *); -static int mbuf_nputstring(struct md_xml *, +static int xml_nputstring(struct md_xml *, const char *, size_t); -static int mbuf_puts(struct md_xml *, const char *); -static int mbuf_nputs(struct md_xml *, +static int xml_puts(struct md_xml *, const char *); +static int xml_nputs(struct md_xml *, const char *, size_t); -static int mbuf_begintag(struct md_xml *, const char *, +static int xml_begintag(struct md_xml *, const char *, enum md_ns, int *, char **); -static int mbuf_endtag(struct md_xml *, +static int xml_endtag(struct md_xml *, const char *, enum md_ns); +#ifdef __linux__ /* FIXME: remove */ +static size_t strlcat(char *, const char *, size_t); +static size_t strlcpy(char *, const char *, size_t); +#endif + +static void +mbuf_mode(struct md_xml *p, enum md_ns ns) +{ + p->flags &= ~MD_OVERRIDE_ONE; + p->last = ns; +} + + static int -mbuf_begintag(struct md_xml *p, const char *name, enum md_ns ns, +xml_begintag(struct md_xml *p, const char *name, enum md_ns ns, int *argc, char **argv) { - int i; + char buf[64]; + ssize_t sz; + size_t res; - if ( ! mbuf_nputs(p, "<", 1)) - return(0); - switch (ns) { - case (MD_NS_BLOCK): - if ( ! mbuf_nputs(p, "block:", 6)) - return(0); - break; - case (MD_NS_INLINE): - if ( ! mbuf_nputs(p, "inline:", 7)) - return(0); - break; - default: - break; + case (MD_NS_BLOCK): + res = strlcpy(buf, "block:", sizeof(buf)); + assert(res < sizeof(buf)); + break; + case (MD_NS_INLINE): + res = strlcpy(buf, "inline:", sizeof(buf)); + assert(res < sizeof(buf)); + break; + default: + *buf = 0; + break; } - if ( ! mbuf_puts(p, name)) + res = strlcat(buf, name, sizeof(buf)); + assert(res < sizeof(buf)); + + if (-1 == (sz = ml_begintag(p->mbuf, buf, argc, argv))) return(0); - for (i = 0; ROFF_ARGMAX != argc[i]; i++) { - if ( ! mbuf_nputs(p, " ", 1)) - return(0); - if ( ! mbuf_puts(p, tokargnames[argc[i]])) - return(0); - if ( ! mbuf_nputs(p, "=\"", 2)) - return(0); - if ( ! mbuf_putstring(p, argv[i] ? argv[i] : "true")) - return(0); - if ( ! mbuf_nputs(p, "\"", 1)) - return(0); - } - return(mbuf_nputs(p, ">", 1)); + p->pos += sz; + return(1); } static int -mbuf_endtag(struct md_xml *p, const char *tag, enum md_ns ns) +xml_endtag(struct md_xml *p, const char *name, enum md_ns ns) { - if ( ! mbuf_nputs(p, "mbuf, buf))) return(0); - return(mbuf_nputs(p, ">", 1)); -} - -static int -mbuf_putstring(struct md_xml *p, const char *buf) -{ - - return(mbuf_nputstring(p, buf, strlen(buf))); + p->pos += sz; + return(1); } static int -mbuf_nputstring(struct md_xml *p, const char *buf, size_t sz) +xml_nputstring(struct md_xml *p, const char *buf, size_t sz) { - size_t i; + ssize_t res; - for (i = 0; i < sz; i++) { - switch (buf[i]) { - case ('&'): - if ( ! md_buf_puts(p->mbuf, "&", 5)) - return(0); - p->pos += 5; - break; - case ('"'): - if ( ! md_buf_puts(p->mbuf, """, 6)) - return(0); - p->pos += 6; - break; - case ('<'): - if ( ! md_buf_puts(p->mbuf, "<", 4)) - return(0); - p->pos += 4; - break; - case ('>'): - if ( ! md_buf_puts(p->mbuf, ">", 4)) - return(0); - p->pos += 4; - break; - default: - if ( ! md_buf_putchar(p->mbuf, buf[i])) - return(0); - p->pos++; - break; - } - } + if (-1 == (res = ml_nputstring(p->mbuf, buf, sz))) + return(0); + p->pos += res; return(1); } static int -mbuf_nputs(struct md_xml *p, const char *buf, size_t sz) +xml_nputs(struct md_xml *p, const char *buf, size_t sz) { + ssize_t res; - p->pos += sz; - return(md_buf_puts(p->mbuf, buf, sz)); + if (-1 == (res = ml_nputs(p->mbuf, buf, sz))) + return(0); + p->pos += res; + return(1); } static int -mbuf_puts(struct md_xml *p, const char *buf) +xml_puts(struct md_xml *p, const char *buf) { - return(mbuf_nputs(p, buf, strlen(buf))); + return(xml_nputs(p, buf, strlen(buf))); } static int -mbuf_indent(struct md_xml *p) +xml_indent(struct md_xml *p) { - size_t i; + ssize_t res; - assert(p->pos == 0); - - /* LINTED */ - for (i = 0; i < MIN(p->indent, MAXINDENT); i++) - if ( ! md_buf_putstring(p->mbuf, " ")) - return(0); - - p->pos += i * 4; + if (-1 == (res = ml_indent(p->mbuf, p->indent))) + return(0); + p->pos += res; return(1); } @@ -257,8 +228,11 @@ mbuf_data(struct md_xml *p, int space, char *buf) assert(p->mbuf); assert(0 != p->indent); + if (MD_OVERRIDE_ONE & p->flags || MD_OVERRIDE_ALL & p->flags) + space = 0; + if (MD_LITERAL & p->flags) - return(mbuf_putstring(p, buf)); + return(xml_nputstring(p, buf, sizeof(buf))); while (*buf) { while (*buf && isspace(*buf)) @@ -277,34 +251,33 @@ mbuf_data(struct md_xml *p, int space, char *buf) sz = strlen(bufp); if (0 == p->pos) { - if ( ! mbuf_indent(p)) + if ( ! xml_indent(p)) return(0); - if ( ! mbuf_nputstring(p, bufp, sz)) + if ( ! xml_nputstring(p, bufp, sz)) return(0); - if (p->indent * MAXINDENT + sz >= COLUMNS) { + if (p->indent * MAXINDENT + sz >= COLUMNS) if ( ! mbuf_newline(p)) return(0); - continue; - } + if ( ! (MD_OVERRIDE_ALL & p->flags)) + space = 1; continue; } if (space && sz + p->pos >= COLUMNS) { if ( ! mbuf_newline(p)) return(0); - if ( ! mbuf_indent(p)) + if ( ! xml_indent(p)) return(0); } else if (space) { - if ( ! mbuf_nputs(p, " ", 1)) + if ( ! xml_nputs(p, " ", 1)) return(0); } - if ( ! mbuf_nputstring(p, bufp, sz)) + if ( ! xml_nputstring(p, bufp, sz)) return(0); - if ( ! space && p->pos >= COLUMNS) - if ( ! mbuf_newline(p)) - return(0); + if ( ! (MD_OVERRIDE_ALL & p->flags)) + space = 1; } return(1); @@ -379,16 +352,16 @@ roffhead(void *arg) assert(arg); p = (struct md_xml *)arg; - if ( ! mbuf_puts(p, "\n")) return(0); - if ( ! mbuf_puts(p, "")) return(0); p->indent++; - p->last = MD_BLKIN; + mbuf_mode(p, MD_BLKIN); return(mbuf_newline(p)); } @@ -404,16 +377,16 @@ rofftail(void *arg) if (0 != p->pos && ! mbuf_newline(p)) return(0); - p->last = MD_BLKOUT; - if ( ! mbuf_endtag(p, "mdoc", MD_NS_DEFAULT)) + mbuf_mode(p, MD_BLKOUT); + if ( ! xml_endtag(p, "mdoc", MD_NS_DEFAULT)) return(0); - return(mbuf_newline(p)); } +/* ARGSUSED */ static int -roffspecial(void *arg, int tok) +roffspecial(void *arg, int tok, int *argc, char **argv, char **more) { struct md_xml *p; @@ -424,8 +397,15 @@ roffspecial(void *arg, int tok) switch (tok) { case (ROFF_Ns): - p->last = MD_OVERRIDE; + p->flags |= MD_OVERRIDE_ONE; break; + case (ROFF_Sm): + assert(*more); + if (0 == strcmp(*more, "on")) + p->flags |= MD_OVERRIDE_ALL; + else + p->flags &= ~MD_OVERRIDE_ALL; + break; default: break; } @@ -445,17 +425,17 @@ roffblkin(void *arg, int tok, int *argc, char **argv) if (0 != p->pos) { if ( ! mbuf_newline(p)) return(0); - if ( ! mbuf_indent(p)) + if ( ! xml_indent(p)) return(0); - } else if ( ! mbuf_indent(p)) + } else if ( ! xml_indent(p)) return(0); /* FIXME: xml won't like standards args (e.g., p1003.1-90). */ - p->last = MD_BLKIN; p->indent++; + mbuf_mode(p, MD_BLKIN); - if ( ! mbuf_begintag(p, toknames[tok], MD_NS_BLOCK, + if ( ! xml_begintag(p, toknames[tok], MD_NS_BLOCK, argc, argv)) return(0); return(mbuf_newline(p)); @@ -475,14 +455,13 @@ roffblkout(void *arg, int tok) if (0 != p->pos) { if ( ! mbuf_newline(p)) return(0); - if ( ! mbuf_indent(p)) + if ( ! xml_indent(p)) return(0); - } else if ( ! mbuf_indent(p)) + } else if ( ! xml_indent(p)) return(0); - p->last = MD_BLKOUT; - - if ( ! mbuf_endtag(p, toknames[tok], MD_NS_BLOCK)) + mbuf_mode(p, MD_BLKOUT); + if ( ! xml_endtag(p, toknames[tok], MD_NS_BLOCK)) return(0); return(mbuf_newline(p)); } @@ -496,32 +475,23 @@ roffin(void *arg, int tok, int *argc, char **argv) assert(arg); p = (struct md_xml *)arg; - /* - * FIXME: put all of this in a buffer, then check the buffer - * length versus the column width for nicer output. This is a - * bit hacky. - */ - - if (p->pos + 11 > COLUMNS) + if ( ! (MD_OVERRIDE_ONE & p->flags) && + ! (MD_OVERRIDE_ALL & p->flags) && + p->pos + 11 > COLUMNS) if ( ! mbuf_newline(p)) return(0); - if (0 != p->pos) { - switch (p->last) { - case (MD_TEXT): - /* FALLTHROUGH */ - case (MD_OUT): - if ( ! mbuf_nputs(p, " ", 1)) - return(0); - break; - default: - break; - } - } else if ( ! mbuf_indent(p)) + if (0 != p->pos && (MD_TEXT == p->last || MD_OUT == p->last) + && ! (MD_OVERRIDE_ONE & p->flags) + && ! (MD_OVERRIDE_ALL & p->flags)) + if ( ! xml_nputs(p, " ", 1)) + return(0); + + if (0 == p->pos && ! xml_indent(p)) return(0); - p->last = MD_IN; - return(mbuf_begintag(p, toknames[tok], + mbuf_mode(p, MD_IN); + return(xml_begintag(p, toknames[tok], MD_NS_INLINE, argc, argv)); } @@ -534,11 +504,11 @@ roffout(void *arg, int tok) assert(arg); p = (struct md_xml *)arg; - if (0 == p->pos && ! mbuf_indent(p)) + if (0 == p->pos && ! xml_indent(p)) return(0); - p->last = MD_OUT; - return(mbuf_endtag(p, toknames[tok], MD_NS_INLINE)); + mbuf_mode(p, MD_OUT); + return(xml_endtag(p, toknames[tok], MD_NS_INLINE)); } @@ -586,7 +556,84 @@ roffdata(void *arg, int space, char *buf) if ( ! mbuf_data(p, space, buf)) return(0); - p->last = MD_TEXT; + mbuf_mode(p, MD_TEXT); return(1); } + +#ifdef __linux /* FIXME: remove. */ +/* $OpenBSD: xml.c,v 1.9 2008/12/02 18:26:57 kristaps Exp $ */ + +/* + * Copyright (c) 1998 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ +static size_t +strlcat(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + size_t dlen; + + /* Find the end of dst and adjust bytes left but don't go past + * end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = siz - dlen; + + if (n == 0) + return(dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; + + return(dlen + (s - src)); /* count does not include NUL */ +} + + +static size_t +strlcpy(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + + /* Copy as many bytes as will fit */ + if (n != 0) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') + break; + } + } + + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + return(s - src - 1); /* count does not include NUL */ +} +#endif /*__linux__*/