=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -p -r1.73 -r1.74 --- docbook2mdoc/docbook2mdoc.c 2019/03/25 23:14:44 1.73 +++ docbook2mdoc/docbook2mdoc.c 2019/03/26 18:32:07 1.74 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.73 2019/03/25 23:14:44 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.74 2019/03/26 18:32:07 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -15,520 +15,35 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include - #include #include -#include -#include -#include #include #include -#include -#include -#include "extern.h" +#include "node.h" +#include "format.h" +/* + * The implementation of the mdoc(7) formatter. + */ + enum linestate { LINE_NEW = 0, LINE_TEXT, LINE_MACRO }; -/* - * Global parse state. - * Keep this as simple and small as possible. - */ -struct parse { - XML_Parser xml; - const char *fname; /* filename */ - int stop; /* should we stop now? */ -#define PARSE_EQN 1 - unsigned int flags; /* document-wide flags */ - struct pnode *root; /* root of parse tree */ - struct pnode *cur; /* current node in tree */ - int level; /* header level, starting at 1 */ +struct format { + int level; /* Header level, starting at 1. */ enum linestate linestate; }; -struct node { - const char *name; /* docbook element name */ - enum nodeid node; /* docbook element to generate */ -}; +static void pnode_print(struct format *, struct pnode *); -TAILQ_HEAD(pnodeq, pnode); -TAILQ_HEAD(pattrq, pattr); -struct pattr { - enum attrkey key; - enum attrval val; - char *rawval; - TAILQ_ENTRY(pattr) child; -}; - -struct pnode { - enum nodeid node; /* node type */ - char *b; /* binary data buffer */ - char *real; /* store for "b" */ - size_t bsz; /* data buffer size */ - struct pnode *parent; /* parent (or NULL if top) */ - struct pnodeq childq; /* queue of children */ - struct pattrq attrq; /* attributes of node */ - TAILQ_ENTRY(pnode) child; -}; - -static const char *attrkeys[ATTRKEY__MAX] = { - "choice", - "class", - "close", - "id", - "linkend", - "open", - "rep" -}; - -static const char *attrvals[ATTRVAL__MAX] = { - "monospaced", - "norepeat", - "opt", - "plain", - "repeat", - "req" -}; - -static const struct node nodes[] = { - { "acronym", NODE_ACRONYM }, - { "affiliation", NODE_AFFILIATION }, - { "anchor", NODE_ANCHOR }, - { "application", NODE_APPLICATION }, - { "arg", NODE_ARG }, - { "author", NODE_AUTHOR }, - { "authorgroup", NODE_AUTHORGROUP }, - { "blockquote", NODE_BLOCKQUOTE }, - { "book", NODE_BOOK }, - { "bookinfo", NODE_BOOKINFO }, - { "caution", NODE_CAUTION }, - { "chapter", NODE_SECTION }, - { "citerefentry", NODE_CITEREFENTRY }, - { "citetitle", NODE_CITETITLE }, - { "cmdsynopsis", NODE_CMDSYNOPSIS }, - { "code", NODE_CODE }, - { "colspec", NODE_COLSPEC }, - { "command", NODE_COMMAND }, - { "constant", NODE_CONSTANT }, - { "copyright", NODE_COPYRIGHT }, - { "date", NODE_DATE }, - { "editor", NODE_EDITOR }, - { "email", NODE_EMAIL }, - { "emphasis", NODE_EMPHASIS }, - { "entry", NODE_ENTRY }, - { "envar", NODE_ENVAR }, - { "fieldsynopsis", NODE_FIELDSYNOPSIS }, - { "filename", NODE_FILENAME }, - { "firstname", NODE_FIRSTNAME }, - { "firstterm", NODE_FIRSTTERM }, - { "footnote", NODE_FOOTNOTE }, - { "funcdef", NODE_FUNCDEF }, - { "funcprototype", NODE_FUNCPROTOTYPE }, - { "funcsynopsis", NODE_FUNCSYNOPSIS }, - { "funcsynopsisinfo", NODE_FUNCSYNOPSISINFO }, - { "function", NODE_FUNCTION }, - { "glossterm", NODE_GLOSSTERM }, - { "group", NODE_GROUP }, - { "holder", NODE_HOLDER }, - { "index", NODE_INDEX }, - { "indexterm", NODE_INDEXTERM }, - { "info", NODE_INFO }, - { "informalequation", NODE_INFORMALEQUATION }, - { "informaltable", NODE_INFORMALTABLE }, - { "inlineequation", NODE_INLINEEQUATION }, - { "itemizedlist", NODE_ITEMIZEDLIST }, - { "keysym", NODE_KEYSYM }, - { "legalnotice", NODE_LEGALNOTICE }, - { "link", NODE_LINK }, - { "listitem", NODE_LISTITEM }, - { "literal", NODE_LITERAL }, - { "literallayout", NODE_LITERALLAYOUT }, - { "manvolnum", NODE_MANVOLNUM }, - { "member", NODE_MEMBER }, - { "mml:math", NODE_MML_MATH }, - { "mml:mfenced", NODE_MML_MFENCED }, - { "mml:mfrac", NODE_MML_MFRAC }, - { "mml:mi", NODE_MML_MI }, - { "mml:mn", NODE_MML_MN }, - { "mml:mo", NODE_MML_MO }, - { "mml:mrow", NODE_MML_MROW }, - { "mml:msub", NODE_MML_MSUB }, - { "mml:msup", NODE_MML_MSUP }, - { "modifier", NODE_MODIFIER }, - { "note", NODE_NOTE }, - { "option", NODE_OPTION }, - { "orderedlist", NODE_ORDEREDLIST }, - { "orgname", NODE_ORGNAME }, - { "othername", NODE_OTHERNAME }, - { "para", NODE_PARA }, - { "paramdef", NODE_PARAMDEF }, - { "parameter", NODE_PARAMETER }, - { "part", NODE_SECTION }, - { "personname", NODE_PERSONNAME }, - { "phrase", NODE_PHRASE }, - { "preface", NODE_PREFACE }, - { "primary", NODE_PRIMARY }, - { "programlisting", NODE_PROGRAMLISTING }, - { "prompt", NODE_PROMPT }, - { "quote", NODE_QUOTE }, - { "refclass", NODE_REFCLASS }, - { "refdescriptor", NODE_REFDESCRIPTOR }, - { "refentry", NODE_REFENTRY }, - { "refentryinfo", NODE_REFENTRYINFO }, - { "refentrytitle", NODE_REFENTRYTITLE }, - { "refmeta", NODE_REFMETA }, - { "refmetainfo", NODE_REFMETAINFO }, - { "refmiscinfo", NODE_REFMISCINFO }, - { "refname", NODE_REFNAME }, - { "refnamediv", NODE_REFNAMEDIV }, - { "refpurpose", NODE_REFPURPOSE }, - { "refsect1", NODE_SECTION }, - { "refsect2", NODE_SECTION }, - { "refsect3", NODE_SECTION }, - { "refsection", NODE_SECTION }, - { "refsynopsisdiv", NODE_REFSYNOPSISDIV }, - { "releaseinfo", NODE_RELEASEINFO }, - { "replaceable", NODE_REPLACEABLE }, - { "row", NODE_ROW }, - { "sbr", NODE_SBR }, - { "screen", NODE_SCREEN }, - { "secondary", NODE_SECONDARY }, - { "sect1", NODE_SECTION }, - { "sect2", NODE_SECTION }, - { "section", NODE_SECTION }, - { "sgmltag", NODE_SGMLTAG }, - { "simplelist", NODE_SIMPLELIST }, - { "spanspec", NODE_SPANSPEC }, - { "structname", NODE_STRUCTNAME }, - { "subtitle", NODE_SUBTITLE }, - { "surname", NODE_SURNAME }, - { "synopsis", NODE_SYNOPSIS }, - { "table", NODE_TABLE }, - { "tbody", NODE_TBODY }, - { "term", NODE_TERM }, - { "tfoot", NODE_TFOOT }, - { "tgroup", NODE_TGROUP }, - { "thead", NODE_THEAD }, - { "tip", NODE_TIP }, - { "title", NODE_TITLE }, - { "trademark", NODE_TRADEMARK }, - { "type", NODE_TYPE }, - { "ulink", NODE_ULINK }, - { "userinput", NODE_USERINPUT }, - { "variablelist", NODE_VARIABLELIST }, - { "varlistentry", NODE_VARLISTENTRY }, - { "varname", NODE_VARNAME }, - { "warning", NODE_WARNING }, - { "wordasword", NODE_WORDASWORD }, - { "year", NODE_YEAR }, - { NULL, NODE__MAX } -}; - -static int warn = 0; - static void -pnode_print(struct parse *p, struct pnode *pn); - -/* - * Process a stream of characters. - * We store text as nodes in and of themselves. - * If a text node is already open, append to it. - * If it's not open, open one under the current context. - */ -static void -xml_char(void *arg, const XML_Char *p, int sz) +macro_open(struct format *p, const char *name) { - struct parse *ps = arg; - struct pnode *dat; - int i; - - if (ps->stop) - return; - - /* - * Are we in the midst of processing text? - * If we're not processing text right now, then create a text - * node for doing so. - * However, don't do so unless we have some non-whitespace to - * process: strip out all leading whitespace to be sure. - */ - if (ps->cur->node != NODE_TEXT) { - for (i = 0; i < sz; i++) - if ( ! isspace((unsigned char)p[i])) - break; - if (i == sz) - return; - p += i; - sz -= i; - dat = calloc(1, sizeof(*dat)); - if (dat == NULL) { - perror(NULL); - exit(1); - } - - dat->node = NODE_TEXT; - dat->parent = ps->cur; - TAILQ_INIT(&dat->childq); - TAILQ_INIT(&dat->attrq); - TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child); - ps->cur = dat; - assert(ps->root != NULL); - } - - /* Append to current buffer. */ - assert(sz >= 0); - ps->cur->b = realloc(ps->cur->b, ps->cur->bsz + sz + 1); - if (ps->cur->b == NULL) { - perror(NULL); - exit(1); - } - memcpy(ps->cur->b + ps->cur->bsz, p, sz); - ps->cur->bsz += sz; - ps->cur->b[ps->cur->bsz] = '\0'; - ps->cur->real = ps->cur->b; -} - -static void -pnode_trim(struct pnode *pn) -{ - assert(pn->node == NODE_TEXT); - for (; pn->bsz > 0; pn->b[--pn->bsz] = '\0') - if ( ! isspace((unsigned char)pn->b[pn->bsz - 1])) - break; -} - -/* - * Begin an element. - * First, look for the element. - * If we don't find it and we're not parsing, keep going. - * If we don't find it and we're parsing, puke and exit. - * If we find it but we're not parsing yet (i.e., it's not a refentry - * and thus out of context), keep going. - * If we find it and we're at the root and already have a tree, puke and - * exit (FIXME: I don't think this is right?). - * If we find it but we're parsing a text node, close out the text node, - * return to its parent, and keep going. - * Make sure that the element is in the right context. - * Lastly, put the node onto our parse tree and continue. - */ -static void -xml_elem_start(void *arg, const XML_Char *name, const XML_Char **atts) -{ - struct parse *ps = arg; - const struct node *node; - enum attrkey key; - enum attrval val; - struct pnode *dat; - struct pattr *pattr; - const XML_Char **att; - - /* FIXME: find a better way to ditch other namespaces. */ - if (ps->stop || strcmp(name, "xi:include") == 0) - return; - - /* Close out text node, if applicable... */ - if (ps->cur != NULL && ps->cur->node == NODE_TEXT) { - pnode_trim(ps->cur); - ps->cur = ps->cur->parent; - } - - for (node = nodes; node->name != NULL; node++) - if (strcmp(node->name, name) == 0) - break; - - if (node->name == NULL) { - fprintf(stderr, "%s:%zu:%zu: unknown node \"%s\"\n", - ps->fname, XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), name); - ps->stop = 1; - return; - } - - if (node->node == NODE_INLINEEQUATION) - ps->flags |= PARSE_EQN; - - if ((dat = calloc(1, sizeof(*dat))) == NULL) { - perror(NULL); - exit(1); - } - - dat->node = node->node; - dat->parent = ps->cur; - TAILQ_INIT(&dat->childq); - TAILQ_INIT(&dat->attrq); - - if (ps->cur != NULL) - TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child); - - ps->cur = dat; - if (ps->root == NULL) - ps->root = dat; - - /* - * Process attributes. - */ - for (att = atts; *att != NULL; att += 2) { - for (key = 0; key < ATTRKEY__MAX; key++) - if (strcmp(*att, attrkeys[key]) == 0) - break; - if (key == ATTRKEY__MAX) { - if (warn) - fprintf(stderr, "%s:%zu:%zu: warning: " - "unknown attribute \"%s\"\n", - ps->fname, - XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - *att); - continue; - } - for (val = 0; val < ATTRVAL__MAX; val++) - if (strcmp(att[1], attrvals[val]) == 0) - break; - pattr = calloc(1, sizeof(*pattr)); - pattr->key = key; - pattr->val = val; - if (val == ATTRVAL__MAX) - pattr->rawval = strdup(att[1]); - TAILQ_INSERT_TAIL(&dat->attrq, pattr, child); - } -} - -/* - * Roll up the parse tree. - * If we're at a text node, roll that one up first. - */ -static void -xml_elem_end(void *arg, const XML_Char *name) -{ - struct parse *ps = arg; - - if (ps->stop) - return; - - /* FIXME: find a better way to ditch other namespaces. */ - if (strcmp(name, "xi:include") == 0) - return; - - /* Close out text node, if applicable... */ - if (ps->cur->node == NODE_TEXT) { - pnode_trim(ps->cur); - ps->cur = ps->cur->parent; - } - ps->cur = ps->cur->parent; -} - -/* - * Recursively free a node (NULL is ok). - */ -static void -pnode_free(struct pnode *pn) -{ - struct pnode *pp; - struct pattr *ap; - - if (pn == NULL) - return; - - while ((pp = TAILQ_FIRST(&pn->childq)) != NULL) { - TAILQ_REMOVE(&pn->childq, pp, child); - pnode_free(pp); - } - - while ((ap = TAILQ_FIRST(&pn->attrq)) != NULL) { - TAILQ_REMOVE(&pn->attrq, ap, child); - free(ap->rawval); - free(ap); - } - - free(pn->real); - free(pn); -} - -/* - * Unlink a node from its parent and pnode_free() it. - */ -static void -pnode_unlink(struct pnode *pn) -{ - if (pn->parent != NULL) - TAILQ_REMOVE(&pn->parent->childq, pn, child); - pnode_free(pn); -} - -/* - * Unlink all children of a node and pnode_free() them. - */ -static void -pnode_unlinksub(struct pnode *pn) -{ - - while ( ! TAILQ_EMPTY(&pn->childq)) - pnode_unlink(TAILQ_FIRST(&pn->childq)); -} - -/* - * Retrieve an enumeration attribute from a node. - * Return ATTRVAL__MAX if the node has no such attribute. - */ -enum attrval -pnode_getattr(struct pnode *pn, enum attrkey key) -{ - struct pattr *ap; - - if (pn == NULL) - return ATTRVAL__MAX; - TAILQ_FOREACH(ap, &pn->attrq, child) - if (ap->key == key) - return ap->val; - return ATTRVAL__MAX; -} - -/* - * Retrieve an attribute string from a node. - * Return defval if the node has no such attribute. - */ -const char * -pnode_getattr_raw(struct pnode *pn, enum attrkey key, const char *defval) -{ - struct pattr *ap; - - if (pn == NULL) - return defval; - TAILQ_FOREACH(ap, &pn->attrq, child) - if (ap->key == key) - return ap->val == ATTRVAL__MAX ? ap->rawval : - attrvals[ap->val]; - return defval; -} - -/* - * Recursively search and return the first instance of "node". - */ -static struct pnode * -pnode_findfirst(struct pnode *pn, enum nodeid node) -{ - struct pnode *pp, *res; - - res = NULL; - TAILQ_FOREACH(pp, &pn->childq, child) { - res = pp->node == node ? pp : - pnode_findfirst(pp, node); - if (res != NULL) - break; - } - - return res; -} - -static void -macro_open(struct parse *p, const char *name) -{ switch (p->linestate) { case LINE_TEXT: putchar('\n'); @@ -545,7 +60,7 @@ macro_open(struct parse *p, const char *name) } static void -macro_close(struct parse *p) +macro_close(struct format *p) { assert(p->linestate == LINE_MACRO); putchar('\n'); @@ -553,7 +68,7 @@ macro_close(struct parse *p) } static void -macro_line(struct parse *p, const char *name) +macro_line(struct format *p, const char *name) { macro_open(p, name); macro_close(p); @@ -567,7 +82,7 @@ macro_line(struct parse *p, const char *name) * Print an argument string on a macro line, collapsing whitespace. */ static void -macro_addarg(struct parse *p, const char *arg, int flags) +macro_addarg(struct format *p, const char *arg, int flags) { const char *cp; @@ -624,7 +139,7 @@ macro_addarg(struct parse *p, const char *arg, int fla } static void -macro_argline(struct parse *p, const char *name, const char *arg) +macro_argline(struct format *p, const char *name, const char *arg) { macro_open(p, name); macro_addarg(p, arg, ARG_SPACE); @@ -635,7 +150,7 @@ macro_argline(struct parse *p, const char *name, const * Recursively append text from the children of a node to a macro line. */ static void -macro_addnode(struct parse *p, struct pnode *pn, int flags) +macro_addnode(struct format *p, struct pnode *pn, int flags) { int quote_now; @@ -690,7 +205,7 @@ macro_addnode(struct parse *p, struct pnode *pn, int f } static void -macro_nodeline(struct parse *p, const char *name, struct pnode *pn, int flags) +macro_nodeline(struct format *p, const char *name, struct pnode *pn, int flags) { macro_open(p, name); macro_addnode(p, pn, ARG_SPACE | flags); @@ -702,7 +217,7 @@ macro_nodeline(struct parse *p, const char *name, stru * emit the closing punctuation as a trailing macro argument. */ static void -macro_closepunct(struct parse *p, struct pnode *pn) +macro_closepunct(struct format *p, struct pnode *pn) { if ((pn = TAILQ_NEXT(pn, child)) != NULL && pn->node == NODE_TEXT && pn->bsz > 0 && @@ -717,7 +232,7 @@ macro_closepunct(struct parse *p, struct pnode *pn) } static void -print_text(struct parse *p, const char *word) +print_text(struct format *p, const char *word) { switch (p->linestate) { case LINE_NEW: @@ -734,7 +249,7 @@ print_text(struct parse *p, const char *word) } static void -pnode_printpara(struct parse *p, struct pnode *pn) +pnode_printpara(struct format *p, struct pnode *pn) { struct pnode *pp; @@ -761,7 +276,7 @@ pnode_printpara(struct parse *p, struct pnode *pn) * If the SYNOPSIS macro has a superfluous title, kill it. */ static void -pnode_printrefsynopsisdiv(struct parse *p, struct pnode *pn) +pnode_printrefsynopsisdiv(struct format *p, struct pnode *pn) { struct pnode *pp, *pq; @@ -776,7 +291,7 @@ pnode_printrefsynopsisdiv(struct parse *p, struct pnod * Start a hopefully-named `Sh' section. */ static void -pnode_printrefsect(struct parse *p, struct pnode *pn) +pnode_printrefsect(struct format *p, struct pnode *pn) { struct pnode *pp; const char *title; @@ -854,7 +369,7 @@ pnode_printrefsect(struct parse *p, struct pnode *pn) * Start a reference, extracting the title and volume. */ static void -pnode_printciterefentry(struct parse *p, struct pnode *pn) +pnode_printciterefentry(struct format *p, struct pnode *pn) { struct pnode *pp, *title, *manvol; @@ -879,7 +394,7 @@ pnode_printciterefentry(struct parse *p, struct pnode } static void -pnode_printrefmeta(struct parse *p, struct pnode *pn) +pnode_printrefmeta(struct format *p, struct pnode *pn) { struct pnode *pp, *title, *manvol; @@ -904,7 +419,7 @@ pnode_printrefmeta(struct parse *p, struct pnode *pn) } static void -pnode_printfuncdef(struct parse *p, struct pnode *pn) +pnode_printfuncdef(struct format *p, struct pnode *pn) { struct pnode *pp, *ftype, *func; @@ -932,7 +447,7 @@ pnode_printfuncdef(struct parse *p, struct pnode *pn) * Second, >1 arguments are separated by commas. */ static void -pnode_printmathfenced(struct parse *p, struct pnode *pn) +pnode_printmathfenced(struct format *p, struct pnode *pn) { struct pnode *pp; @@ -956,7 +471,7 @@ pnode_printmathfenced(struct parse *p, struct pnode *p * particular eqn(7) word. */ static void -pnode_printmath(struct parse *p, struct pnode *pn) +pnode_printmath(struct format *p, struct pnode *pn) { struct pnode *pp; @@ -983,7 +498,7 @@ pnode_printmath(struct parse *p, struct pnode *pn) } static void -pnode_printfuncprototype(struct parse *p, struct pnode *pn) +pnode_printfuncprototype(struct format *p, struct pnode *pn) { struct pnode *pp, *fdef; @@ -1012,7 +527,7 @@ pnode_printfuncprototype(struct parse *p, struct pnode * ellipsis following an argument) and optionality. */ static void -pnode_printarg(struct parse *p, struct pnode *pn) +pnode_printarg(struct format *p, struct pnode *pn) { struct pnode *pp; struct pattr *ap; @@ -1041,7 +556,7 @@ pnode_printarg(struct parse *p, struct pnode *pn) } static void -pnode_printgroup(struct parse *p, struct pnode *pn) +pnode_printgroup(struct format *p, struct pnode *pn) { struct pnode *pp, *np; struct pattr *ap; @@ -1092,27 +607,26 @@ pnode_printgroup(struct parse *p, struct pnode *pn) } static void -pnode_printprologue(struct parse *p, struct pnode *pn) +pnode_printprologue(struct format *p, struct ptree *tree) { - struct pnode *pp; + struct pnode *refmeta; - pp = p->root == NULL ? NULL : - pnode_findfirst(p->root, NODE_REFMETA); + refmeta = tree->root == NULL ? NULL : + pnode_findfirst(tree->root, NODE_REFMETA); macro_line(p, "Dd $Mdocdate" "$"); - if (pp != NULL) - pnode_printrefmeta(p, pp); - else { + if (refmeta == NULL) { macro_open(p, "Dt"); macro_addarg(p, - pnode_getattr_raw(p->root, ATTRKEY_ID, "UNKNOWN"), + pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"), ARG_SPACE | ARG_SINGLE | ARG_UPPER); macro_addarg(p, "1", ARG_SPACE); macro_close(p); - } + } else + pnode_printrefmeta(p, refmeta); macro_line(p, "Os"); - if (p->flags & PARSE_EQN) { + if (tree->flags & TREE_EQN) { macro_line(p, "EQ"); print_text(p, "delim $$"); macro_line(p, "EN"); @@ -1124,7 +638,7 @@ pnode_printprologue(struct parse *p, struct pnode *pn) * we should comma-separate as list headers. */ static void -pnode_printvarlistentry(struct parse *p, struct pnode *pn) +pnode_printvarlistentry(struct format *p, struct pnode *pn) { struct pnode *pp; int first = 1; @@ -1146,7 +660,7 @@ pnode_printvarlistentry(struct parse *p, struct pnode } static void -pnode_printtitle(struct parse *p, struct pnode *pn) +pnode_printtitle(struct format *p, struct pnode *pn) { struct pnode *pp, *pq; @@ -1160,7 +674,7 @@ pnode_printtitle(struct parse *p, struct pnode *pn) } static void -pnode_printrow(struct parse *p, struct pnode *pn) +pnode_printrow(struct format *p, struct pnode *pn) { struct pnode *pp; @@ -1174,7 +688,7 @@ pnode_printrow(struct parse *p, struct pnode *pn) } static void -pnode_printtable(struct parse *p, struct pnode *pn) +pnode_printtable(struct format *p, struct pnode *pn) { struct pnode *pp; @@ -1189,7 +703,7 @@ pnode_printtable(struct parse *p, struct pnode *pn) } static void -pnode_printlist(struct parse *p, struct pnode *pn) +pnode_printlist(struct format *p, struct pnode *pn) { struct pnode *pp; @@ -1205,7 +719,7 @@ pnode_printlist(struct parse *p, struct pnode *pn) } static void -pnode_printvariablelist(struct parse *p, struct pnode *pn) +pnode_printvariablelist(struct format *p, struct pnode *pn) { struct pnode *pp; @@ -1228,7 +742,7 @@ pnode_printvariablelist(struct parse *p, struct pnode * whatever), don't print inline macros. */ static void -pnode_print(struct parse *p, struct pnode *pn) +pnode_print(struct format *p, struct pnode *pn) { struct pnode *pp; const char *ccp; @@ -1577,118 +1091,15 @@ pnode_print(struct parse *p, struct pnode *pn) } } -/* - * Loop around the read buffer until we've drained it of all data. - * Invoke the parser context with each buffer fill. - */ -static int -readfile(XML_Parser xp, int fd, - char *b, size_t bsz, const char *fn) +void +ptree_print(struct ptree *tree) { - struct parse p; - int rc; - ssize_t ssz; + struct format formatter; - memset(&p, 0, sizeof(p)); - p.fname = fn; - p.xml = xp; - - XML_SetCharacterDataHandler(xp, xml_char); - XML_SetElementHandler(xp, xml_elem_start, xml_elem_end); - XML_SetUserData(xp, &p); - - while ((ssz = read(fd, b, bsz)) >= 0) { - if ((rc = XML_Parse(xp, b, ssz, 0 == ssz)) == 0) - fprintf(stderr, "%s:%zu:%zu: %s\n", fn, - XML_GetCurrentLineNumber(xp), - XML_GetCurrentColumnNumber(xp), - XML_ErrorString - (XML_GetErrorCode(xp))); - else if ( ! p.stop && ssz > 0) - continue; - /* - * Exit when we've read all or errors have occured - * during the parse sequence. - */ - p.linestate = LINE_NEW; - pnode_printprologue(&p, p.root); - pnode_print(&p, p.root); - if (p.linestate != LINE_NEW) - putchar('\n'); - pnode_free(p.root); - return rc != 0 && p.stop == 0; - } - - /* Read error has occured. */ - perror(fn); - pnode_free(p.root); - return 0; -} - -int -main(int argc, char *argv[]) -{ - XML_Parser xp; - const char *fname; - char *buf; - int fd, rc, ch; - const char *progname; - - progname = strrchr(argv[0], '/'); - if (progname == NULL) - progname = argv[0]; - else - ++progname; - - fname = "-"; - xp = NULL; - buf = NULL; - rc = 1; - - while ((ch = getopt(argc, argv, "W")) != -1) - switch (ch) { - case 'W': - warn = 1; - break; - default: - goto usage; - } - - argc -= optind; - argv += optind; - - if (argc > 1) { - fprintf(stderr, "%s: Too many arguments\n", argv[1]); - goto usage; - } else if (argc > 0) - fname = argv[0]; - - /* Read from stdin or a file. */ - fd = strcmp(fname, "-") == 0 ? - STDIN_FILENO : open(fname, O_RDONLY, 0); - - /* - * Open file for reading. - * Allocate a read buffer. - * Create the parser context. - * Dive directly into the parse. - */ - if (fd == -1) - perror(fname); - else if ((buf = malloc(4096)) == NULL) - perror(NULL); - else if ((xp = XML_ParserCreate(NULL)) == NULL) - perror(NULL); - else if (readfile(xp, fd, buf, 4096, fname)) - rc = 0; - - XML_ParserFree(xp); - free(buf); - if (fd != STDIN_FILENO) - close(fd); - return rc; - -usage: - fprintf(stderr, "usage: %s [-W] [input_filename]\n", progname); - return 1; + formatter.level = 0; + formatter.linestate = LINE_NEW; + pnode_printprologue(&formatter, tree); + pnode_print(&formatter, tree->root); + if (formatter.linestate != LINE_NEW) + putchar('\n'); }