From 1341deac131af51bdd3b4dd124440c198d361cc9 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Sun, 16 Jun 2024 17:57:12 +0200 Subject: [PATCH] xmllint: Move shell to xmllint Move source code for xmllint shell to shell.c and move it from the libxml2 library to the xmllint executable. Also allow shell to run without XPath and debug modules. Add stubs for old shell API functions in legacy build mode. --- CMakeLists.txt | 3 +- Makefile.am | 2 +- debugXML.c | 1762 +---------------------------------- doc/libxml2-api.xml | 184 ---- include/libxml/debugXML.h | 138 --- include/private/Makefile.am | 1 + include/private/shell.h | 7 + legacy.c | 165 +++- meson.build | 2 +- shell.c | 1629 ++++++++++++++++++++++++++++++++ testapi.c | 735 +-------------- xmllint.c | 73 +- 12 files changed, 1813 insertions(+), 2888 deletions(-) create mode 100644 include/private/shell.h create mode 100644 shell.c diff --git a/CMakeLists.txt b/CMakeLists.txt index d1a0af33..eb6cfedf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -468,13 +468,14 @@ if(MSVC AND BUILD_SHARED_LIBS) endif() if(LIBXML2_WITH_PROGRAMS) + add_executable(xmllint xmllint.c shell.c) + add_executable(xmlcatalog xmlcatalog.c) set( PROGRAMS xmlcatalog xmllint ) foreach(PROGRAM ${PROGRAMS}) - add_executable(${PROGRAM} ${PROGRAM}.c) add_executable(LibXml2::${PROGRAM} ALIAS ${PROGRAM}) target_compile_definitions(${PROGRAM} PRIVATE SYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") target_link_libraries(${PROGRAM} LibXml2) diff --git a/Makefile.am b/Makefile.am index efc9c658..1b0d5f5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,7 +137,7 @@ runsuite_SOURCES=runsuite.c runsuite_DEPENDENCIES = $(DEPS) runsuite_LDADD= $(LDADDS) -xmllint_SOURCES=xmllint.c +xmllint_SOURCES = xmllint.c shell.c xmllint_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) $(ICONV_CFLAGS) xmllint_DEPENDENCIES = $(DEPS) xmllint_LDADD= $(RDL_LIBS) $(LDADDS) diff --git a/debugXML.c b/debugXML.c index 9855a2db..6ac33b94 100644 --- a/debugXML.c +++ b/debugXML.c @@ -14,19 +14,14 @@ #include #include +#include #include #include #include #include -#include #include #include #include -#include -#include -#ifdef LIBXML_SCHEMAS_ENABLED -#include -#endif #include "private/error.h" @@ -1568,1759 +1563,4 @@ xmlDebugCheckDocument(FILE * output, xmlDocPtr doc) return(ctxt.errors); } -/************************************************************************ - * * - * Helpers for Shell * - * * - ************************************************************************/ - -/** - * xmlLsCountNode: - * @node: the node to count - * - * Count the children of @node. - * - * Returns the number of children of @node. - */ -int -xmlLsCountNode(xmlNodePtr node) { - int ret = 0; - xmlNodePtr list = NULL; - - if (node == NULL) - return(0); - - switch (node->type) { - case XML_ELEMENT_NODE: - list = node->children; - break; - case XML_DOCUMENT_NODE: - case XML_HTML_DOCUMENT_NODE: - list = ((xmlDocPtr) node)->children; - break; - case XML_ATTRIBUTE_NODE: - list = ((xmlAttrPtr) node)->children; - break; - case XML_TEXT_NODE: - case XML_CDATA_SECTION_NODE: - case XML_PI_NODE: - case XML_COMMENT_NODE: - if (node->content != NULL) { - ret = xmlStrlen(node->content); - } - break; - case XML_ENTITY_REF_NODE: - case XML_DOCUMENT_TYPE_NODE: - case XML_ENTITY_NODE: - case XML_DOCUMENT_FRAG_NODE: - case XML_NOTATION_NODE: - case XML_DTD_NODE: - case XML_ELEMENT_DECL: - case XML_ATTRIBUTE_DECL: - case XML_ENTITY_DECL: - case XML_NAMESPACE_DECL: - case XML_XINCLUDE_START: - case XML_XINCLUDE_END: - ret = 1; - break; - } - for (;list != NULL;ret++) - list = list->next; - return(ret); -} - -/** - * xmlLsOneNode: - * @output: the FILE * for the output - * @node: the node to dump - * - * Dump to @output the type and name of @node. - */ -void -xmlLsOneNode(FILE *output, xmlNodePtr node) { - if (output == NULL) return; - if (node == NULL) { - fprintf(output, "NULL\n"); - return; - } - switch (node->type) { - case XML_ELEMENT_NODE: - fprintf(output, "-"); - break; - case XML_ATTRIBUTE_NODE: - fprintf(output, "a"); - break; - case XML_TEXT_NODE: - fprintf(output, "t"); - break; - case XML_CDATA_SECTION_NODE: - fprintf(output, "C"); - break; - case XML_ENTITY_REF_NODE: - fprintf(output, "e"); - break; - case XML_ENTITY_NODE: - fprintf(output, "E"); - break; - case XML_PI_NODE: - fprintf(output, "p"); - break; - case XML_COMMENT_NODE: - fprintf(output, "c"); - break; - case XML_DOCUMENT_NODE: - fprintf(output, "d"); - break; - case XML_HTML_DOCUMENT_NODE: - fprintf(output, "h"); - break; - case XML_DOCUMENT_TYPE_NODE: - fprintf(output, "T"); - break; - case XML_DOCUMENT_FRAG_NODE: - fprintf(output, "F"); - break; - case XML_NOTATION_NODE: - fprintf(output, "N"); - break; - case XML_NAMESPACE_DECL: - fprintf(output, "n"); - break; - default: - fprintf(output, "?"); - } - if (node->type != XML_NAMESPACE_DECL) { - if (node->properties != NULL) - fprintf(output, "a"); - else - fprintf(output, "-"); - if (node->nsDef != NULL) - fprintf(output, "n"); - else - fprintf(output, "-"); - } - - fprintf(output, " %8d ", xmlLsCountNode(node)); - - switch (node->type) { - case XML_ELEMENT_NODE: - if (node->name != NULL) { - if ((node->ns != NULL) && (node->ns->prefix != NULL)) - fprintf(output, "%s:", node->ns->prefix); - fprintf(output, "%s", (const char *) node->name); - } - break; - case XML_ATTRIBUTE_NODE: - if (node->name != NULL) - fprintf(output, "%s", (const char *) node->name); - break; - case XML_TEXT_NODE: - if (node->content != NULL) { - xmlDebugDumpString(output, node->content); - } - break; - case XML_CDATA_SECTION_NODE: - break; - case XML_ENTITY_REF_NODE: - if (node->name != NULL) - fprintf(output, "%s", (const char *) node->name); - break; - case XML_ENTITY_NODE: - if (node->name != NULL) - fprintf(output, "%s", (const char *) node->name); - break; - case XML_PI_NODE: - if (node->name != NULL) - fprintf(output, "%s", (const char *) node->name); - break; - case XML_COMMENT_NODE: - break; - case XML_DOCUMENT_NODE: - break; - case XML_HTML_DOCUMENT_NODE: - break; - case XML_DOCUMENT_TYPE_NODE: - break; - case XML_DOCUMENT_FRAG_NODE: - break; - case XML_NOTATION_NODE: - break; - case XML_NAMESPACE_DECL: { - xmlNsPtr ns = (xmlNsPtr) node; - - if (ns->prefix == NULL) - fprintf(output, "default -> %s", (char *)ns->href); - else - fprintf(output, "%s -> %s", (char *)ns->prefix, - (char *)ns->href); - break; - } - default: - if (node->name != NULL) - fprintf(output, "%s", (const char *) node->name); - } - fprintf(output, "\n"); -} - -/** - * xmlBoolToText: - * @boolval: a bool to turn into text - * - * Convenient way to turn bool into text - * - * Returns a pointer to either "True" or "False" - */ -const char * -xmlBoolToText(int boolval) -{ - if (boolval) - return("True"); - else - return("False"); -} - -#ifdef LIBXML_XPATH_ENABLED -/**************************************************************** - * * - * The XML shell related functions * - * * - ****************************************************************/ - - - -/* - * TODO: Improvement/cleanups for the XML shell - * - allow to shell out an editor on a subpart - * - cleanup function registrations (with help) and calling - * - provide registration routines - */ - -/** - * xmlShellPrintXPathError: - * @errorType: valid xpath error id - * @arg: the argument that cause xpath to fail - * - * Print the xpath error to libxml default error channel - */ -void -xmlShellPrintXPathError(int errorType, const char *arg) -{ - const char *default_arg = "Result"; - - if (!arg) - arg = default_arg; - - switch (errorType) { - case XPATH_UNDEFINED: - fprintf(stderr, - "%s: no such node\n", arg); - break; - - case XPATH_BOOLEAN: - fprintf(stderr, - "%s is a Boolean\n", arg); - break; - case XPATH_NUMBER: - fprintf(stderr, - "%s is a number\n", arg); - break; - case XPATH_STRING: - fprintf(stderr, - "%s is a string\n", arg); - break; - case XPATH_USERS: - fprintf(stderr, - "%s is user-defined\n", arg); - break; - case XPATH_XSLT_TREE: - fprintf(stderr, - "%s is an XSLT value tree\n", arg); - break; - } -#if 0 - fprintf(stderr, - "Try casting the result string function (xpath builtin)\n", - arg); -#endif -} - - -#ifdef LIBXML_OUTPUT_ENABLED -/** - * xmlShellPrintNodeCtxt: - * @ctxt : a non-null shell context - * @node : a non-null node to print to the output FILE - * - * Print node to the output FILE - */ -static void -xmlShellPrintNodeCtxt(xmlShellCtxtPtr ctxt,xmlNodePtr node) -{ - FILE *fp; - - if (!node) - return; - if (ctxt == NULL) - fp = stdout; - else - fp = ctxt->output; - - if (node->type == XML_DOCUMENT_NODE) - xmlDocDump(fp, (xmlDocPtr) node); - else if (node->type == XML_ATTRIBUTE_NODE) - xmlDebugDumpAttrList(fp, (xmlAttrPtr) node, 0); - else - xmlElemDump(fp, node->doc, node); - - fprintf(fp, "\n"); -} - -/** - * xmlShellPrintNode: - * @node : a non-null node to print to the output FILE - * - * Print node to the output FILE - */ -void -xmlShellPrintNode(xmlNodePtr node) -{ - xmlShellPrintNodeCtxt(NULL, node); -} -#endif /* LIBXML_OUTPUT_ENABLED */ - -/** - * xmlShellPrintXPathResultCtxt: - * @ctxt: a valid shell context - * @list: a valid result generated by an xpath evaluation - * - * Prints result to the output FILE - */ -static void -xmlShellPrintXPathResultCtxt(xmlShellCtxtPtr ctxt,xmlXPathObjectPtr list) -{ - if (!ctxt) - return; - - if (list != NULL) { - switch (list->type) { - case XPATH_NODESET:{ -#ifdef LIBXML_OUTPUT_ENABLED - int indx; - - if (list->nodesetval) { - for (indx = 0; indx < list->nodesetval->nodeNr; - indx++) { - xmlShellPrintNodeCtxt(ctxt, - list->nodesetval->nodeTab[indx]); - } - } else { - fprintf(ctxt->output, - "Empty node set\n"); - } - break; -#else - fprintf(ctxt->output, - "Node set\n"); -#endif /* LIBXML_OUTPUT_ENABLED */ - } - case XPATH_BOOLEAN: - fprintf(ctxt->output, - "Is a Boolean:%s\n", - xmlBoolToText(list->boolval)); - break; - case XPATH_NUMBER: - fprintf(ctxt->output, - "Is a number:%0g\n", list->floatval); - break; - case XPATH_STRING: - fprintf(ctxt->output, - "Is a string:%s\n", list->stringval); - break; - - default: - xmlShellPrintXPathError(list->type, NULL); - } - } -} - -/** - * xmlShellPrintXPathResult: - * @list: a valid result generated by an xpath evaluation - * - * Prints result to the output FILE - */ -void -xmlShellPrintXPathResult(xmlXPathObjectPtr list) -{ - xmlShellPrintXPathResultCtxt(NULL, list); -} - -/** - * xmlShellList: - * @ctxt: the shell context - * @arg: unused - * @node: a node - * @node2: unused - * - * Implements the XML shell function "ls" - * Does an Unix like listing of the given node (like a directory) - * - * Returns 0 - */ -int -xmlShellList(xmlShellCtxtPtr ctxt, - char *arg ATTRIBUTE_UNUSED, xmlNodePtr node, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlNodePtr cur; - if (!ctxt) - return (0); - if (node == NULL) { - fprintf(ctxt->output, "NULL\n"); - return (0); - } - if ((node->type == XML_DOCUMENT_NODE) || - (node->type == XML_HTML_DOCUMENT_NODE)) { - cur = ((xmlDocPtr) node)->children; - } else if (node->type == XML_NAMESPACE_DECL) { - xmlLsOneNode(ctxt->output, node); - return (0); - } else if (node->children != NULL) { - cur = node->children; - } else { - xmlLsOneNode(ctxt->output, node); - return (0); - } - while (cur != NULL) { - xmlLsOneNode(ctxt->output, cur); - cur = cur->next; - } - return (0); -} - -/** - * xmlShellBase: - * @ctxt: the shell context - * @arg: unused - * @node: a node - * @node2: unused - * - * Implements the XML shell function "base" - * dumps the current XML base of the node - * - * Returns 0 - */ -int -xmlShellBase(xmlShellCtxtPtr ctxt, - char *arg ATTRIBUTE_UNUSED, xmlNodePtr node, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlChar *base; - if (!ctxt) - return 0; - if (node == NULL) { - fprintf(ctxt->output, "NULL\n"); - return (0); - } - - base = xmlNodeGetBase(node->doc, node); - - if (base == NULL) { - fprintf(ctxt->output, " No base found !!!\n"); - } else { - fprintf(ctxt->output, "%s\n", base); - xmlFree(base); - } - return (0); -} - -/** - * xmlShellSetBase: - * @ctxt: the shell context - * @arg: the new base - * @node: a node - * @node2: unused - * - * Implements the XML shell function "setbase" - * change the current XML base of the node - * - * Returns 0 - */ -static int -xmlShellSetBase(xmlShellCtxtPtr ctxt ATTRIBUTE_UNUSED, - char *arg ATTRIBUTE_UNUSED, xmlNodePtr node, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlNodeSetBase(node, (xmlChar*) arg); - return (0); -} - -#ifdef LIBXML_XPATH_ENABLED -/** - * xmlShellRegisterNamespace: - * @ctxt: the shell context - * @arg: a string in prefix=nsuri format - * @node: unused - * @node2: unused - * - * Implements the XML shell function "setns" - * register/unregister a prefix=namespace pair - * on the XPath context - * - * Returns 0 on success and a negative value otherwise. - */ -static int -xmlShellRegisterNamespace(xmlShellCtxtPtr ctxt, char *arg, - xmlNodePtr node ATTRIBUTE_UNUSED, xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlChar* nsListDup; - xmlChar* prefix; - xmlChar* href; - xmlChar* next; - - nsListDup = xmlStrdup((xmlChar *) arg); - next = nsListDup; - while(next != NULL) { - /* skip spaces */ - /*while((*next) == ' ') next++;*/ - if((*next) == '\0') break; - - /* find prefix */ - prefix = next; - next = (xmlChar*)xmlStrchr(next, '='); - if(next == NULL) { - fprintf(ctxt->output, "setns: prefix=[nsuri] required\n"); - xmlFree(nsListDup); - return(-1); - } - *(next++) = '\0'; - - /* find href */ - href = next; - next = (xmlChar*)xmlStrchr(next, ' '); - if(next != NULL) { - *(next++) = '\0'; - } - - /* do register namespace */ - if(xmlXPathRegisterNs(ctxt->pctxt, prefix, href) != 0) { - fprintf(ctxt->output,"Error: unable to register NS with prefix=\"%s\" and href=\"%s\"\n", prefix, href); - xmlFree(nsListDup); - return(-1); - } - } - - xmlFree(nsListDup); - return(0); -} -/** - * xmlShellRegisterRootNamespaces: - * @ctxt: the shell context - * @arg: unused - * @node: the root element - * @node2: unused - * - * Implements the XML shell function "setrootns" - * which registers all namespaces declarations found on the root element. - * - * Returns 0 on success and a negative value otherwise. - */ -static int -xmlShellRegisterRootNamespaces(xmlShellCtxtPtr ctxt, char *arg ATTRIBUTE_UNUSED, - xmlNodePtr root, xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlNsPtr ns; - - if ((root == NULL) || (root->type != XML_ELEMENT_NODE) || - (root->nsDef == NULL) || (ctxt == NULL) || (ctxt->pctxt == NULL)) - return(-1); - ns = root->nsDef; - while (ns != NULL) { - if (ns->prefix == NULL) - xmlXPathRegisterNs(ctxt->pctxt, BAD_CAST "defaultns", ns->href); - else - xmlXPathRegisterNs(ctxt->pctxt, ns->prefix, ns->href); - ns = ns->next; - } - return(0); -} -#endif - -/** - * xmlShellGrep: - * @ctxt: the shell context - * @arg: the string or regular expression to find - * @node: a node - * @node2: unused - * - * Implements the XML shell function "grep" - * dumps information about the node (namespace, attributes, content). - * - * Returns 0 - */ -static int -xmlShellGrep(xmlShellCtxtPtr ctxt ATTRIBUTE_UNUSED, - char *arg, xmlNodePtr node, xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - if (!ctxt) - return (0); - if (node == NULL) - return (0); - if (arg == NULL) - return (0); -#ifdef LIBXML_REGEXP_ENABLED - if ((xmlStrchr((xmlChar *) arg, '?')) || - (xmlStrchr((xmlChar *) arg, '*')) || - (xmlStrchr((xmlChar *) arg, '.')) || - (xmlStrchr((xmlChar *) arg, '['))) { - } -#endif - while (node != NULL) { - if (node->type == XML_COMMENT_NODE) { - if (xmlStrstr(node->content, (xmlChar *) arg)) { - - fprintf(ctxt->output, "%s : ", xmlGetNodePath(node)); - xmlShellList(ctxt, NULL, node, NULL); - } - } else if (node->type == XML_TEXT_NODE) { - if (xmlStrstr(node->content, (xmlChar *) arg)) { - - fprintf(ctxt->output, "%s : ", xmlGetNodePath(node->parent)); - xmlShellList(ctxt, NULL, node->parent, NULL); - } - } - - /* - * Browse the full subtree, deep first - */ - - if ((node->type == XML_DOCUMENT_NODE) || - (node->type == XML_HTML_DOCUMENT_NODE)) { - node = ((xmlDocPtr) node)->children; - } else if ((node->children != NULL) - && (node->type != XML_ENTITY_REF_NODE)) { - /* deep first */ - node = node->children; - } else if (node->next != NULL) { - /* then siblings */ - node = node->next; - } else { - /* go up to parents->next if needed */ - while (node != NULL) { - if (node->parent != NULL) { - node = node->parent; - } - if (node->next != NULL) { - node = node->next; - break; - } - if (node->parent == NULL) { - node = NULL; - break; - } - } - } - } - return (0); -} - -/** - * xmlShellDir: - * @ctxt: the shell context - * @arg: unused - * @node: a node - * @node2: unused - * - * Implements the XML shell function "dir" - * dumps information about the node (namespace, attributes, content). - * - * Returns 0 - */ -int -xmlShellDir(xmlShellCtxtPtr ctxt ATTRIBUTE_UNUSED, - char *arg ATTRIBUTE_UNUSED, xmlNodePtr node, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - if (!ctxt) - return (0); - if (node == NULL) { - fprintf(ctxt->output, "NULL\n"); - return (0); - } - if ((node->type == XML_DOCUMENT_NODE) || - (node->type == XML_HTML_DOCUMENT_NODE)) { - xmlDebugDumpDocumentHead(ctxt->output, (xmlDocPtr) node); - } else if (node->type == XML_ATTRIBUTE_NODE) { - xmlDebugDumpAttr(ctxt->output, (xmlAttrPtr) node, 0); - } else { - xmlDebugDumpOneNode(ctxt->output, node, 0); - } - return (0); -} - -/** - * xmlShellSetContent: - * @ctxt: the shell context - * @value: the content as a string - * @node: a node - * @node2: unused - * - * Implements the XML shell function "dir" - * dumps information about the node (namespace, attributes, content). - * - * Returns 0 - */ -static int -xmlShellSetContent(xmlShellCtxtPtr ctxt ATTRIBUTE_UNUSED, - char *value, xmlNodePtr node, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlNodePtr results; - xmlParserErrors ret; - - if (!ctxt) - return (0); - if (node == NULL) { - fprintf(ctxt->output, "NULL\n"); - return (0); - } - if (value == NULL) { - fprintf(ctxt->output, "NULL\n"); - return (0); - } - - ret = xmlParseInNodeContext(node, value, strlen(value), 0, &results); - if (ret == XML_ERR_OK) { - if (node->children != NULL) { - xmlFreeNodeList(node->children); - node->children = NULL; - node->last = NULL; - } - xmlAddChildList(node, results); - } else { - fprintf(ctxt->output, "failed to parse content\n"); - } - return (0); -} - -static void -xmlShellPrintf(void *ctx, const char *msg, ...) { - xmlShellCtxtPtr sctxt = ctx; - va_list ap; - - va_start(ap, msg); - vfprintf(sctxt->output, msg, ap); - va_end(ap); -} - -#ifdef LIBXML_SCHEMAS_ENABLED -/** - * xmlShellRNGValidate: - * @ctxt: the shell context - * @schemas: the path to the Relax-NG schemas - * @node: a node - * @node2: unused - * - * Implements the XML shell function "relaxng" - * validating the instance against a Relax-NG schemas - * - * Returns 0 - */ -static int -xmlShellRNGValidate(xmlShellCtxtPtr sctxt, char *schemas, - xmlNodePtr node ATTRIBUTE_UNUSED, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlRelaxNGPtr relaxngschemas; - xmlRelaxNGParserCtxtPtr ctxt; - xmlRelaxNGValidCtxtPtr vctxt; - int ret; - - ctxt = xmlRelaxNGNewParserCtxt(schemas); - xmlRelaxNGSetParserErrors(ctxt, xmlShellPrintf, xmlShellPrintf, sctxt); - relaxngschemas = xmlRelaxNGParse(ctxt); - xmlRelaxNGFreeParserCtxt(ctxt); - if (relaxngschemas == NULL) { - fprintf(sctxt->output, - "Relax-NG schema %s failed to compile\n", schemas); - return(-1); - } - vctxt = xmlRelaxNGNewValidCtxt(relaxngschemas); - xmlRelaxNGSetValidErrors(vctxt, xmlShellPrintf, xmlShellPrintf, sctxt); - ret = xmlRelaxNGValidateDoc(vctxt, sctxt->doc); - if (ret == 0) { - fprintf(sctxt->output, "%s validates\n", sctxt->filename); - } else if (ret > 0) { - fprintf(sctxt->output, "%s fails to validate\n", sctxt->filename); - } else { - fprintf(sctxt->output, "%s validation generated an internal error\n", - sctxt->filename); - } - xmlRelaxNGFreeValidCtxt(vctxt); - if (relaxngschemas != NULL) - xmlRelaxNGFree(relaxngschemas); - return(0); -} -#endif - -#ifdef LIBXML_OUTPUT_ENABLED -/** - * xmlShellCat: - * @ctxt: the shell context - * @arg: unused - * @node: a node - * @node2: unused - * - * Implements the XML shell function "cat" - * dumps the serialization node content (XML or HTML). - * - * Returns 0 - */ -int -xmlShellCat(xmlShellCtxtPtr ctxt, char *arg ATTRIBUTE_UNUSED, - xmlNodePtr node, xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - if (!ctxt) - return (0); - if (node == NULL) { - fprintf(ctxt->output, "NULL\n"); - return (0); - } - if (ctxt->doc->type == XML_HTML_DOCUMENT_NODE) { -#ifdef LIBXML_HTML_ENABLED - if (node->type == XML_HTML_DOCUMENT_NODE) - htmlDocDump(ctxt->output, (htmlDocPtr) node); - else - htmlNodeDumpFile(ctxt->output, ctxt->doc, node); -#else - if (node->type == XML_DOCUMENT_NODE) - xmlDocDump(ctxt->output, (xmlDocPtr) node); - else - xmlElemDump(ctxt->output, ctxt->doc, node); -#endif /* LIBXML_HTML_ENABLED */ - } else { - if (node->type == XML_DOCUMENT_NODE) - xmlDocDump(ctxt->output, (xmlDocPtr) node); - else - xmlElemDump(ctxt->output, ctxt->doc, node); - } - fprintf(ctxt->output, "\n"); - return (0); -} -#endif /* LIBXML_OUTPUT_ENABLED */ - -/** - * xmlShellLoad: - * @ctxt: the shell context - * @filename: the file name - * @node: unused - * @node2: unused - * - * Implements the XML shell function "load" - * loads a new document specified by the filename - * - * Returns 0 or -1 if loading failed - */ -int -xmlShellLoad(xmlShellCtxtPtr ctxt, char *filename, - xmlNodePtr node ATTRIBUTE_UNUSED, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlDocPtr doc; - int html = 0; - - if ((ctxt == NULL) || (filename == NULL)) return(-1); - if (ctxt->doc != NULL) - html = (ctxt->doc->type == XML_HTML_DOCUMENT_NODE); - - if (html) { -#ifdef LIBXML_HTML_ENABLED - doc = htmlParseFile(filename, NULL); -#else - fprintf(ctxt->output, "HTML support not compiled in\n"); - doc = NULL; -#endif /* LIBXML_HTML_ENABLED */ - } else { - doc = xmlReadFile(filename,NULL,0); - } - if (doc != NULL) { - if (ctxt->loaded == 1) { - xmlFreeDoc(ctxt->doc); - } - ctxt->loaded = 1; -#ifdef LIBXML_XPATH_ENABLED - xmlXPathFreeContext(ctxt->pctxt); -#endif /* LIBXML_XPATH_ENABLED */ - xmlFree(ctxt->filename); - ctxt->doc = doc; - ctxt->node = (xmlNodePtr) doc; -#ifdef LIBXML_XPATH_ENABLED - ctxt->pctxt = xmlXPathNewContext(doc); -#endif /* LIBXML_XPATH_ENABLED */ - ctxt->filename = (char *) xmlCanonicPath((xmlChar *) filename); - } else - return (-1); - return (0); -} - -#ifdef LIBXML_OUTPUT_ENABLED -/** - * xmlShellWrite: - * @ctxt: the shell context - * @filename: the file name - * @node: a node in the tree - * @node2: unused - * - * Implements the XML shell function "write" - * Write the current node to the filename, it saves the serialization - * of the subtree under the @node specified - * - * Returns 0 or -1 in case of error - */ -int -xmlShellWrite(xmlShellCtxtPtr ctxt, char *filename, xmlNodePtr node, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - if (node == NULL) - return (-1); - if ((filename == NULL) || (filename[0] == 0)) { - return (-1); - } -#ifdef W_OK - if (access((char *) filename, W_OK)) { - fprintf(ctxt->output, - "Cannot write to %s\n", filename); - return (-1); - } -#endif - switch (node->type) { - case XML_DOCUMENT_NODE: - if (xmlSaveFile((char *) filename, ctxt->doc) < -1) { - fprintf(ctxt->output, - "Failed to write to %s\n", filename); - return (-1); - } - break; - case XML_HTML_DOCUMENT_NODE: -#ifdef LIBXML_HTML_ENABLED - if (htmlSaveFile((char *) filename, ctxt->doc) < 0) { - fprintf(ctxt->output, - "Failed to write to %s\n", filename); - return (-1); - } -#else - if (xmlSaveFile((char *) filename, ctxt->doc) < -1) { - fprintf(ctxt->output, - "Failed to write to %s\n", filename); - return (-1); - } -#endif /* LIBXML_HTML_ENABLED */ - break; - default:{ - FILE *f; - - f = fopen((char *) filename, "w"); - if (f == NULL) { - fprintf(ctxt->output, - "Failed to write to %s\n", filename); - return (-1); - } - xmlElemDump(f, ctxt->doc, node); - fclose(f); - } - } - return (0); -} - -/** - * xmlShellSave: - * @ctxt: the shell context - * @filename: the file name (optional) - * @node: unused - * @node2: unused - * - * Implements the XML shell function "save" - * Write the current document to the filename, or it's original name - * - * Returns 0 or -1 in case of error - */ -int -xmlShellSave(xmlShellCtxtPtr ctxt, char *filename, - xmlNodePtr node ATTRIBUTE_UNUSED, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - if ((ctxt == NULL) || (ctxt->doc == NULL)) - return (-1); - if ((filename == NULL) || (filename[0] == 0)) - filename = ctxt->filename; - if (filename == NULL) - return (-1); -#ifdef W_OK - if (access((char *) filename, W_OK)) { - fprintf(ctxt->output, - "Cannot save to %s\n", filename); - return (-1); - } -#endif - switch (ctxt->doc->type) { - case XML_DOCUMENT_NODE: - if (xmlSaveFile((char *) filename, ctxt->doc) < 0) { - fprintf(ctxt->output, - "Failed to save to %s\n", filename); - } - break; - case XML_HTML_DOCUMENT_NODE: -#ifdef LIBXML_HTML_ENABLED - if (htmlSaveFile((char *) filename, ctxt->doc) < 0) { - fprintf(ctxt->output, - "Failed to save to %s\n", filename); - } -#else - if (xmlSaveFile((char *) filename, ctxt->doc) < 0) { - fprintf(ctxt->output, - "Failed to save to %s\n", filename); - } -#endif /* LIBXML_HTML_ENABLED */ - break; - default: - fprintf(ctxt->output, - "To save to subparts of a document use the 'write' command\n"); - return (-1); - - } - return (0); -} -#endif /* LIBXML_OUTPUT_ENABLED */ - -#ifdef LIBXML_VALID_ENABLED -/** - * xmlShellValidate: - * @ctxt: the shell context - * @dtd: the DTD URI (optional) - * @node: unused - * @node2: unused - * - * Implements the XML shell function "validate" - * Validate the document, if a DTD path is provided, then the validation - * is done against the given DTD. - * - * Returns 0 or -1 in case of error - */ -int -xmlShellValidate(xmlShellCtxtPtr ctxt, char *dtd, - xmlNodePtr node ATTRIBUTE_UNUSED, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlValidCtxt vctxt; - int res = -1; - - if ((ctxt == NULL) || (ctxt->doc == NULL)) return(-1); - memset(&vctxt, 0, sizeof(vctxt)); - vctxt.error = xmlShellPrintf; - vctxt.warning = xmlShellPrintf; - vctxt.userData = ctxt; - - if ((dtd == NULL) || (dtd[0] == 0)) { - res = xmlValidateDocument(&vctxt, ctxt->doc); - } else { - xmlDtdPtr subset; - - subset = xmlParseDTD(NULL, (xmlChar *) dtd); - if (subset != NULL) { - res = xmlValidateDtd(&vctxt, ctxt->doc, subset); - - xmlFreeDtd(subset); - } - } - return (res); -} -#endif /* LIBXML_VALID_ENABLED */ - -/** - * xmlShellDu: - * @ctxt: the shell context - * @arg: unused - * @tree: a node defining a subtree - * @node2: unused - * - * Implements the XML shell function "du" - * show the structure of the subtree under node @tree - * If @tree is null, the command works on the current node. - * - * Returns 0 or -1 in case of error - */ -int -xmlShellDu(xmlShellCtxtPtr ctxt, - char *arg ATTRIBUTE_UNUSED, xmlNodePtr tree, - xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlNodePtr node; - int indent = 0, i; - - if (!ctxt) - return (-1); - - if (tree == NULL) - return (-1); - node = tree; - while (node != NULL) { - if ((node->type == XML_DOCUMENT_NODE) || - (node->type == XML_HTML_DOCUMENT_NODE)) { - fprintf(ctxt->output, "/\n"); - } else if (node->type == XML_ELEMENT_NODE) { - for (i = 0; i < indent; i++) - fprintf(ctxt->output, " "); - if ((node->ns) && (node->ns->prefix)) - fprintf(ctxt->output, "%s:", node->ns->prefix); - fprintf(ctxt->output, "%s\n", node->name); - } else { - } - - /* - * Browse the full subtree, deep first - */ - - if ((node->type == XML_DOCUMENT_NODE) || - (node->type == XML_HTML_DOCUMENT_NODE)) { - node = ((xmlDocPtr) node)->children; - } else if ((node->children != NULL) - && (node->type != XML_ENTITY_REF_NODE)) { - /* deep first */ - node = node->children; - indent++; - } else if ((node != tree) && (node->next != NULL)) { - /* then siblings */ - node = node->next; - } else if (node != tree) { - /* go up to parents->next if needed */ - while (node != tree) { - if (node->parent != NULL) { - node = node->parent; - indent--; - } - if ((node != tree) && (node->next != NULL)) { - node = node->next; - break; - } - if (node->parent == NULL) { - node = NULL; - break; - } - if (node == tree) { - node = NULL; - break; - } - } - /* exit condition */ - if (node == tree) - node = NULL; - } else - node = NULL; - } - return (0); -} - -/** - * xmlShellPwd: - * @ctxt: the shell context - * @buffer: the output buffer - * @node: a node - * @node2: unused - * - * Implements the XML shell function "pwd" - * Show the full path from the root to the node, if needed building - * thumblers when similar elements exists at a given ancestor level. - * The output is compatible with XPath commands. - * - * Returns 0 or -1 in case of error - */ -int -xmlShellPwd(xmlShellCtxtPtr ctxt ATTRIBUTE_UNUSED, char *buffer, - xmlNodePtr node, xmlNodePtr node2 ATTRIBUTE_UNUSED) -{ - xmlChar *path; - - if ((node == NULL) || (buffer == NULL)) - return (-1); - - path = xmlGetNodePath(node); - if (path == NULL) - return (-1); - - /* - * This test prevents buffer overflow, because this routine - * is only called by xmlShell, in which the second argument is - * 500 chars long. - * It is a dirty hack before a cleaner solution is found. - * Documentation should mention that the second argument must - * be at least 500 chars long, and could be stripped if too long. - */ - snprintf(buffer, 499, "%s", path); - buffer[499] = '0'; - xmlFree(path); - - return (0); -} - -/** - * xmlShell: - * @doc: the initial document - * @filename: the output buffer - * @input: the line reading function - * @output: the output FILE*, defaults to stdout if NULL - * - * Implements the XML shell - * This allow to load, validate, view, modify and save a document - * using a environment similar to a UNIX commandline. - */ -void -xmlShell(xmlDocPtr doc, const char *filename, xmlShellReadlineFunc input, - FILE * output) -{ - char prompt[500] = "/ > "; - char *cmdline = NULL, *cur; - char command[100]; - char arg[400]; - int i; - xmlShellCtxtPtr ctxt; - xmlXPathObjectPtr list; - - if (doc == NULL) - return; - if (filename == NULL) - return; - if (input == NULL) - return; - if (output == NULL) - output = stdout; - ctxt = (xmlShellCtxtPtr) xmlMalloc(sizeof(xmlShellCtxt)); - if (ctxt == NULL) - return; - ctxt->loaded = 0; - ctxt->doc = doc; - ctxt->input = input; - ctxt->output = output; - ctxt->filename = (char *) xmlStrdup((xmlChar *) filename); - ctxt->node = (xmlNodePtr) ctxt->doc; - -#ifdef LIBXML_XPATH_ENABLED - ctxt->pctxt = xmlXPathNewContext(ctxt->doc); - if (ctxt->pctxt == NULL) { - xmlFree(ctxt); - return; - } -#endif /* LIBXML_XPATH_ENABLED */ - while (1) { - if (ctxt->node == (xmlNodePtr) ctxt->doc) - snprintf(prompt, sizeof(prompt), "%s > ", "/"); - else if ((ctxt->node != NULL) && (ctxt->node->name) && - (ctxt->node->ns) && (ctxt->node->ns->prefix)) - snprintf(prompt, sizeof(prompt), "%s:%s > ", - (ctxt->node->ns->prefix), ctxt->node->name); - else if ((ctxt->node != NULL) && (ctxt->node->name)) - snprintf(prompt, sizeof(prompt), "%s > ", ctxt->node->name); - else - snprintf(prompt, sizeof(prompt), "? > "); - prompt[sizeof(prompt) - 1] = 0; - - /* - * Get a new command line - */ - cmdline = ctxt->input(prompt); - if (cmdline == NULL) - break; - - /* - * Parse the command itself - */ - cur = cmdline; - while ((*cur == ' ') || (*cur == '\t')) - cur++; - i = 0; - while ((*cur != ' ') && (*cur != '\t') && - (*cur != '\n') && (*cur != '\r')) { - if (*cur == 0) - break; - command[i++] = *cur++; - } - command[i] = 0; - if (i == 0) - continue; - - /* - * Parse the argument - */ - while ((*cur == ' ') || (*cur == '\t')) - cur++; - i = 0; - while ((*cur != '\n') && (*cur != '\r') && (*cur != 0)) { - if (*cur == 0) - break; - arg[i++] = *cur++; - } - arg[i] = 0; - - /* - * start interpreting the command - */ - if (!strcmp(command, "exit")) - break; - if (!strcmp(command, "quit")) - break; - if (!strcmp(command, "bye")) - break; - if (!strcmp(command, "help")) { - fprintf(ctxt->output, "\tbase display XML base of the node\n"); - fprintf(ctxt->output, "\tsetbase URI change the XML base of the node\n"); - fprintf(ctxt->output, "\tbye leave shell\n"); - fprintf(ctxt->output, "\tcat [node] display node or current node\n"); - fprintf(ctxt->output, "\tcd [path] change directory to path or to root\n"); - fprintf(ctxt->output, "\tdir [path] dumps information about the node (namespace, attributes, content)\n"); - fprintf(ctxt->output, "\tdu [path] show the structure of the subtree under path or the current node\n"); - fprintf(ctxt->output, "\texit leave shell\n"); - fprintf(ctxt->output, "\thelp display this help\n"); - fprintf(ctxt->output, "\tfree display memory usage\n"); - fprintf(ctxt->output, "\tload [name] load a new document with name\n"); - fprintf(ctxt->output, "\tls [path] list contents of path or the current directory\n"); - fprintf(ctxt->output, "\tset xml_fragment replace the current node content with the fragment parsed in context\n"); -#ifdef LIBXML_XPATH_ENABLED - fprintf(ctxt->output, "\txpath expr evaluate the XPath expression in that context and print the result\n"); - fprintf(ctxt->output, "\tsetns nsreg register a namespace to a prefix in the XPath evaluation context\n"); - fprintf(ctxt->output, "\t format for nsreg is: prefix=[nsuri] (i.e. prefix= unsets a prefix)\n"); - fprintf(ctxt->output, "\tsetrootns register all namespace found on the root element\n"); - fprintf(ctxt->output, "\t the default namespace if any uses 'defaultns' prefix\n"); -#endif /* LIBXML_XPATH_ENABLED */ - fprintf(ctxt->output, "\tpwd display current working directory\n"); - fprintf(ctxt->output, "\twhereis display absolute path of [path] or current working directory\n"); - fprintf(ctxt->output, "\tquit leave shell\n"); -#ifdef LIBXML_OUTPUT_ENABLED - fprintf(ctxt->output, "\tsave [name] save this document to name or the original name\n"); - fprintf(ctxt->output, "\twrite [name] write the current node to the filename\n"); -#endif /* LIBXML_OUTPUT_ENABLED */ -#ifdef LIBXML_VALID_ENABLED - fprintf(ctxt->output, "\tvalidate check the document for errors\n"); -#endif /* LIBXML_VALID_ENABLED */ -#ifdef LIBXML_SCHEMAS_ENABLED - fprintf(ctxt->output, "\trelaxng rng validate the document against the Relax-NG schemas\n"); -#endif - fprintf(ctxt->output, "\tgrep string search for a string in the subtree\n"); -#ifdef LIBXML_VALID_ENABLED - } else if (!strcmp(command, "validate")) { - xmlShellValidate(ctxt, arg, NULL, NULL); -#endif /* LIBXML_VALID_ENABLED */ - } else if (!strcmp(command, "load")) { - xmlShellLoad(ctxt, arg, NULL, NULL); -#ifdef LIBXML_SCHEMAS_ENABLED - } else if (!strcmp(command, "relaxng")) { - xmlShellRNGValidate(ctxt, arg, NULL, NULL); -#endif -#ifdef LIBXML_OUTPUT_ENABLED - } else if (!strcmp(command, "save")) { - xmlShellSave(ctxt, arg, NULL, NULL); - } else if (!strcmp(command, "write")) { - if (arg[0] == 0) - fprintf(ctxt->output, - "Write command requires a filename argument\n"); - else - xmlShellWrite(ctxt, arg, ctxt->node, NULL); -#endif /* LIBXML_OUTPUT_ENABLED */ - } else if (!strcmp(command, "grep")) { - xmlShellGrep(ctxt, arg, ctxt->node, NULL); - } else if (!strcmp(command, "pwd")) { - char dir[500]; - - if (!xmlShellPwd(ctxt, dir, ctxt->node, NULL)) - fprintf(ctxt->output, "%s\n", dir); - } else if (!strcmp(command, "du")) { - if (arg[0] == 0) { - xmlShellDu(ctxt, NULL, ctxt->node, NULL); - } else { - ctxt->pctxt->node = ctxt->node; -#ifdef LIBXML_XPATH_ENABLED - ctxt->pctxt->node = ctxt->node; - list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); -#else - list = NULL; -#endif /* LIBXML_XPATH_ENABLED */ - if (list != NULL) { - switch (list->type) { - case XPATH_UNDEFINED: - fprintf(ctxt->output, - "%s: no such node\n", arg); - break; - case XPATH_NODESET:{ - int indx; - - if (list->nodesetval == NULL) - break; - - for (indx = 0; - indx < list->nodesetval->nodeNr; - indx++) - xmlShellDu(ctxt, NULL, - list->nodesetval-> - nodeTab[indx], NULL); - break; - } - case XPATH_BOOLEAN: - fprintf(ctxt->output, - "%s is a Boolean\n", arg); - break; - case XPATH_NUMBER: - fprintf(ctxt->output, - "%s is a number\n", arg); - break; - case XPATH_STRING: - fprintf(ctxt->output, - "%s is a string\n", arg); - break; - case XPATH_USERS: - fprintf(ctxt->output, - "%s is user-defined\n", arg); - break; - case XPATH_XSLT_TREE: - fprintf(ctxt->output, - "%s is an XSLT value tree\n", - arg); - break; - } -#ifdef LIBXML_XPATH_ENABLED - xmlXPathFreeObject(list); -#endif - } else { - fprintf(ctxt->output, - "%s: no such node\n", arg); - } - ctxt->pctxt->node = NULL; - } - } else if (!strcmp(command, "base")) { - xmlShellBase(ctxt, NULL, ctxt->node, NULL); - } else if (!strcmp(command, "set")) { - xmlShellSetContent(ctxt, arg, ctxt->node, NULL); -#ifdef LIBXML_XPATH_ENABLED - } else if (!strcmp(command, "setns")) { - if (arg[0] == 0) { - fprintf(ctxt->output, - "setns: prefix=[nsuri] required\n"); - } else { - xmlShellRegisterNamespace(ctxt, arg, NULL, NULL); - } - } else if (!strcmp(command, "setrootns")) { - xmlNodePtr root; - - root = xmlDocGetRootElement(ctxt->doc); - xmlShellRegisterRootNamespaces(ctxt, NULL, root, NULL); - } else if (!strcmp(command, "xpath")) { - if (arg[0] == 0) { - fprintf(ctxt->output, - "xpath: expression required\n"); - } else { - ctxt->pctxt->node = ctxt->node; - list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); - xmlXPathDebugDumpObject(ctxt->output, list, 0); - xmlXPathFreeObject(list); - } -#endif /* LIBXML_XPATH_ENABLED */ - } else if (!strcmp(command, "setbase")) { - xmlShellSetBase(ctxt, arg, ctxt->node, NULL); - } else if ((!strcmp(command, "ls")) || (!strcmp(command, "dir"))) { - int dir = (!strcmp(command, "dir")); - - if (arg[0] == 0) { - if (dir) - xmlShellDir(ctxt, NULL, ctxt->node, NULL); - else - xmlShellList(ctxt, NULL, ctxt->node, NULL); - } else { - ctxt->pctxt->node = ctxt->node; -#ifdef LIBXML_XPATH_ENABLED - ctxt->pctxt->node = ctxt->node; - list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); -#else - list = NULL; -#endif /* LIBXML_XPATH_ENABLED */ - if (list != NULL) { - switch (list->type) { - case XPATH_UNDEFINED: - fprintf(ctxt->output, - "%s: no such node\n", arg); - break; - case XPATH_NODESET:{ - int indx; - - if (list->nodesetval == NULL) - break; - - for (indx = 0; - indx < list->nodesetval->nodeNr; - indx++) { - if (dir) - xmlShellDir(ctxt, NULL, - list->nodesetval-> - nodeTab[indx], NULL); - else - xmlShellList(ctxt, NULL, - list->nodesetval-> - nodeTab[indx], NULL); - } - break; - } - case XPATH_BOOLEAN: - fprintf(ctxt->output, - "%s is a Boolean\n", arg); - break; - case XPATH_NUMBER: - fprintf(ctxt->output, - "%s is a number\n", arg); - break; - case XPATH_STRING: - fprintf(ctxt->output, - "%s is a string\n", arg); - break; - case XPATH_USERS: - fprintf(ctxt->output, - "%s is user-defined\n", arg); - break; - case XPATH_XSLT_TREE: - fprintf(ctxt->output, - "%s is an XSLT value tree\n", - arg); - break; - } -#ifdef LIBXML_XPATH_ENABLED - xmlXPathFreeObject(list); -#endif - } else { - fprintf(ctxt->output, - "%s: no such node\n", arg); - } - ctxt->pctxt->node = NULL; - } - } else if (!strcmp(command, "whereis")) { - char dir[500]; - - if (arg[0] == 0) { - if (!xmlShellPwd(ctxt, dir, ctxt->node, NULL)) - fprintf(ctxt->output, "%s\n", dir); - } else { - ctxt->pctxt->node = ctxt->node; -#ifdef LIBXML_XPATH_ENABLED - list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); -#else - list = NULL; -#endif /* LIBXML_XPATH_ENABLED */ - if (list != NULL) { - switch (list->type) { - case XPATH_UNDEFINED: - fprintf(ctxt->output, - "%s: no such node\n", arg); - break; - case XPATH_NODESET:{ - int indx; - - if (list->nodesetval == NULL) - break; - - for (indx = 0; - indx < list->nodesetval->nodeNr; - indx++) { - if (!xmlShellPwd(ctxt, dir, list->nodesetval-> - nodeTab[indx], NULL)) - fprintf(ctxt->output, "%s\n", dir); - } - break; - } - case XPATH_BOOLEAN: - fprintf(ctxt->output, - "%s is a Boolean\n", arg); - break; - case XPATH_NUMBER: - fprintf(ctxt->output, - "%s is a number\n", arg); - break; - case XPATH_STRING: - fprintf(ctxt->output, - "%s is a string\n", arg); - break; - case XPATH_USERS: - fprintf(ctxt->output, - "%s is user-defined\n", arg); - break; - case XPATH_XSLT_TREE: - fprintf(ctxt->output, - "%s is an XSLT value tree\n", - arg); - break; - } -#ifdef LIBXML_XPATH_ENABLED - xmlXPathFreeObject(list); -#endif - } else { - fprintf(ctxt->output, - "%s: no such node\n", arg); - } - ctxt->pctxt->node = NULL; - } - } else if (!strcmp(command, "cd")) { - if (arg[0] == 0) { - ctxt->node = (xmlNodePtr) ctxt->doc; - } else { -#ifdef LIBXML_XPATH_ENABLED - int l; - - ctxt->pctxt->node = ctxt->node; - l = strlen(arg); - if ((l >= 2) && (arg[l - 1] == '/')) - arg[l - 1] = 0; - list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); -#else - list = NULL; -#endif /* LIBXML_XPATH_ENABLED */ - if (list != NULL) { - switch (list->type) { - case XPATH_UNDEFINED: - fprintf(ctxt->output, - "%s: no such node\n", arg); - break; - case XPATH_NODESET: - if (list->nodesetval != NULL) { - if (list->nodesetval->nodeNr == 1) { - ctxt->node = list->nodesetval->nodeTab[0]; - if ((ctxt->node != NULL) && - (ctxt->node->type == - XML_NAMESPACE_DECL)) { - fprintf(ctxt->output, - "cannot cd to namespace\n"); - ctxt->node = NULL; - } - } else - fprintf(ctxt->output, - "%s is a %d Node Set\n", - arg, - list->nodesetval->nodeNr); - } else - fprintf(ctxt->output, - "%s is an empty Node Set\n", - arg); - break; - case XPATH_BOOLEAN: - fprintf(ctxt->output, - "%s is a Boolean\n", arg); - break; - case XPATH_NUMBER: - fprintf(ctxt->output, - "%s is a number\n", arg); - break; - case XPATH_STRING: - fprintf(ctxt->output, - "%s is a string\n", arg); - break; - case XPATH_USERS: - fprintf(ctxt->output, - "%s is user-defined\n", arg); - break; - case XPATH_XSLT_TREE: - fprintf(ctxt->output, - "%s is an XSLT value tree\n", - arg); - break; - } -#ifdef LIBXML_XPATH_ENABLED - xmlXPathFreeObject(list); -#endif - } else { - fprintf(ctxt->output, - "%s: no such node\n", arg); - } - ctxt->pctxt->node = NULL; - } -#ifdef LIBXML_OUTPUT_ENABLED - } else if (!strcmp(command, "cat")) { - if (arg[0] == 0) { - xmlShellCat(ctxt, NULL, ctxt->node, NULL); - } else { - ctxt->pctxt->node = ctxt->node; -#ifdef LIBXML_XPATH_ENABLED - ctxt->pctxt->node = ctxt->node; - list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); -#else - list = NULL; -#endif /* LIBXML_XPATH_ENABLED */ - if (list != NULL) { - switch (list->type) { - case XPATH_UNDEFINED: - fprintf(ctxt->output, - "%s: no such node\n", arg); - break; - case XPATH_NODESET:{ - int indx; - - if (list->nodesetval == NULL) - break; - - for (indx = 0; - indx < list->nodesetval->nodeNr; - indx++) { - if (i > 0) - fprintf(ctxt->output, " -------\n"); - xmlShellCat(ctxt, NULL, - list->nodesetval-> - nodeTab[indx], NULL); - } - break; - } - case XPATH_BOOLEAN: - fprintf(ctxt->output, - "%s is a Boolean\n", arg); - break; - case XPATH_NUMBER: - fprintf(ctxt->output, - "%s is a number\n", arg); - break; - case XPATH_STRING: - fprintf(ctxt->output, - "%s is a string\n", arg); - break; - case XPATH_USERS: - fprintf(ctxt->output, - "%s is user-defined\n", arg); - break; - case XPATH_XSLT_TREE: - fprintf(ctxt->output, - "%s is an XSLT value tree\n", - arg); - break; - } -#ifdef LIBXML_XPATH_ENABLED - xmlXPathFreeObject(list); -#endif - } else { - fprintf(ctxt->output, - "%s: no such node\n", arg); - } - ctxt->pctxt->node = NULL; - } -#endif /* LIBXML_OUTPUT_ENABLED */ - } else { - fprintf(ctxt->output, - "Unknown command %s\n", command); - } - free(cmdline); /* not xmlFree here ! */ - cmdline = NULL; - } -#ifdef LIBXML_XPATH_ENABLED - xmlXPathFreeContext(ctxt->pctxt); -#endif /* LIBXML_XPATH_ENABLED */ - if (ctxt->loaded) { - xmlFreeDoc(ctxt->doc); - } - if (ctxt->filename != NULL) - xmlFree(ctxt->filename); - xmlFree(ctxt); - if (cmdline != NULL) - free(cmdline); /* not xmlFree here ! */ -} - -#endif /* LIBXML_XPATH_ENABLED */ - #endif /* LIBXML_DEBUG_ENABLED */ diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 1b228dfa..29c11faf 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -311,10 +311,6 @@ Tree debugging APIs Interfaces to a set of routines used for debugging the tree produced by the XML parser. Daniel Veillard - - - - @@ -326,24 +322,6 @@ - - - - - - - - - - - - - - - - - - string dictionary @@ -6656,16 +6634,6 @@ Could we use @subtypes for this?'/> - - - - - - - - - - @@ -8313,12 +8281,6 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_DEBUG_ENABLED) - Convenient way to turn bool into text - - - Function to extract the content of a buffer @@ -10689,19 +10651,6 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_DEBUG_ENABLED) - Count the children of @node. - - - - - defined(LIBXML_DEBUG_ENABLED) - Dump to @output the type and name of @node. - - - - DEPRECATED: don't use @@ -13932,139 +13881,6 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - Implements the XML shell This allow to load, validate, view, modify and save a document using a environment similar to a UNIX commandline. - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - Implements the XML shell function "base" dumps the current XML base of the node - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) - Implements the XML shell function "cat" dumps the serialization node content (XML or HTML). - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - This is a generic signature for the XML shell functions. - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - Implements the XML shell function "dir" dumps information about the node (namespace, attributes, content). - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - Implements the XML shell function "du" show the structure of the subtree under node @tree If @tree is null, the command works on the current node. - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - Implements the XML shell function "ls" Does an Unix like listing of the given node (like a directory) - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - Implements the XML shell function "load" loads a new document specified by the filename - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) - Print node to the output FILE - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - Print the xpath error to libxml default error channel - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - Prints result to the output FILE - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - Implements the XML shell function "pwd" Show the full path from the root to the node, if needed building thumblers when similar elements exists at a given ancestor level. The output is compatible with XPath commands. - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - This is a generic signature for the XML shell input function. - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) - Implements the XML shell function "save" Write the current document to the filename, or it's original name - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_VALID_ENABLED) - Implements the XML shell function "validate" Validate the document, if a DTD path is provided, then the validation is done against the given DTD. - - - - - - - - defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) - Implements the XML shell function "write" Write the current node to the filename, it saves the serialization of the subtree under the @node specified - - - - - - DEPRECATED: Internal function, do not use. Skip whitespace in the input stream. diff --git a/include/libxml/debugXML.h b/include/libxml/debugXML.h index 1332dd73..55148d9d 100644 --- a/include/libxml/debugXML.h +++ b/include/libxml/debugXML.h @@ -71,144 +71,6 @@ XMLPUBFUN int xmlDebugCheckDocument (FILE * output, xmlDocPtr doc); -/**************************************************************** - * * - * XML shell helpers * - * * - ****************************************************************/ - -XMLPUBFUN void - xmlLsOneNode (FILE *output, xmlNodePtr node); -XMLPUBFUN int - xmlLsCountNode (xmlNodePtr node); - -XMLPUBFUN const char * - xmlBoolToText (int boolval); - -/**************************************************************** - * * - * The XML shell related structures and functions * - * * - ****************************************************************/ - -#ifdef LIBXML_XPATH_ENABLED -/** - * xmlShellReadlineFunc: - * @prompt: a string prompt - * - * This is a generic signature for the XML shell input function. - * - * Returns a string which will be freed by the Shell. - */ -typedef char * (* xmlShellReadlineFunc)(char *prompt); - -/** - * xmlShellCtxt: - * - * A debugging shell context. - * TODO: add the defined function tables. - */ -typedef struct _xmlShellCtxt xmlShellCtxt; -typedef xmlShellCtxt *xmlShellCtxtPtr; -struct _xmlShellCtxt { - char *filename; - xmlDocPtr doc; - xmlNodePtr node; - xmlXPathContextPtr pctxt; - int loaded; - FILE *output; - xmlShellReadlineFunc input; -}; - -/** - * xmlShellCmd: - * @ctxt: a shell context - * @arg: a string argument - * @node: a first node - * @node2: a second node - * - * This is a generic signature for the XML shell functions. - * - * Returns an int, negative returns indicating errors. - */ -typedef int (* xmlShellCmd) (xmlShellCtxtPtr ctxt, - char *arg, - xmlNodePtr node, - xmlNodePtr node2); - -XMLPUBFUN void - xmlShellPrintXPathError (int errorType, - const char *arg); -XMLPUBFUN void - xmlShellPrintXPathResult(xmlXPathObjectPtr list); -XMLPUBFUN int - xmlShellList (xmlShellCtxtPtr ctxt, - char *arg, - xmlNodePtr node, - xmlNodePtr node2); -XMLPUBFUN int - xmlShellBase (xmlShellCtxtPtr ctxt, - char *arg, - xmlNodePtr node, - xmlNodePtr node2); -XMLPUBFUN int - xmlShellDir (xmlShellCtxtPtr ctxt, - char *arg, - xmlNodePtr node, - xmlNodePtr node2); -XMLPUBFUN int - xmlShellLoad (xmlShellCtxtPtr ctxt, - char *filename, - xmlNodePtr node, - xmlNodePtr node2); -#ifdef LIBXML_OUTPUT_ENABLED -XMLPUBFUN void - xmlShellPrintNode (xmlNodePtr node); -XMLPUBFUN int - xmlShellCat (xmlShellCtxtPtr ctxt, - char *arg, - xmlNodePtr node, - xmlNodePtr node2); -XMLPUBFUN int - xmlShellWrite (xmlShellCtxtPtr ctxt, - char *filename, - xmlNodePtr node, - xmlNodePtr node2); -XMLPUBFUN int - xmlShellSave (xmlShellCtxtPtr ctxt, - char *filename, - xmlNodePtr node, - xmlNodePtr node2); -#endif /* LIBXML_OUTPUT_ENABLED */ -#ifdef LIBXML_VALID_ENABLED -XMLPUBFUN int - xmlShellValidate (xmlShellCtxtPtr ctxt, - char *dtd, - xmlNodePtr node, - xmlNodePtr node2); -#endif /* LIBXML_VALID_ENABLED */ -XMLPUBFUN int - xmlShellDu (xmlShellCtxtPtr ctxt, - char *arg, - xmlNodePtr tree, - xmlNodePtr node2); -XMLPUBFUN int - xmlShellPwd (xmlShellCtxtPtr ctxt, - char *buffer, - xmlNodePtr node, - xmlNodePtr node2); - -/* - * The Shell interface. - */ -XMLPUBFUN void - xmlShell (xmlDocPtr doc, - const char *filename, - xmlShellReadlineFunc input, - FILE *output); - -#endif /* LIBXML_XPATH_ENABLED */ - #ifdef __cplusplus } #endif diff --git a/include/private/Makefile.am b/include/private/Makefile.am index 08f047ea..5e1cdf84 100644 --- a/include/private/Makefile.am +++ b/include/private/Makefile.am @@ -12,6 +12,7 @@ EXTRA_DIST = \ parser.h \ regexp.h \ save.h \ + shell.h \ string.h \ threads.h \ tree.h \ diff --git a/include/private/shell.h b/include/private/shell.h new file mode 100644 index 00000000..53a857e2 --- /dev/null +++ b/include/private/shell.h @@ -0,0 +1,7 @@ +#ifndef XML_SHELL_H_PRIVATE__ +#define XML_SHELL_H_PRIVATE__ + +void +xmllintShell(xmlDocPtr doc, const char *filename, FILE *output); + +#endif /* XML_SHELL_H_PRIVATE__ */ diff --git a/legacy.c b/legacy.c index 69a71bb2..92a69721 100644 --- a/legacy.c +++ b/legacy.c @@ -1354,8 +1354,6 @@ cdataBlock(void *ctx, const xmlChar * value, int len) * nanoftp.h */ -/** DOC_DISABLE */ - #ifdef _WIN32 #include #else @@ -1591,14 +1589,10 @@ xmlIOFTPClose(void *context ATTRIBUTE_UNUSED) { return(-1); } -/** DOC_ENABLE */ - /* * xpointer.h */ -/** DOC_DISABLE */ - XMLPUBFUN void * xmlXPtrNewRange(void *start, int startindex, void *end, int endindex); @@ -1753,7 +1747,164 @@ xmlXPtrRangeToFunction(void *ctxt ATTRIBUTE_UNUSED, int nargs ATTRIBUTE_UNUSED) { } -/** DOC_ENABLE */ +/* + * xmllint shell functions formerly in debugXML.h + */ + +XMLPUBFUN void +xmlLsOneNode(FILE *output, xmlNodePtr node); + +void +xmlLsOneNode(FILE *output ATTRIBUTE_UNUSED, xmlNodePtr node ATTRIBUTE_UNUSED) { +} + +XMLPUBFUN int +xmlLsCountNode(xmlNodePtr node); + +int +xmlLsCountNode(xmlNodePtr node ATTRIBUTE_UNUSED) { + return(0); +} + +XMLPUBFUN const char * +xmlBoolToText(int boolval); + +const char * +xmlBoolToText(int boolval) { + if (boolval) + return("True"); + else + return("False"); +} + +#ifdef LIBXML_XPATH_ENABLED +XMLPUBFUN void +xmlShellPrintXPathError(int errorType, const char *arg); + +void +xmlShellPrintXPathError(int errorType ATTRIBUTE_UNUSED, + const char *arg ATTRIBUTE_UNUSED) { +} + +XMLPUBFUN void +xmlShellPrintXPathResult(void *list); + +void +xmlShellPrintXPathResult(void *list ATTRIBUTE_UNUSED) { +} + +XMLPUBFUN int +xmlShellList(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellList(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} + +XMLPUBFUN int +xmlShellBase(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellBase(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} + +XMLPUBFUN int +xmlShellDir(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellDir(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} + +XMLPUBFUN int +xmlShellLoad(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellLoad(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} + +#ifdef LIBXML_OUTPUT_ENABLED +XMLPUBFUN void +xmlShellPrintNode(void *node); + +void +xmlShellPrintNode(void *ctxt ATTRIBUTE_UNUSED) { +} + +XMLPUBFUN int +xmlShellCat(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellCat(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} + +XMLPUBFUN int +xmlShellWrite(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellWrite(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} + +XMLPUBFUN int +xmlShellSave(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellSave(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} +#endif /* LIBXML_OUTPUT_ENABLED */ + +#ifdef LIBXML_VALID_ENABLED +XMLPUBFUN int +xmlShellValidate(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellValidate(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} +#endif /* LIBXML_VALID_ENABLED */ + +XMLPUBFUN int +xmlShellDu(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellDu(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} + +XMLPUBFUN int +xmlShellPwd(void *ctxt, char *arg, void *node, void *node2); + +int +xmlShellPwd(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, + void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { + return(0); +} + +typedef char * (*xmlShellReadlineFunc)(char *prompt); + +XMLPUBFUN void +xmlShell(void *doc, char *filename, xmlShellReadlineFunc input, void *output); + +void +xmlShell(void *doc ATTRIBUTE_UNUSED, char *filename ATTRIBUTE_UNUSED, + xmlShellReadlineFunc input ATTRIBUTE_UNUSED, + void *output ATTRIBUTE_UNUSED) { +} +#endif /* LIBXML_XPATH_ENABLED */ #endif /* LIBXML_LEGACY_ENABLED */ diff --git a/meson.build b/meson.build index 214e435c..db183a03 100644 --- a/meson.build +++ b/meson.build @@ -665,7 +665,7 @@ meson.override_dependency('libxml-2.0', xml_dep) executable( 'xmllint', - files('xmllint.c'), + files('xmllint.c', 'shell.c'), dependencies: [xml_dep, xmllint_deps], include_directories: config_dir, install: true, diff --git a/shell.c b/shell.c new file mode 100644 index 00000000..77c0630c --- /dev/null +++ b/shell.c @@ -0,0 +1,1629 @@ +/* + * shell.c: The xmllint shell + * + * See Copyright for the status of this software. + * + * Daniel Veillard + */ + +#include "libxml.h" + +#include +#include +#include + +#ifdef HAVE_LIBREADLINE +#include +#ifdef HAVE_LIBHISTORY +#include +#endif +#endif + +#include +#include +#include +#include +#include +#include +#ifdef LIBXML_SCHEMAS_ENABLED +#include +#endif + +#include "private/shell.h" + +/* + * TODO: Improvement/cleanups for the XML shell + * - allow to shell out an editor on a subpart + * - cleanup function registrations (with help) and calling + * - provide registration routines + */ + +typedef struct _xmllintShellCtxt xmllintShellCtxt; +typedef xmllintShellCtxt *xmllintShellCtxtPtr; +struct _xmllintShellCtxt { + char *filename; + xmlDocPtr doc; + xmlNodePtr node; +#ifdef LIBXML_XPATH_ENABLED + xmlXPathContextPtr pctxt; +#endif + int loaded; + FILE *output; +}; + +/** + * xmllintLsCountNode: + * @node: the node to count + * + * Count the children of @node. + * + * Returns the number of children of @node. + */ +static int +xmllintLsCountNode(xmlNodePtr node) { + int ret = 0; + xmlNodePtr list = NULL; + + if (node == NULL) + return(0); + + switch (node->type) { + case XML_ELEMENT_NODE: + list = node->children; + break; + case XML_DOCUMENT_NODE: + case XML_HTML_DOCUMENT_NODE: + list = ((xmlDocPtr) node)->children; + break; + case XML_ATTRIBUTE_NODE: + list = ((xmlAttrPtr) node)->children; + break; + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: + if (node->content != NULL) { + ret = xmlStrlen(node->content); + } + break; + case XML_ENTITY_REF_NODE: + case XML_DOCUMENT_TYPE_NODE: + case XML_ENTITY_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_NOTATION_NODE: + case XML_DTD_NODE: + case XML_ELEMENT_DECL: + case XML_ATTRIBUTE_DECL: + case XML_ENTITY_DECL: + case XML_NAMESPACE_DECL: + case XML_XINCLUDE_START: + case XML_XINCLUDE_END: + ret = 1; + break; + } + for (;list != NULL;ret++) + list = list->next; + return(ret); +} + +/** + * xmllintLsOneNode: + * @output: the FILE * for the output + * @node: the node to dump + * + * Dump to @output the type and name of @node. + */ +static void +xmllintLsOneNode(FILE *output, xmlNodePtr node) { + if (output == NULL) return; + if (node == NULL) { + fprintf(output, "NULL\n"); + return; + } + switch (node->type) { + case XML_ELEMENT_NODE: + fprintf(output, "-"); + break; + case XML_ATTRIBUTE_NODE: + fprintf(output, "a"); + break; + case XML_TEXT_NODE: + fprintf(output, "t"); + break; + case XML_CDATA_SECTION_NODE: + fprintf(output, "C"); + break; + case XML_ENTITY_REF_NODE: + fprintf(output, "e"); + break; + case XML_ENTITY_NODE: + fprintf(output, "E"); + break; + case XML_PI_NODE: + fprintf(output, "p"); + break; + case XML_COMMENT_NODE: + fprintf(output, "c"); + break; + case XML_DOCUMENT_NODE: + fprintf(output, "d"); + break; + case XML_HTML_DOCUMENT_NODE: + fprintf(output, "h"); + break; + case XML_DOCUMENT_TYPE_NODE: + fprintf(output, "T"); + break; + case XML_DOCUMENT_FRAG_NODE: + fprintf(output, "F"); + break; + case XML_NOTATION_NODE: + fprintf(output, "N"); + break; + case XML_NAMESPACE_DECL: + fprintf(output, "n"); + break; + default: + fprintf(output, "?"); + } + if (node->type != XML_NAMESPACE_DECL) { + if (node->properties != NULL) + fprintf(output, "a"); + else + fprintf(output, "-"); + if (node->nsDef != NULL) + fprintf(output, "n"); + else + fprintf(output, "-"); + } + + fprintf(output, " %8d ", xmllintLsCountNode(node)); + + switch (node->type) { + case XML_ELEMENT_NODE: + if (node->name != NULL) { + if ((node->ns != NULL) && (node->ns->prefix != NULL)) + fprintf(output, "%s:", node->ns->prefix); + fprintf(output, "%s", (const char *) node->name); + } + break; + case XML_ATTRIBUTE_NODE: + if (node->name != NULL) + fprintf(output, "%s", (const char *) node->name); + break; + case XML_TEXT_NODE: +#ifdef LIBXML_DEBUG_ENABLED + if (node->content != NULL) { + xmlDebugDumpString(output, node->content); + } +#endif + break; + case XML_CDATA_SECTION_NODE: + break; + case XML_ENTITY_REF_NODE: + if (node->name != NULL) + fprintf(output, "%s", (const char *) node->name); + break; + case XML_ENTITY_NODE: + if (node->name != NULL) + fprintf(output, "%s", (const char *) node->name); + break; + case XML_PI_NODE: + if (node->name != NULL) + fprintf(output, "%s", (const char *) node->name); + break; + case XML_COMMENT_NODE: + break; + case XML_DOCUMENT_NODE: + break; + case XML_HTML_DOCUMENT_NODE: + break; + case XML_DOCUMENT_TYPE_NODE: + break; + case XML_DOCUMENT_FRAG_NODE: + break; + case XML_NOTATION_NODE: + break; + case XML_NAMESPACE_DECL: { + xmlNsPtr ns = (xmlNsPtr) node; + + if (ns->prefix == NULL) + fprintf(output, "default -> %s", (char *)ns->href); + else + fprintf(output, "%s -> %s", (char *)ns->prefix, + (char *)ns->href); + break; + } + default: + if (node->name != NULL) + fprintf(output, "%s", (const char *) node->name); + } + fprintf(output, "\n"); +} + +/** + * xmllintShellList: + * @ctxt: the shell context + * @arg: unused + * @node: a node + * @node2: unused + * + * Implements the XML shell function "ls" + * Does an Unix like listing of the given node (like a directory) + * + * Returns 0 + */ +static int +xmllintShellList(xmllintShellCtxtPtr ctxt, + char *arg ATTRIBUTE_UNUSED, xmlNodePtr node, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlNodePtr cur; + if (!ctxt) + return (0); + if (node == NULL) { + fprintf(ctxt->output, "NULL\n"); + return (0); + } + if ((node->type == XML_DOCUMENT_NODE) || + (node->type == XML_HTML_DOCUMENT_NODE)) { + cur = ((xmlDocPtr) node)->children; + } else if (node->type == XML_NAMESPACE_DECL) { + xmllintLsOneNode(ctxt->output, node); + return (0); + } else if (node->children != NULL) { + cur = node->children; + } else { + xmllintLsOneNode(ctxt->output, node); + return (0); + } + while (cur != NULL) { + xmllintLsOneNode(ctxt->output, cur); + cur = cur->next; + } + return (0); +} + +/** + * xmllintShellBase: + * @ctxt: the shell context + * @arg: unused + * @node: a node + * @node2: unused + * + * Implements the XML shell function "base" + * dumps the current XML base of the node + * + * Returns 0 + */ +static int +xmllintShellBase(xmllintShellCtxtPtr ctxt, + char *arg ATTRIBUTE_UNUSED, xmlNodePtr node, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlChar *base; + if (!ctxt) + return 0; + if (node == NULL) { + fprintf(ctxt->output, "NULL\n"); + return (0); + } + + base = xmlNodeGetBase(node->doc, node); + + if (base == NULL) { + fprintf(ctxt->output, " No base found !!!\n"); + } else { + fprintf(ctxt->output, "%s\n", base); + xmlFree(base); + } + return (0); +} + +/** + * xmllintShellSetBase: + * @ctxt: the shell context + * @arg: the new base + * @node: a node + * @node2: unused + * + * Implements the XML shell function "setbase" + * change the current XML base of the node + * + * Returns 0 + */ +static int +xmllintShellSetBase(xmllintShellCtxtPtr ctxt ATTRIBUTE_UNUSED, + char *arg ATTRIBUTE_UNUSED, xmlNodePtr node, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlNodeSetBase(node, (xmlChar*) arg); + return (0); +} + +#ifdef LIBXML_XPATH_ENABLED +/** + * xmllintShellRegisterNamespace: + * @ctxt: the shell context + * @arg: a string in prefix=nsuri format + * @node: unused + * @node2: unused + * + * Implements the XML shell function "setns" + * register/unregister a prefix=namespace pair + * on the XPath context + * + * Returns 0 on success and a negative value otherwise. + */ +static int +xmllintShellRegisterNamespace(xmllintShellCtxtPtr ctxt, char *arg, + xmlNodePtr node ATTRIBUTE_UNUSED, xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlChar* nsListDup; + xmlChar* prefix; + xmlChar* href; + xmlChar* next; + + nsListDup = xmlStrdup((xmlChar *) arg); + next = nsListDup; + while(next != NULL) { + /* skip spaces */ + /*while((*next) == ' ') next++;*/ + if((*next) == '\0') break; + + /* find prefix */ + prefix = next; + next = (xmlChar*)xmlStrchr(next, '='); + if(next == NULL) { + fprintf(ctxt->output, "setns: prefix=[nsuri] required\n"); + xmlFree(nsListDup); + return(-1); + } + *(next++) = '\0'; + + /* find href */ + href = next; + next = (xmlChar*)xmlStrchr(next, ' '); + if(next != NULL) { + *(next++) = '\0'; + } + + /* do register namespace */ + if(xmlXPathRegisterNs(ctxt->pctxt, prefix, href) != 0) { + fprintf(ctxt->output,"Error: unable to register NS with prefix=\"%s\" and href=\"%s\"\n", prefix, href); + xmlFree(nsListDup); + return(-1); + } + } + + xmlFree(nsListDup); + return(0); +} +/** + * xmllintShellRegisterRootNamespaces: + * @ctxt: the shell context + * @arg: unused + * @node: the root element + * @node2: unused + * + * Implements the XML shell function "setrootns" + * which registers all namespaces declarations found on the root element. + * + * Returns 0 on success and a negative value otherwise. + */ +static int +xmllintShellRegisterRootNamespaces(xmllintShellCtxtPtr ctxt, char *arg ATTRIBUTE_UNUSED, + xmlNodePtr root, xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlNsPtr ns; + + if ((root == NULL) || (root->type != XML_ELEMENT_NODE) || + (root->nsDef == NULL) || (ctxt == NULL) || (ctxt->pctxt == NULL)) + return(-1); + ns = root->nsDef; + while (ns != NULL) { + if (ns->prefix == NULL) + xmlXPathRegisterNs(ctxt->pctxt, BAD_CAST "defaultns", ns->href); + else + xmlXPathRegisterNs(ctxt->pctxt, ns->prefix, ns->href); + ns = ns->next; + } + return(0); +} +#endif + +/** + * xmllintShellGrep: + * @ctxt: the shell context + * @arg: the string or regular expression to find + * @node: a node + * @node2: unused + * + * Implements the XML shell function "grep" + * dumps information about the node (namespace, attributes, content). + * + * Returns 0 + */ +static int +xmllintShellGrep(xmllintShellCtxtPtr ctxt ATTRIBUTE_UNUSED, + char *arg, xmlNodePtr node, xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + if (!ctxt) + return (0); + if (node == NULL) + return (0); + if (arg == NULL) + return (0); +#ifdef LIBXML_REGEXP_ENABLED + if ((xmlStrchr((xmlChar *) arg, '?')) || + (xmlStrchr((xmlChar *) arg, '*')) || + (xmlStrchr((xmlChar *) arg, '.')) || + (xmlStrchr((xmlChar *) arg, '['))) { + } +#endif + while (node != NULL) { + if (node->type == XML_COMMENT_NODE) { + if (xmlStrstr(node->content, (xmlChar *) arg)) { + fprintf(ctxt->output, "%s : ", xmlGetNodePath(node)); + xmllintShellList(ctxt, NULL, node, NULL); + } + } else if (node->type == XML_TEXT_NODE) { + if (xmlStrstr(node->content, (xmlChar *) arg)) { + fprintf(ctxt->output, "%s : ", xmlGetNodePath(node->parent)); + xmllintShellList(ctxt, NULL, node->parent, NULL); + } + } + + /* + * Browse the full subtree, deep first + */ + + if ((node->type == XML_DOCUMENT_NODE) || + (node->type == XML_HTML_DOCUMENT_NODE)) { + node = ((xmlDocPtr) node)->children; + } else if ((node->children != NULL) + && (node->type != XML_ENTITY_REF_NODE)) { + /* deep first */ + node = node->children; + } else if (node->next != NULL) { + /* then siblings */ + node = node->next; + } else { + /* go up to parents->next if needed */ + while (node != NULL) { + if (node->parent != NULL) { + node = node->parent; + } + if (node->next != NULL) { + node = node->next; + break; + } + if (node->parent == NULL) { + node = NULL; + break; + } + } + } + } + return (0); +} + +/** + * xmllintShellDir: + * @ctxt: the shell context + * @arg: unused + * @node: a node + * @node2: unused + * + * Implements the XML shell function "dir" + * dumps information about the node (namespace, attributes, content). + * + * Returns 0 + */ +static int +xmllintShellDir(xmllintShellCtxtPtr ctxt ATTRIBUTE_UNUSED, + char *arg ATTRIBUTE_UNUSED, xmlNodePtr node, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + if (!ctxt) + return (0); + if (node == NULL) { + fprintf(ctxt->output, "NULL\n"); + return (0); + } +#ifdef LIBXML_DEBUG_ENABLED + if ((node->type == XML_DOCUMENT_NODE) || + (node->type == XML_HTML_DOCUMENT_NODE)) { + xmlDebugDumpDocumentHead(ctxt->output, (xmlDocPtr) node); + } else if (node->type == XML_ATTRIBUTE_NODE) { + xmlDebugDumpAttr(ctxt->output, (xmlAttrPtr) node, 0); + } else { + xmlDebugDumpOneNode(ctxt->output, node, 0); + } +#endif + return (0); +} + +/** + * xmllintShellSetContent: + * @ctxt: the shell context + * @value: the content as a string + * @node: a node + * @node2: unused + * + * Implements the XML shell function "dir" + * dumps information about the node (namespace, attributes, content). + * + * Returns 0 + */ +static int +xmllintShellSetContent(xmllintShellCtxtPtr ctxt ATTRIBUTE_UNUSED, + char *value, xmlNodePtr node, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlNodePtr results; + xmlParserErrors ret; + + if (!ctxt) + return (0); + if (node == NULL) { + fprintf(ctxt->output, "NULL\n"); + return (0); + } + if (value == NULL) { + fprintf(ctxt->output, "NULL\n"); + return (0); + } + + ret = xmlParseInNodeContext(node, value, strlen(value), 0, &results); + if (ret == XML_ERR_OK) { + if (node->children != NULL) { + xmlFreeNodeList(node->children); + node->children = NULL; + node->last = NULL; + } + xmlAddChildList(node, results); + } else { + fprintf(ctxt->output, "failed to parse content\n"); + } + return (0); +} + +#if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) +static void +xmllintShellPrintf(void *ctx, const char *msg, ...) { + xmllintShellCtxtPtr sctxt = ctx; + va_list ap; + + va_start(ap, msg); + vfprintf(sctxt->output, msg, ap); + va_end(ap); +} +#endif /* defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) */ + +#ifdef LIBXML_SCHEMAS_ENABLED +/** + * xmllintShellRNGValidate: + * @ctxt: the shell context + * @schemas: the path to the Relax-NG schemas + * @node: a node + * @node2: unused + * + * Implements the XML shell function "relaxng" + * validating the instance against a Relax-NG schemas + * + * Returns 0 + */ +static int +xmllintShellRNGValidate(xmllintShellCtxtPtr sctxt, char *schemas, + xmlNodePtr node ATTRIBUTE_UNUSED, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlRelaxNGPtr relaxngschemas; + xmlRelaxNGParserCtxtPtr ctxt; + xmlRelaxNGValidCtxtPtr vctxt; + int ret; + + ctxt = xmlRelaxNGNewParserCtxt(schemas); + xmlRelaxNGSetParserErrors(ctxt, xmllintShellPrintf, xmllintShellPrintf, sctxt); + relaxngschemas = xmlRelaxNGParse(ctxt); + xmlRelaxNGFreeParserCtxt(ctxt); + if (relaxngschemas == NULL) { + fprintf(sctxt->output, + "Relax-NG schema %s failed to compile\n", schemas); + return(-1); + } + vctxt = xmlRelaxNGNewValidCtxt(relaxngschemas); + xmlRelaxNGSetValidErrors(vctxt, xmllintShellPrintf, xmllintShellPrintf, sctxt); + ret = xmlRelaxNGValidateDoc(vctxt, sctxt->doc); + if (ret == 0) { + fprintf(sctxt->output, "%s validates\n", sctxt->filename); + } else if (ret > 0) { + fprintf(sctxt->output, "%s fails to validate\n", sctxt->filename); + } else { + fprintf(sctxt->output, "%s validation generated an internal error\n", + sctxt->filename); + } + xmlRelaxNGFreeValidCtxt(vctxt); + if (relaxngschemas != NULL) + xmlRelaxNGFree(relaxngschemas); + return(0); +} +#endif + +#ifdef LIBXML_OUTPUT_ENABLED +/** + * xmllintShellCat: + * @ctxt: the shell context + * @arg: unused + * @node: a node + * @node2: unused + * + * Implements the XML shell function "cat" + * dumps the serialization node content (XML or HTML). + * + * Returns 0 + */ +static int +xmllintShellCat(xmllintShellCtxtPtr ctxt, char *arg ATTRIBUTE_UNUSED, + xmlNodePtr node, xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + if (!ctxt) + return (0); + if (node == NULL) { + fprintf(ctxt->output, "NULL\n"); + return (0); + } + if (ctxt->doc->type == XML_HTML_DOCUMENT_NODE) { +#ifdef LIBXML_HTML_ENABLED + if (node->type == XML_HTML_DOCUMENT_NODE) + htmlDocDump(ctxt->output, (htmlDocPtr) node); + else + htmlNodeDumpFile(ctxt->output, ctxt->doc, node); +#else + if (node->type == XML_DOCUMENT_NODE) + xmlDocDump(ctxt->output, (xmlDocPtr) node); + else + xmlElemDump(ctxt->output, ctxt->doc, node); +#endif /* LIBXML_HTML_ENABLED */ + } else { + if (node->type == XML_DOCUMENT_NODE) + xmlDocDump(ctxt->output, (xmlDocPtr) node); + else + xmlElemDump(ctxt->output, ctxt->doc, node); + } + fprintf(ctxt->output, "\n"); + return (0); +} +#endif /* LIBXML_OUTPUT_ENABLED */ + +/** + * xmllintShellLoad: + * @ctxt: the shell context + * @filename: the file name + * @node: unused + * @node2: unused + * + * Implements the XML shell function "load" + * loads a new document specified by the filename + * + * Returns 0 or -1 if loading failed + */ +static int +xmllintShellLoad(xmllintShellCtxtPtr ctxt, char *filename, + xmlNodePtr node ATTRIBUTE_UNUSED, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlDocPtr doc; + int html = 0; + + if ((ctxt == NULL) || (filename == NULL)) return(-1); + if (ctxt->doc != NULL) + html = (ctxt->doc->type == XML_HTML_DOCUMENT_NODE); + + if (html) { +#ifdef LIBXML_HTML_ENABLED + doc = htmlParseFile(filename, NULL); +#else + fprintf(ctxt->output, "HTML support not compiled in\n"); + doc = NULL; +#endif /* LIBXML_HTML_ENABLED */ + } else { + doc = xmlReadFile(filename,NULL,0); + } + if (doc != NULL) { + if (ctxt->loaded == 1) { + xmlFreeDoc(ctxt->doc); + } + ctxt->loaded = 1; +#ifdef LIBXML_XPATH_ENABLED + xmlXPathFreeContext(ctxt->pctxt); +#endif /* LIBXML_XPATH_ENABLED */ + xmlFree(ctxt->filename); + ctxt->doc = doc; + ctxt->node = (xmlNodePtr) doc; +#ifdef LIBXML_XPATH_ENABLED + ctxt->pctxt = xmlXPathNewContext(doc); +#endif /* LIBXML_XPATH_ENABLED */ + ctxt->filename = (char *) xmlCanonicPath((xmlChar *) filename); + } else + return (-1); + return (0); +} + +#ifdef LIBXML_OUTPUT_ENABLED +/** + * xmllintShellWrite: + * @ctxt: the shell context + * @filename: the file name + * @node: a node in the tree + * @node2: unused + * + * Implements the XML shell function "write" + * Write the current node to the filename, it saves the serialization + * of the subtree under the @node specified + * + * Returns 0 or -1 in case of error + */ +static int +xmllintShellWrite(xmllintShellCtxtPtr ctxt, char *filename, xmlNodePtr node, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + if (node == NULL) + return (-1); + if ((filename == NULL) || (filename[0] == 0)) { + return (-1); + } +#ifdef W_OK + if (access((char *) filename, W_OK)) { + fprintf(ctxt->output, + "Cannot write to %s\n", filename); + return (-1); + } +#endif + switch (node->type) { + case XML_DOCUMENT_NODE: + if (xmlSaveFile((char *) filename, ctxt->doc) < -1) { + fprintf(ctxt->output, + "Failed to write to %s\n", filename); + return (-1); + } + break; + case XML_HTML_DOCUMENT_NODE: +#ifdef LIBXML_HTML_ENABLED + if (htmlSaveFile((char *) filename, ctxt->doc) < 0) { + fprintf(ctxt->output, + "Failed to write to %s\n", filename); + return (-1); + } +#else + if (xmlSaveFile((char *) filename, ctxt->doc) < -1) { + fprintf(ctxt->output, + "Failed to write to %s\n", filename); + return (-1); + } +#endif /* LIBXML_HTML_ENABLED */ + break; + default:{ + FILE *f; + + f = fopen((char *) filename, "w"); + if (f == NULL) { + fprintf(ctxt->output, + "Failed to write to %s\n", filename); + return (-1); + } + xmlElemDump(f, ctxt->doc, node); + fclose(f); + } + } + return (0); +} + +/** + * xmllintShellSave: + * @ctxt: the shell context + * @filename: the file name (optional) + * @node: unused + * @node2: unused + * + * Implements the XML shell function "save" + * Write the current document to the filename, or it's original name + * + * Returns 0 or -1 in case of error + */ +static int +xmllintShellSave(xmllintShellCtxtPtr ctxt, char *filename, + xmlNodePtr node ATTRIBUTE_UNUSED, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + if ((ctxt == NULL) || (ctxt->doc == NULL)) + return (-1); + if ((filename == NULL) || (filename[0] == 0)) + filename = ctxt->filename; + if (filename == NULL) + return (-1); +#ifdef W_OK + if (access((char *) filename, W_OK)) { + fprintf(ctxt->output, + "Cannot save to %s\n", filename); + return (-1); + } +#endif + switch (ctxt->doc->type) { + case XML_DOCUMENT_NODE: + if (xmlSaveFile((char *) filename, ctxt->doc) < 0) { + fprintf(ctxt->output, + "Failed to save to %s\n", filename); + } + break; + case XML_HTML_DOCUMENT_NODE: +#ifdef LIBXML_HTML_ENABLED + if (htmlSaveFile((char *) filename, ctxt->doc) < 0) { + fprintf(ctxt->output, + "Failed to save to %s\n", filename); + } +#else + if (xmlSaveFile((char *) filename, ctxt->doc) < 0) { + fprintf(ctxt->output, + "Failed to save to %s\n", filename); + } +#endif /* LIBXML_HTML_ENABLED */ + break; + default: + fprintf(ctxt->output, + "To save to subparts of a document use the 'write' command\n"); + return (-1); + + } + return (0); +} +#endif /* LIBXML_OUTPUT_ENABLED */ + +#ifdef LIBXML_VALID_ENABLED +/** + * xmllintShellValidate: + * @ctxt: the shell context + * @dtd: the DTD URI (optional) + * @node: unused + * @node2: unused + * + * Implements the XML shell function "validate" + * Validate the document, if a DTD path is provided, then the validation + * is done against the given DTD. + * + * Returns 0 or -1 in case of error + */ +static int +xmllintShellValidate(xmllintShellCtxtPtr ctxt, char *dtd, + xmlNodePtr node ATTRIBUTE_UNUSED, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlValidCtxt vctxt; + int res = -1; + + if ((ctxt == NULL) || (ctxt->doc == NULL)) return(-1); + memset(&vctxt, 0, sizeof(vctxt)); + vctxt.error = xmllintShellPrintf; + vctxt.warning = xmllintShellPrintf; + vctxt.userData = ctxt; + + if ((dtd == NULL) || (dtd[0] == 0)) { + res = xmlValidateDocument(&vctxt, ctxt->doc); + } else { + xmlDtdPtr subset; + + subset = xmlParseDTD(NULL, (xmlChar *) dtd); + if (subset != NULL) { + res = xmlValidateDtd(&vctxt, ctxt->doc, subset); + + xmlFreeDtd(subset); + } + } + return (res); +} +#endif /* LIBXML_VALID_ENABLED */ + +/** + * xmllintShellDu: + * @ctxt: the shell context + * @arg: unused + * @tree: a node defining a subtree + * @node2: unused + * + * Implements the XML shell function "du" + * show the structure of the subtree under node @tree + * If @tree is null, the command works on the current node. + * + * Returns 0 or -1 in case of error + */ +static int +xmllintShellDu(xmllintShellCtxtPtr ctxt, + char *arg ATTRIBUTE_UNUSED, xmlNodePtr tree, + xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlNodePtr node; + int indent = 0, i; + + if (!ctxt) + return (-1); + + if (tree == NULL) + return (-1); + node = tree; + while (node != NULL) { + if ((node->type == XML_DOCUMENT_NODE) || + (node->type == XML_HTML_DOCUMENT_NODE)) { + fprintf(ctxt->output, "/\n"); + } else if (node->type == XML_ELEMENT_NODE) { + for (i = 0; i < indent; i++) + fprintf(ctxt->output, " "); + if ((node->ns) && (node->ns->prefix)) + fprintf(ctxt->output, "%s:", node->ns->prefix); + fprintf(ctxt->output, "%s\n", node->name); + } else { + } + + /* + * Browse the full subtree, deep first + */ + + if ((node->type == XML_DOCUMENT_NODE) || + (node->type == XML_HTML_DOCUMENT_NODE)) { + node = ((xmlDocPtr) node)->children; + } else if ((node->children != NULL) + && (node->type != XML_ENTITY_REF_NODE)) { + /* deep first */ + node = node->children; + indent++; + } else if ((node != tree) && (node->next != NULL)) { + /* then siblings */ + node = node->next; + } else if (node != tree) { + /* go up to parents->next if needed */ + while (node != tree) { + if (node->parent != NULL) { + node = node->parent; + indent--; + } + if ((node != tree) && (node->next != NULL)) { + node = node->next; + break; + } + if (node->parent == NULL) { + node = NULL; + break; + } + if (node == tree) { + node = NULL; + break; + } + } + /* exit condition */ + if (node == tree) + node = NULL; + } else + node = NULL; + } + return (0); +} + +/** + * xmllintShellPwd: + * @ctxt: the shell context + * @buffer: the output buffer + * @node: a node + * @node2: unused + * + * Implements the XML shell function "pwd" + * Show the full path from the root to the node, if needed building + * thumblers when similar elements exists at a given ancestor level. + * The output is compatible with XPath commands. + * + * Returns 0 or -1 in case of error + */ +static int +xmllintShellPwd(xmllintShellCtxtPtr ctxt ATTRIBUTE_UNUSED, char *buffer, + xmlNodePtr node, xmlNodePtr node2 ATTRIBUTE_UNUSED) +{ + xmlChar *path; + + if ((node == NULL) || (buffer == NULL)) + return (-1); + + path = xmlGetNodePath(node); + if (path == NULL) + return (-1); + + /* + * This test prevents buffer overflow, because this routine + * is only called by xmllintShell, in which the second argument is + * 500 chars long. + * It is a dirty hack before a cleaner solution is found. + * Documentation should mention that the second argument must + * be at least 500 chars long, and could be stripped if too long. + */ + snprintf(buffer, 499, "%s", path); + buffer[499] = '0'; + xmlFree(path); + + return (0); +} + +/** + * xmllintShellReadline: + * @prompt: the prompt value + * + * Read a string + * + * Returns a pointer to it or NULL on EOF the caller is expected to + * free the returned string. + */ +static char * +xmllintShellReadline(char *prompt) { +#ifdef HAVE_LIBREADLINE + char *line_read; + + /* Get a line from the user. */ + line_read = readline (prompt); + + /* If the line has any text in it, save it on the history. */ + if (line_read && *line_read) + add_history (line_read); + + return (line_read); +#else + char line_read[501]; + char *ret; + int len; + + if (prompt != NULL) + fprintf(stdout, "%s", prompt); + fflush(stdout); + if (!fgets(line_read, 500, stdin)) + return(NULL); + line_read[500] = 0; + len = strlen(line_read); + ret = (char *) malloc(len + 1); + if (ret != NULL) { + memcpy (ret, line_read, len + 1); + } + return(ret); +#endif +} + +/** + * xmllintShell: + * @doc: the initial document + * @filename: the output buffer + * @input: the line reading function + * @output: the output FILE*, defaults to stdout if NULL + * + * Implements the XML shell + * This allow to load, validate, view, modify and save a document + * using a environment similar to a UNIX commandline. + */ +void +xmllintShell(xmlDocPtr doc, const char *filename, FILE * output) +{ + char prompt[500] = "/ > "; + char *cmdline = NULL, *cur; + char command[100]; + char arg[400]; + int i; + xmllintShellCtxtPtr ctxt; +#ifdef LIBXML_XPATH_ENABLED + xmlXPathObjectPtr list; +#endif + + if (doc == NULL) + return; + if (filename == NULL) + return; + if (output == NULL) + output = stdout; + ctxt = (xmllintShellCtxtPtr) xmlMalloc(sizeof(xmllintShellCtxt)); + if (ctxt == NULL) + return; + ctxt->loaded = 0; + ctxt->doc = doc; + ctxt->output = output; + ctxt->filename = (char *) xmlStrdup((xmlChar *) filename); + ctxt->node = (xmlNodePtr) ctxt->doc; + +#ifdef LIBXML_XPATH_ENABLED + ctxt->pctxt = xmlXPathNewContext(ctxt->doc); + if (ctxt->pctxt == NULL) { + xmlFree(ctxt); + return; + } +#endif /* LIBXML_XPATH_ENABLED */ + while (1) { + if (ctxt->node == (xmlNodePtr) ctxt->doc) + snprintf(prompt, sizeof(prompt), "%s > ", "/"); + else if ((ctxt->node != NULL) && (ctxt->node->name) && + (ctxt->node->ns) && (ctxt->node->ns->prefix)) + snprintf(prompt, sizeof(prompt), "%s:%s > ", + (ctxt->node->ns->prefix), ctxt->node->name); + else if ((ctxt->node != NULL) && (ctxt->node->name)) + snprintf(prompt, sizeof(prompt), "%s > ", ctxt->node->name); + else + snprintf(prompt, sizeof(prompt), "? > "); + prompt[sizeof(prompt) - 1] = 0; + + /* + * Get a new command line + */ + cmdline = xmllintShellReadline(prompt); + if (cmdline == NULL) + break; + + /* + * Parse the command itself + */ + cur = cmdline; + while ((*cur == ' ') || (*cur == '\t')) + cur++; + i = 0; + while ((*cur != ' ') && (*cur != '\t') && + (*cur != '\n') && (*cur != '\r')) { + if (*cur == 0) + break; + command[i++] = *cur++; + } + command[i] = 0; + if (i == 0) + continue; + + /* + * Parse the argument + */ + while ((*cur == ' ') || (*cur == '\t')) + cur++; + i = 0; + while ((*cur != '\n') && (*cur != '\r') && (*cur != 0)) { + if (*cur == 0) + break; + arg[i++] = *cur++; + } + arg[i] = 0; + + /* + * start interpreting the command + */ + if (!strcmp(command, "exit")) + break; + if (!strcmp(command, "quit")) + break; + if (!strcmp(command, "bye")) + break; + if (!strcmp(command, "help")) { + fprintf(ctxt->output, "\tbase display XML base of the node\n"); + fprintf(ctxt->output, "\tsetbase URI change the XML base of the node\n"); + fprintf(ctxt->output, "\tbye leave shell\n"); + fprintf(ctxt->output, "\tcat [node] display node or current node\n"); + fprintf(ctxt->output, "\tcd [path] change directory to path or to root\n"); + fprintf(ctxt->output, "\tdir [path] dumps information about the node (namespace, attributes, content)\n"); + fprintf(ctxt->output, "\tdu [path] show the structure of the subtree under path or the current node\n"); + fprintf(ctxt->output, "\texit leave shell\n"); + fprintf(ctxt->output, "\thelp display this help\n"); + fprintf(ctxt->output, "\tfree display memory usage\n"); + fprintf(ctxt->output, "\tload [name] load a new document with name\n"); + fprintf(ctxt->output, "\tls [path] list contents of path or the current directory\n"); + fprintf(ctxt->output, "\tset xml_fragment replace the current node content with the fragment parsed in context\n"); +#ifdef LIBXML_XPATH_ENABLED + fprintf(ctxt->output, "\txpath expr evaluate the XPath expression in that context and print the result\n"); + fprintf(ctxt->output, "\tsetns nsreg register a namespace to a prefix in the XPath evaluation context\n"); + fprintf(ctxt->output, "\t format for nsreg is: prefix=[nsuri] (i.e. prefix= unsets a prefix)\n"); + fprintf(ctxt->output, "\tsetrootns register all namespace found on the root element\n"); + fprintf(ctxt->output, "\t the default namespace if any uses 'defaultns' prefix\n"); +#endif /* LIBXML_XPATH_ENABLED */ + fprintf(ctxt->output, "\tpwd display current working directory\n"); + fprintf(ctxt->output, "\twhereis display absolute path of [path] or current working directory\n"); + fprintf(ctxt->output, "\tquit leave shell\n"); +#ifdef LIBXML_OUTPUT_ENABLED + fprintf(ctxt->output, "\tsave [name] save this document to name or the original name\n"); + fprintf(ctxt->output, "\twrite [name] write the current node to the filename\n"); +#endif /* LIBXML_OUTPUT_ENABLED */ +#ifdef LIBXML_VALID_ENABLED + fprintf(ctxt->output, "\tvalidate check the document for errors\n"); +#endif /* LIBXML_VALID_ENABLED */ +#ifdef LIBXML_SCHEMAS_ENABLED + fprintf(ctxt->output, "\trelaxng rng validate the document against the Relax-NG schemas\n"); +#endif + fprintf(ctxt->output, "\tgrep string search for a string in the subtree\n"); +#ifdef LIBXML_VALID_ENABLED + } else if (!strcmp(command, "validate")) { + xmllintShellValidate(ctxt, arg, NULL, NULL); +#endif /* LIBXML_VALID_ENABLED */ + } else if (!strcmp(command, "load")) { + xmllintShellLoad(ctxt, arg, NULL, NULL); +#ifdef LIBXML_SCHEMAS_ENABLED + } else if (!strcmp(command, "relaxng")) { + xmllintShellRNGValidate(ctxt, arg, NULL, NULL); +#endif +#ifdef LIBXML_OUTPUT_ENABLED + } else if (!strcmp(command, "save")) { + xmllintShellSave(ctxt, arg, NULL, NULL); + } else if (!strcmp(command, "write")) { + if (arg[0] == 0) + fprintf(ctxt->output, + "Write command requires a filename argument\n"); + else + xmllintShellWrite(ctxt, arg, ctxt->node, NULL); +#endif /* LIBXML_OUTPUT_ENABLED */ + } else if (!strcmp(command, "grep")) { + xmllintShellGrep(ctxt, arg, ctxt->node, NULL); + } else if (!strcmp(command, "pwd")) { + char dir[500]; + + if (!xmllintShellPwd(ctxt, dir, ctxt->node, NULL)) + fprintf(ctxt->output, "%s\n", dir); + } else if (!strcmp(command, "du")) { + if (arg[0] == 0) { + xmllintShellDu(ctxt, NULL, ctxt->node, NULL); + } else { +#ifdef LIBXML_XPATH_ENABLED + ctxt->pctxt->node = ctxt->node; + list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); + if (list != NULL) { + switch (list->type) { + case XPATH_UNDEFINED: + fprintf(ctxt->output, + "%s: no such node\n", arg); + break; + case XPATH_NODESET:{ + int indx; + + if (list->nodesetval == NULL) + break; + + for (indx = 0; + indx < list->nodesetval->nodeNr; + indx++) + xmllintShellDu(ctxt, NULL, + list->nodesetval-> + nodeTab[indx], NULL); + break; + } + case XPATH_BOOLEAN: + fprintf(ctxt->output, + "%s is a Boolean\n", arg); + break; + case XPATH_NUMBER: + fprintf(ctxt->output, + "%s is a number\n", arg); + break; + case XPATH_STRING: + fprintf(ctxt->output, + "%s is a string\n", arg); + break; + case XPATH_USERS: + fprintf(ctxt->output, + "%s is user-defined\n", arg); + break; + case XPATH_XSLT_TREE: + fprintf(ctxt->output, + "%s is an XSLT value tree\n", + arg); + break; + } + xmlXPathFreeObject(list); + } else { + fprintf(ctxt->output, + "%s: no such node\n", arg); + } + ctxt->pctxt->node = NULL; +#endif /* LIBXML_XPATH_ENABLED */ + } + } else if (!strcmp(command, "base")) { + xmllintShellBase(ctxt, NULL, ctxt->node, NULL); + } else if (!strcmp(command, "set")) { + xmllintShellSetContent(ctxt, arg, ctxt->node, NULL); +#ifdef LIBXML_XPATH_ENABLED + } else if (!strcmp(command, "setns")) { + if (arg[0] == 0) { + fprintf(ctxt->output, + "setns: prefix=[nsuri] required\n"); + } else { + xmllintShellRegisterNamespace(ctxt, arg, NULL, NULL); + } + } else if (!strcmp(command, "setrootns")) { + xmlNodePtr root; + + root = xmlDocGetRootElement(ctxt->doc); + xmllintShellRegisterRootNamespaces(ctxt, NULL, root, NULL); +#ifdef LIBXML_DEBUG_ENABLED + } else if (!strcmp(command, "xpath")) { + if (arg[0] == 0) { + fprintf(ctxt->output, + "xpath: expression required\n"); + } else { + ctxt->pctxt->node = ctxt->node; + list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); + xmlXPathDebugDumpObject(ctxt->output, list, 0); + xmlXPathFreeObject(list); + } +#endif /* LIBXML_DEBUG_ENABLED */ +#endif /* LIBXML_XPATH_ENABLED */ + } else if (!strcmp(command, "setbase")) { + xmllintShellSetBase(ctxt, arg, ctxt->node, NULL); + } else if ((!strcmp(command, "ls")) || (!strcmp(command, "dir"))) { + int dir = (!strcmp(command, "dir")); + + if (arg[0] == 0) { + if (dir) + xmllintShellDir(ctxt, NULL, ctxt->node, NULL); + else + xmllintShellList(ctxt, NULL, ctxt->node, NULL); + } else { +#ifdef LIBXML_XPATH_ENABLED + ctxt->pctxt->node = ctxt->node; + list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); + if (list != NULL) { + switch (list->type) { + case XPATH_UNDEFINED: + fprintf(ctxt->output, + "%s: no such node\n", arg); + break; + case XPATH_NODESET:{ + int indx; + + if (list->nodesetval == NULL) + break; + + for (indx = 0; + indx < list->nodesetval->nodeNr; + indx++) { + if (dir) + xmllintShellDir(ctxt, NULL, + list->nodesetval-> + nodeTab[indx], NULL); + else + xmllintShellList(ctxt, NULL, + list->nodesetval-> + nodeTab[indx], NULL); + } + break; + } + case XPATH_BOOLEAN: + fprintf(ctxt->output, + "%s is a Boolean\n", arg); + break; + case XPATH_NUMBER: + fprintf(ctxt->output, + "%s is a number\n", arg); + break; + case XPATH_STRING: + fprintf(ctxt->output, + "%s is a string\n", arg); + break; + case XPATH_USERS: + fprintf(ctxt->output, + "%s is user-defined\n", arg); + break; + case XPATH_XSLT_TREE: + fprintf(ctxt->output, + "%s is an XSLT value tree\n", + arg); + break; + } + xmlXPathFreeObject(list); + } else { + fprintf(ctxt->output, + "%s: no such node\n", arg); + } + ctxt->pctxt->node = NULL; +#endif /* LIBXML_XPATH_ENABLED */ + } + } else if (!strcmp(command, "whereis")) { + char dir[500]; + + if (arg[0] == 0) { + if (!xmllintShellPwd(ctxt, dir, ctxt->node, NULL)) + fprintf(ctxt->output, "%s\n", dir); + } else { +#ifdef LIBXML_XPATH_ENABLED + ctxt->pctxt->node = ctxt->node; + list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); + if (list != NULL) { + switch (list->type) { + case XPATH_UNDEFINED: + fprintf(ctxt->output, + "%s: no such node\n", arg); + break; + case XPATH_NODESET:{ + int indx; + + if (list->nodesetval == NULL) + break; + + for (indx = 0; + indx < list->nodesetval->nodeNr; + indx++) { + if (!xmllintShellPwd(ctxt, dir, list->nodesetval-> + nodeTab[indx], NULL)) + fprintf(ctxt->output, "%s\n", dir); + } + break; + } + case XPATH_BOOLEAN: + fprintf(ctxt->output, + "%s is a Boolean\n", arg); + break; + case XPATH_NUMBER: + fprintf(ctxt->output, + "%s is a number\n", arg); + break; + case XPATH_STRING: + fprintf(ctxt->output, + "%s is a string\n", arg); + break; + case XPATH_USERS: + fprintf(ctxt->output, + "%s is user-defined\n", arg); + break; + case XPATH_XSLT_TREE: + fprintf(ctxt->output, + "%s is an XSLT value tree\n", + arg); + break; + } + xmlXPathFreeObject(list); + } else { + fprintf(ctxt->output, + "%s: no such node\n", arg); + } + ctxt->pctxt->node = NULL; +#endif /* LIBXML_XPATH_ENABLED */ + } + } else if (!strcmp(command, "cd")) { + if (arg[0] == 0) { + ctxt->node = (xmlNodePtr) ctxt->doc; + } else { +#ifdef LIBXML_XPATH_ENABLED + int l; + + ctxt->pctxt->node = ctxt->node; + l = strlen(arg); + if ((l >= 2) && (arg[l - 1] == '/')) + arg[l - 1] = 0; + list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); + if (list != NULL) { + switch (list->type) { + case XPATH_UNDEFINED: + fprintf(ctxt->output, + "%s: no such node\n", arg); + break; + case XPATH_NODESET: + if (list->nodesetval != NULL) { + if (list->nodesetval->nodeNr == 1) { + ctxt->node = list->nodesetval->nodeTab[0]; + if ((ctxt->node != NULL) && + (ctxt->node->type == + XML_NAMESPACE_DECL)) { + fprintf(ctxt->output, + "cannot cd to namespace\n"); + ctxt->node = NULL; + } + } else + fprintf(ctxt->output, + "%s is a %d Node Set\n", + arg, + list->nodesetval->nodeNr); + } else + fprintf(ctxt->output, + "%s is an empty Node Set\n", + arg); + break; + case XPATH_BOOLEAN: + fprintf(ctxt->output, + "%s is a Boolean\n", arg); + break; + case XPATH_NUMBER: + fprintf(ctxt->output, + "%s is a number\n", arg); + break; + case XPATH_STRING: + fprintf(ctxt->output, + "%s is a string\n", arg); + break; + case XPATH_USERS: + fprintf(ctxt->output, + "%s is user-defined\n", arg); + break; + case XPATH_XSLT_TREE: + fprintf(ctxt->output, + "%s is an XSLT value tree\n", + arg); + break; + } + xmlXPathFreeObject(list); + } else { + fprintf(ctxt->output, + "%s: no such node\n", arg); + } + ctxt->pctxt->node = NULL; +#endif /* LIBXML_XPATH_ENABLED */ + } +#ifdef LIBXML_OUTPUT_ENABLED + } else if (!strcmp(command, "cat")) { + if (arg[0] == 0) { + xmllintShellCat(ctxt, NULL, ctxt->node, NULL); + } else { +#ifdef LIBXML_XPATH_ENABLED + ctxt->pctxt->node = ctxt->node; + list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); + if (list != NULL) { + switch (list->type) { + case XPATH_UNDEFINED: + fprintf(ctxt->output, + "%s: no such node\n", arg); + break; + case XPATH_NODESET:{ + int indx; + + if (list->nodesetval == NULL) + break; + + for (indx = 0; + indx < list->nodesetval->nodeNr; + indx++) { + if (i > 0) + fprintf(ctxt->output, " -------\n"); + xmllintShellCat(ctxt, NULL, + list->nodesetval-> + nodeTab[indx], NULL); + } + break; + } + case XPATH_BOOLEAN: + fprintf(ctxt->output, + "%s is a Boolean\n", arg); + break; + case XPATH_NUMBER: + fprintf(ctxt->output, + "%s is a number\n", arg); + break; + case XPATH_STRING: + fprintf(ctxt->output, + "%s is a string\n", arg); + break; + case XPATH_USERS: + fprintf(ctxt->output, + "%s is user-defined\n", arg); + break; + case XPATH_XSLT_TREE: + fprintf(ctxt->output, + "%s is an XSLT value tree\n", + arg); + break; + } + xmlXPathFreeObject(list); + } else { + fprintf(ctxt->output, + "%s: no such node\n", arg); + } + ctxt->pctxt->node = NULL; +#endif /* LIBXML_XPATH_ENABLED */ + } +#endif /* LIBXML_OUTPUT_ENABLED */ + } else { + fprintf(ctxt->output, + "Unknown command %s\n", command); + } + free(cmdline); /* not xmlFree here ! */ + cmdline = NULL; + } +#ifdef LIBXML_XPATH_ENABLED + xmlXPathFreeContext(ctxt->pctxt); +#endif /* LIBXML_XPATH_ENABLED */ + if (ctxt->loaded) { + xmlFreeDoc(ctxt->doc); + } + if (ctxt->filename != NULL) + xmlFree(ctxt->filename); + xmlFree(ctxt); + if (cmdline != NULL) + free(cmdline); /* not xmlFree here ! */ +} diff --git a/testapi.c b/testapi.c index 02f34c12..fd0e82ce 100644 --- a/testapi.c +++ b/testapi.c @@ -929,17 +929,6 @@ static void des_xmlNodeSetPtr(int no ATTRIBUTE_UNUSED, xmlNodeSetPtr val ATTRIBU } #endif -#ifdef LIBXML_DEBUG_ENABLED -#ifdef LIBXML_XPATH_ENABLED -#define gen_nb_xmlShellCtxtPtr 1 -static xmlShellCtxtPtr gen_xmlShellCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { - return(NULL); -} -static void des_xmlShellCtxtPtr(int no ATTRIBUTE_UNUSED, xmlShellCtxtPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { -} -#endif -#endif - #ifdef LIBXML_PATTERN_ENABLED #define gen_nb_xmlPatternPtr 1 static xmlPatternPtr gen_xmlPatternPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { @@ -7004,40 +6993,6 @@ test_chvalid(void) { return(test_ret); } -static int -test_xmlBoolToText(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) - int mem_base; - const char * ret_val; - int boolval; /* a bool to turn into text */ - int n_boolval; - - for (n_boolval = 0;n_boolval < gen_nb_int;n_boolval++) { - mem_base = xmlMemBlocks(); - boolval = gen_int(n_boolval, 0); - - ret_val = xmlBoolToText(boolval); - desret_const_char_ptr(ret_val); - call_tests++; - des_int(n_boolval, boolval, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlBoolToText", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_boolval); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - static int test_xmlDebugCheckDocument(void) { int test_ret = 0; @@ -7503,681 +7458,11 @@ test_xmlDebugDumpString(void) { return(test_ret); } - -static int -test_xmlLsCountNode(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) - int mem_base; - int ret_val; - xmlNodePtr node; /* the node to count */ - int n_node; - - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - mem_base = xmlMemBlocks(); - node = gen_xmlNodePtr(n_node, 0); - - ret_val = xmlLsCountNode(node); - desret_int(ret_val); - call_tests++; - des_xmlNodePtr(n_node, node, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlLsCountNode", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_node); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlLsOneNode(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) - int mem_base; - FILE * output; /* the FILE * for the output */ - int n_output; - xmlNodePtr node; /* the node to dump */ - int n_node; - - for (n_output = 0;n_output < gen_nb_debug_FILE_ptr;n_output++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - mem_base = xmlMemBlocks(); - output = gen_debug_FILE_ptr(n_output, 0); - node = gen_xmlNodePtr(n_node, 1); - - xmlLsOneNode(output, node); - call_tests++; - des_debug_FILE_ptr(n_output, output, 0); - des_xmlNodePtr(n_node, node, 1); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlLsOneNode", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_output); - printf(" %d", n_node); - printf("\n"); - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShell(void) { - int test_ret = 0; - - - /* missing type support */ - return(test_ret); -} - - -#define gen_nb_char_ptr 1 -#define gen_char_ptr(no, nr) NULL -#define des_char_ptr(no, val, nr) - -static int -test_xmlShellBase(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * arg; /* unused */ - int n_arg; - xmlNodePtr node; /* a node */ - int n_node; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_arg = 0;n_arg < gen_nb_char_ptr;n_arg++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - arg = gen_char_ptr(n_arg, 1); - node = gen_xmlNodePtr(n_node, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellBase(ctxt, arg, node, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_arg, arg, 1); - des_xmlNodePtr(n_node, node, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellBase", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_arg); - printf(" %d", n_node); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellCat(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * arg; /* unused */ - int n_arg; - xmlNodePtr node; /* a node */ - int n_node; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_arg = 0;n_arg < gen_nb_char_ptr;n_arg++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - arg = gen_char_ptr(n_arg, 1); - node = gen_xmlNodePtr(n_node, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellCat(ctxt, arg, node, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_arg, arg, 1); - des_xmlNodePtr(n_node, node, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellCat", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_arg); - printf(" %d", n_node); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellDir(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * arg; /* unused */ - int n_arg; - xmlNodePtr node; /* a node */ - int n_node; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_arg = 0;n_arg < gen_nb_char_ptr;n_arg++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - arg = gen_char_ptr(n_arg, 1); - node = gen_xmlNodePtr(n_node, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellDir(ctxt, arg, node, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_arg, arg, 1); - des_xmlNodePtr(n_node, node, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellDir", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_arg); - printf(" %d", n_node); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellDu(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * arg; /* unused */ - int n_arg; - xmlNodePtr tree; /* a node defining a subtree */ - int n_tree; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_arg = 0;n_arg < gen_nb_char_ptr;n_arg++) { - for (n_tree = 0;n_tree < gen_nb_xmlNodePtr;n_tree++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - arg = gen_char_ptr(n_arg, 1); - tree = gen_xmlNodePtr(n_tree, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellDu(ctxt, arg, tree, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_arg, arg, 1); - des_xmlNodePtr(n_tree, tree, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellDu", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_arg); - printf(" %d", n_tree); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellList(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * arg; /* unused */ - int n_arg; - xmlNodePtr node; /* a node */ - int n_node; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_arg = 0;n_arg < gen_nb_char_ptr;n_arg++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - arg = gen_char_ptr(n_arg, 1); - node = gen_xmlNodePtr(n_node, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellList(ctxt, arg, node, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_arg, arg, 1); - des_xmlNodePtr(n_node, node, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellList", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_arg); - printf(" %d", n_node); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellLoad(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * filename; /* the file name */ - int n_filename; - xmlNodePtr node; /* unused */ - int n_node; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_filename = 0;n_filename < gen_nb_char_ptr;n_filename++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - filename = gen_char_ptr(n_filename, 1); - node = gen_xmlNodePtr(n_node, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellLoad(ctxt, filename, node, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_filename, filename, 1); - des_xmlNodePtr(n_node, node, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellLoad", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_filename); - printf(" %d", n_node); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellPrintXPathResult(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - int mem_base; - xmlXPathObjectPtr list; /* a valid result generated by an xpath evaluation */ - int n_list; - - for (n_list = 0;n_list < gen_nb_xmlXPathObjectPtr;n_list++) { - mem_base = xmlMemBlocks(); - list = gen_xmlXPathObjectPtr(n_list, 0); - - xmlShellPrintXPathResult(list); - call_tests++; - des_xmlXPathObjectPtr(n_list, list, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellPrintXPathResult", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_list); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellPwd(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * buffer; /* the output buffer */ - int n_buffer; - xmlNodePtr node; /* a node */ - int n_node; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_buffer = 0;n_buffer < gen_nb_char_ptr;n_buffer++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - buffer = gen_char_ptr(n_buffer, 1); - node = gen_xmlNodePtr(n_node, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellPwd(ctxt, buffer, node, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_buffer, buffer, 1); - des_xmlNodePtr(n_node, node, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellPwd", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_buffer); - printf(" %d", n_node); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellSave(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * filename; /* the file name (optional) */ - int n_filename; - xmlNodePtr node; /* unused */ - int n_node; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_filename = 0;n_filename < gen_nb_char_ptr;n_filename++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - filename = gen_char_ptr(n_filename, 1); - node = gen_xmlNodePtr(n_node, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellSave(ctxt, filename, node, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_filename, filename, 1); - des_xmlNodePtr(n_node, node, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellSave", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_filename); - printf(" %d", n_node); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellValidate(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_VALID_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * dtd; /* the DTD URI (optional) */ - int n_dtd; - xmlNodePtr node; /* unused */ - int n_node; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_dtd = 0;n_dtd < gen_nb_char_ptr;n_dtd++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - dtd = gen_char_ptr(n_dtd, 1); - node = gen_xmlNodePtr(n_node, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellValidate(ctxt, dtd, node, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_dtd, dtd, 1); - des_xmlNodePtr(n_node, node, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellValidate", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_dtd); - printf(" %d", n_node); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlShellWrite(void) { - int test_ret = 0; - -#if defined(LIBXML_DEBUG_ENABLED) && defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) - int mem_base; - int ret_val; - xmlShellCtxtPtr ctxt; /* the shell context */ - int n_ctxt; - char * filename; /* the file name */ - int n_filename; - xmlNodePtr node; /* a node in the tree */ - int n_node; - xmlNodePtr node2; /* unused */ - int n_node2; - - for (n_ctxt = 0;n_ctxt < gen_nb_xmlShellCtxtPtr;n_ctxt++) { - for (n_filename = 0;n_filename < gen_nb_char_ptr;n_filename++) { - for (n_node = 0;n_node < gen_nb_xmlNodePtr;n_node++) { - for (n_node2 = 0;n_node2 < gen_nb_xmlNodePtr;n_node2++) { - mem_base = xmlMemBlocks(); - ctxt = gen_xmlShellCtxtPtr(n_ctxt, 0); - filename = gen_char_ptr(n_filename, 1); - node = gen_xmlNodePtr(n_node, 2); - node2 = gen_xmlNodePtr(n_node2, 3); - - ret_val = xmlShellWrite(ctxt, filename, node, node2); - desret_int(ret_val); - call_tests++; - des_xmlShellCtxtPtr(n_ctxt, ctxt, 0); - des_char_ptr(n_filename, filename, 1); - des_xmlNodePtr(n_node, node, 2); - des_xmlNodePtr(n_node2, node2, 3); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlShellWrite", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctxt); - printf(" %d", n_filename); - printf(" %d", n_node); - printf(" %d", n_node2); - printf("\n"); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - static int test_debugXML(void) { int test_ret = 0; - if (quiet == 0) printf("Testing debugXML : 25 of 28 functions ...\n"); - test_ret += test_xmlBoolToText(); + if (quiet == 0) printf("Testing debugXML : 11 of 11 functions ...\n"); test_ret += test_xmlDebugCheckDocument(); test_ret += test_xmlDebugDumpAttr(); test_ret += test_xmlDebugDumpAttrList(); @@ -8189,20 +7474,6 @@ test_debugXML(void) { test_ret += test_xmlDebugDumpNodeList(); test_ret += test_xmlDebugDumpOneNode(); test_ret += test_xmlDebugDumpString(); - test_ret += test_xmlLsCountNode(); - test_ret += test_xmlLsOneNode(); - test_ret += test_xmlShell(); - test_ret += test_xmlShellBase(); - test_ret += test_xmlShellCat(); - test_ret += test_xmlShellDir(); - test_ret += test_xmlShellDu(); - test_ret += test_xmlShellList(); - test_ret += test_xmlShellLoad(); - test_ret += test_xmlShellPrintXPathResult(); - test_ret += test_xmlShellPwd(); - test_ret += test_xmlShellSave(); - test_ret += test_xmlShellValidate(); - test_ret += test_xmlShellWrite(); if (test_ret != 0) printf("Module debugXML: %d errors\n", test_ret); @@ -25035,6 +24306,10 @@ test_xmlCreateURI(void) { } +#define gen_nb_char_ptr 1 +#define gen_char_ptr(no, nr) NULL +#define des_char_ptr(no, val, nr) + static int test_xmlNormalizeURIPath(void) { int test_ret = 0; diff --git a/xmllint.c b/xmllint.c index 1b90b38e..8f70ffaf 100644 --- a/xmllint.c +++ b/xmllint.c @@ -41,12 +41,6 @@ #define MAP_FAILED ((void *) -1) #endif #endif -#ifdef HAVE_LIBREADLINE -#include -#ifdef HAVE_LIBHISTORY -#include -#endif -#endif #include #include @@ -81,6 +75,8 @@ #include #endif +#include "private/shell.h" + #ifdef XMLLINT_FUZZ #define ERR_STREAM stdout #else @@ -110,8 +106,8 @@ typedef enum { XMLLINT_ERR_XPATH_EMPTY = 11 /* XPath result is empty */ } xmllintReturnCode; -#ifdef LIBXML_DEBUG_ENABLED static int shell = 0; +#ifdef LIBXML_DEBUG_ENABLED static int debugent = 0; #endif static int debug = 0; @@ -599,57 +595,6 @@ xmlHTMLValidityWarning(void *ctx, const char *msg, ...) va_end(args); } -/************************************************************************ - * * - * Shell Interface * - * * - ************************************************************************/ -#ifdef LIBXML_DEBUG_ENABLED -#ifdef LIBXML_XPATH_ENABLED -/** - * xmlShellReadline: - * @prompt: the prompt value - * - * Read a string - * - * Returns a pointer to it or NULL on EOF the caller is expected to - * free the returned string. - */ -static char * -xmlShellReadline(char *prompt) { -#ifdef HAVE_LIBREADLINE - char *line_read; - - /* Get a line from the user. */ - line_read = readline (prompt); - - /* If the line has any text in it, save it on the history. */ - if (line_read && *line_read) - add_history (line_read); - - return (line_read); -#else - char line_read[501]; - char *ret; - int len; - - if (prompt != NULL) - fprintf(stdout, "%s", prompt); - fflush(stdout); - if (!fgets(line_read, 500, stdin)) - return(NULL); - line_read[500] = 0; - len = strlen(line_read); - ret = (char *) malloc(len + 1); - if (ret != NULL) { - memcpy (ret, line_read, len + 1); - } - return(ret); -#endif -} -#endif /* LIBXML_XPATH_ENABLED */ -#endif /* LIBXML_DEBUG_ENABLED */ - /************************************************************************ * * * I/O Interfaces * @@ -2292,16 +2237,16 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) { } #endif -#ifdef LIBXML_DEBUG_ENABLED -#ifdef LIBXML_XPATH_ENABLED +#ifndef XMLLINT_FUZZ /* * shell interaction */ if (shell) { +#ifdef LIBXML_XPATH_ENABLED xmlXPathOrderDocElems(doc); - xmlShell(doc, filename, xmlShellReadline, stdout); - } #endif + xmllintShell(doc, filename, stdout); + } #endif /* @@ -2814,9 +2759,9 @@ static void usage(FILE *f, const char *name) { fprintf(f, "\tParse the XML files\n"); #endif /* LIBXML_OUTPUT_ENABLED */ fprintf(f, "\t--version : display the version of the XML library used\n"); + fprintf(f, "\t--shell : run a navigating shell\n"); #ifdef LIBXML_DEBUG_ENABLED fprintf(f, "\t--debug : dump a debug tree of the in-memory document\n"); - fprintf(f, "\t--shell : run a navigating shell\n"); fprintf(f, "\t--debugent : debug the entities defined in the document\n"); #else #ifdef LIBXML_READER_ENABLED @@ -3112,13 +3057,11 @@ xmllintMain(int argc, const char **argv, xmlResourceLoader loader) { if ((!strcmp(argv[i], "-debug")) || (!strcmp(argv[i], "--debug"))) debug++; else -#ifdef LIBXML_DEBUG_ENABLED if ((!strcmp(argv[i], "-shell")) || (!strcmp(argv[i], "--shell"))) { shell++; noout = 1; } else -#endif if ((!strcmp(argv[i], "-copy")) || (!strcmp(argv[i], "--copy"))) copy++; else