Upgrade to libxml 2.9.2 and libxslt 1.1.28

third_party/libxml/src/debugXML.c

 /*
  * debugXML.c : This is a set of routines used for debugging the tree
  *              produced by the XML parser.
  *
  * See Copyright for the status of this software.
  *
  * Daniel Veillard <daniel@veillard.com>
  */
 
 #define IN_LIBXML
@@ skipping 67 matching lines @@
  /* remove the ATTRIBUTE_UNUSED when this is added */
 }
 
 /**
  * xmlNsCheckScope:
  * @node: the node
  * @ns: the namespace node
  *
  * Check that a given namespace is in scope on a node.
  *
- * Returns 1 if in scope, -1 in case of argument error, 
+ * Returns 1 if in scope, -1 in case of argument error,
  *         -2 if the namespace is not in scope, and -3 if not on
  *         an ancestor node.
  */
 static int
 xmlNsCheckScope(xmlNodePtr node, xmlNsPtr ns)
 {
     xmlNsPtr cur;
 
     if ((node == NULL) || (ns == NULL))
         return(-1);
@@ skipping 148 matching lines @@
  * conformance to the Name production.
  */
 static void
 xmlCtxtCheckName(xmlDebugCtxtPtr ctxt, const xmlChar * name)
 {
     if (ctxt->check) {
         if (name == NULL) {
             xmlDebugErr(ctxt, XML_CHECK_NO_NAME, "Name is NULL");
             return;
         }
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
         if (xmlValidateName(name, 0)) {
             xmlDebugErr3(ctxt, XML_CHECK_NOT_NCNAME,
                          "Name is not an NCName '%s'", (const char *) name);
         }
+#endif
         if ((ctxt->dict != NULL) &&
             (!xmlDictOwns(ctxt->dict, name)) &&
             ((ctxt->doc == NULL) ||
              ((ctxt->doc->parseFlags & (XML_PARSE_SAX1 | XML_PARSE_NODICT)) == 0))) {
             xmlDebugErr3(ctxt, XML_CHECK_OUTSIDE_DICT,
                          "Name is not from the document dictionnary '%s'",
                          (const char *) name);
         }
     }
 }
@@ skipping 33 matching lines @@
     if ((node->parent != NULL) && (node->doc != node->parent->doc) &&
         (!xmlStrEqual(node->name, BAD_CAST "pseudoroot")))
         xmlDebugErr(ctxt, XML_CHECK_WRONG_DOC,
                     "Node doc differs from parent's one\n");
     if (node->prev == NULL) {
         if (node->type == XML_ATTRIBUTE_NODE) {
             if ((node->parent != NULL) &&
                 (node != (xmlNodePtr) node->parent->properties))
                 xmlDebugErr(ctxt, XML_CHECK_NO_PREV,
                     "Attr has no prev and not first of attr list\n");
-                
+
         } else if ((node->parent != NULL) && (node->parent->children != node))
             xmlDebugErr(ctxt, XML_CHECK_NO_PREV,
                     "Node has no prev and not first of parent list\n");
     } else {
         if (node->prev->next != node)
             xmlDebugErr(ctxt, XML_CHECK_WRONG_PREV,
                         "Node prev->next : back link wrong\n");
     }
     if (node->next == NULL) {
         if ((node->parent != NULL) && (node->type != XML_ATTRIBUTE_NODE) &&
@@ skipping 735 matching lines @@
 xmlCtxtDumpNode(xmlDebugCtxtPtr ctxt, xmlNodePtr node)
 {
     if (node == NULL) {
         if (!ctxt->check) {
             xmlCtxtDumpSpaces(ctxt);
             fprintf(ctxt->output, "node is NULL\n");
         }
         return;
     }
     xmlCtxtDumpOneNode(ctxt, node);
-    if ((node->type != XML_NAMESPACE_DECL) && 
+    if ((node->type != XML_NAMESPACE_DECL) &&
         (node->children != NULL) && (node->type != XML_ENTITY_REF_NODE)) {
         ctxt->depth++;
         xmlCtxtDumpNodeList(ctxt, node->children);
         ctxt->depth--;
     }
 }
 
 /**
  * xmlCtxtDumpNodeList:
  * @output:  the FILE * for the output
@@ skipping 514 matching lines @@
  * @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:
 #ifdef LIBXML_DOCB_ENABLED
@@ skipping 20 matching lines @@
         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++) 
+    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.
@@ skipping 47 matching lines @@
             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    
+        else
             fprintf(output, "-");
-        if (node->nsDef != NULL) 
+        if (node->nsDef != NULL)
             fprintf(output, "n");
-        else    
+        else
             fprintf(output, "-");
     }
 
     fprintf(output, " %8d ", xmlLsCountNode(node));
 
     switch (node->type) {
         case XML_ELEMENT_NODE:
-            if (node->name != NULL)
+            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;
@@ skipping 37 matching lines @@
             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 
+ * 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                 *
+ *              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
@@ skipping 230 matching lines @@
 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);
@@ skipping 206 matching lines @@
 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);
 }
@@ skipping 114 matching lines @@
  */
 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
@@ skipping 263 matching lines @@
     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)) {
@@ skipping 32 matching lines @@
         } else
             node = NULL;
     }
     return (0);
 }
 
 /**
  * xmlShellPwd:
  * @ctxt:  the shell context
  * @buffer:  the output buffer
- * @node:  a node 
+ * @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
@@ skipping 24 matching lines @@
     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 
+ * 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, char *filename, xmlShellReadlineFunc input,
          FILE * output)
 {
     char prompt[500] = "/ > ";
     char *cmdline = NULL, *cur;
     char command[100];
@@ skipping 23 matching lines @@
 #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);
@@ skipping 54 matching lines @@
                   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 agaisnt 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 == NULL) || (arg[0] == 0))
+            if (arg[0] == 0)
                 xmlGenericError(xmlGenericErrorContext,
                         "Write command requires a filename argument\n");
             else
-                xmlShellWrite(ctxt, arg, NULL, NULL);
+                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, "free")) {
             if (arg[0] == 0) {
                 xmlMemShow(ctxt->output, 0);
             } else {
                 int len = 0;
 
                 sscanf(arg, "%d", &len);
                 xmlMemShow(ctxt->output, len);
             }
         } 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")) {
-            xmlShellDu(ctxt, NULL, ctxt->node, NULL);
+            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:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%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:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a Boolean\n", arg);
+                            break;
+                        case XPATH_NUMBER:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a number\n", arg);
+                            break;
+                        case XPATH_STRING:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a string\n", arg);
+                            break;
+                        case XPATH_POINT:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a point\n", arg);
+                            break;
+                        case XPATH_RANGE:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a range\n", arg);
+                            break;
+                        case XPATH_LOCATIONSET:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a range\n", arg);
+                            break;
+                        case XPATH_USERS:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is user-defined\n", arg);
+                            break;
+                        case XPATH_XSLT_TREE:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is an XSLT value tree\n",
+                                            arg);
+                            break;
+                    }
+#ifdef LIBXML_XPATH_ENABLED
+                    xmlXPathFreeObject(list);
+#endif
+                } else {
+                    xmlGenericError(xmlGenericErrorContext,
+                                    "%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) {
                 xmlGenericError(xmlGenericErrorContext,
                                 "setns: prefix=[nsuri] required\n");
             } else {
@@ skipping 97 matching lines @@
                     }
 #ifdef LIBXML_XPATH_ENABLED
                     xmlXPathFreeObject(list);
 #endif
                 } else {
                     xmlGenericError(xmlGenericErrorContext,
                                     "%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:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%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:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a Boolean\n", arg);
+                            break;
+                        case XPATH_NUMBER:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a number\n", arg);
+                            break;
+                        case XPATH_STRING:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a string\n", arg);
+                            break;
+                        case XPATH_POINT:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a point\n", arg);
+                            break;
+                        case XPATH_RANGE:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a range\n", arg);
+                            break;
+                        case XPATH_LOCATIONSET:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is a range\n", arg);
+                            break;
+                        case XPATH_USERS:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is user-defined\n", arg);
+                            break;
+                        case XPATH_XSLT_TREE:
+                            xmlGenericError(xmlGenericErrorContext,
+                                            "%s is an XSLT value tree\n",
+                                            arg);
+                            break;
+                    }
+#ifdef LIBXML_XPATH_ENABLED
+                    xmlXPathFreeObject(list);
+#endif
+                } else {
+                    xmlGenericError(xmlGenericErrorContext,
+                                    "%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:
                             xmlGenericError(xmlGenericErrorContext,
                                             "%s: no such node\n", arg);
                             break;
@@ skipping 157 matching lines @@
         xmlFree(ctxt->filename);
     xmlFree(ctxt);
     if (cmdline != NULL)
         free(cmdline);          /* not xmlFree here ! */
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 #define bottom_debugXML
 #include "elfgcchack.h"
 #endif /* LIBXML_DEBUG_ENABLED */