Upgrade to libxml 2.9.2 and libxslt 1.1.28

third_party/libxml/src/runsuite.c

 /*
- * runsuite.c: C program to run libxml2 againts published testsuites 
+ * runsuite.c: C program to run libxml2 againts published testsuites
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
 
-#ifdef HAVE_CONFIG_H
 #include "libxml.h"
-#else
 #include <stdio.h>
-#endif
 
 #if !defined(_WIN32) || defined(__CYGWIN__)
 #include <unistd.h>
 #endif
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
 #include <libxml/tree.h>
 #include <libxml/uri.h>
 #if defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_XPATH_ENABLED)
 #include <libxml/xmlreader.h>
 
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
 #include <libxml/relaxng.h>
 #include <libxml/xmlschemas.h>
 #include <libxml/xmlschemastypes.h>
 
 #define LOGFILE "runsuite.log"
 static FILE *logfile = NULL;
 static int verbose = 0;
 
 
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-
-#define vsnprintf _vsnprintf
-
-#define snprintf _snprintf
-
-#endif
-
 /************************************************************************
  *                                                                      *
  *              File name and path utilities                            *
  *                                                                      *
  ************************************************************************/
 
 static int checkTestFile(const char *filename) {
     struct stat buf;
 
     if (stat(filename, &buf) == -1)
@@ skipping 67 matching lines @@
     testEntitiesValue[nb_entities] = content;
     nb_entities++;
     return(0);
 }
 
 /*
  * We need to trap calls to the resolver to not account memory for the catalog
  * which is shared to the current running test. We also don't want to have
  * network downloads modifying tests.
  */
-static xmlParserInputPtr 
+static xmlParserInputPtr
 testExternalEntityLoader(const char *URL, const char *ID,
                          xmlParserCtxtPtr ctxt) {
     xmlParserInputPtr ret;
     int i;
 
     for (i = 0;i < nb_entities;i++) {
         if (!strcmp(testEntitiesName[i], URL)) {
             ret = xmlNewStringInputStream(ctxt,
                         (const xmlChar *) testEntitiesValue[i]);
             if (ret != NULL) {
                 ret->filename = (const char *)
                                 xmlStrdup((xmlChar *)testEntitiesName[i]);
             }
             return(ret);
         }
     }
     if (checkTestFile(URL)) {
         ret = xmlNoNetExternalEntityLoader(URL, ID, ctxt);
     } else {
         int memused = xmlMemUsed();
         ret = xmlNoNetExternalEntityLoader(URL, ID, ctxt);
         extraMemoryFromResolver += xmlMemUsed() - memused;
     }
 #if 0
     if (ret == NULL) {
         fprintf(stderr, "Failed to find resource %s\n", URL);
     }
 #endif
-      
+
     return(ret);
 }
 
 /*
  * Trapping the error messages at the generic level to grab the equivalent of
  * stderr messages on CLI tools.
  */
 static char testErrors[32769];
 static int testErrorsSize = 0;
 
@@ skipping 242 matching lines @@
         installResources(test, res);
     }
     test = getNext(tst, "./dir[1]");
     while (test != NULL) {
         installDirs(test, res);
         test = getNext(test, "following-sibling::dir[1]");
     }
     xmlFree(res);
 }
 
-static int 
+static int
 xsdTestCase(xmlNodePtr tst) {
     xmlNodePtr test, tmp, cur;
     xmlBufferPtr buf;
     xmlDocPtr doc = NULL;
     xmlRelaxNGParserCtxtPtr pctxt;
     xmlRelaxNGValidCtxtPtr ctxt;
     xmlRelaxNGPtr rng = NULL;
     int ret = 0, mem, memt;
     xmlChar *dtd;
 
     resetEntities();
     testErrorsSize = 0; testErrors[0] = 0;
 
     tmp = getNext(tst, "./dir[1]");
     if (tmp != NULL) {
         installDirs(tmp, NULL);
     }
     tmp = getNext(tst, "./resource[1]");
     if (tmp != NULL) {
         installResources(tmp, NULL);
     }
 
     cur = getNext(tst, "./correct[1]");
     if (cur == NULL) {
         return(xsdIncorectTestCase(tst));
     }
-    
+
     test = getNext(cur, "./*");
     if (test == NULL) {
         fprintf(stderr, "Failed to find test in correct line %ld\n",
                 xmlGetLineNo(cur));
         return(1);
     }
 
     memt = xmlMemUsed();
     extraMemoryFromResolver = 0;
     /*
@@ skipping 25 matching lines @@
     /*
      * now scan all the siblings of correct to process the <valid> tests
      */
     tmp = getNext(cur, "following-sibling::valid[1]");
     while (tmp != NULL) {
         dtd = xmlGetProp(tmp, BAD_CAST "dtd");
         test = getNext(tmp, "./*");
         if (test == NULL) {
             fprintf(stderr, "Failed to find test in <valid> line %ld\n",
                     xmlGetLineNo(tmp));
-            
+
         } else {
             xmlBufferEmpty(buf);
             if (dtd != NULL)
                 xmlBufferAdd(buf, dtd, -1);
             xmlNodeDump(buf, test->doc, test, 0, 0);
 
             /*
              * We are ready to run the test
              */
             mem = xmlMemUsed();
@@ skipping 38 matching lines @@
     }
     /*
      * now scan all the siblings of correct to process the <invalid> tests
      */
     tmp = getNext(cur, "following-sibling::invalid[1]");
     while (tmp != NULL) {
         test = getNext(tmp, "./*");
         if (test == NULL) {
             fprintf(stderr, "Failed to find test in <invalid> line %ld\n",
                     xmlGetLineNo(tmp));
-            
+
         } else {
             xmlBufferEmpty(buf);
             xmlNodeDump(buf, test->doc, test, 0, 0);
 
             /*
              * We are ready to run the test
              */
             mem = xmlMemUsed();
             extraMemoryFromResolver = 0;
             doc = xmlReadMemory((const char *)buf->content, buf->use,
@@ skipping 40 matching lines @@
         xmlRelaxNGFree(rng);
     xmlResetLastError();
     if ((memt != xmlMemUsed()) && (memt != 0)) {
         test_log("Validation of tests starting line %ld leaked %d\n",
                 xmlGetLineNo(cur), xmlMemUsed() - memt);
         nb_leaks++;
     }
     return(ret);
 }
 
-static int 
+static int
 xsdTestSuite(xmlNodePtr cur) {
     if (verbose) {
         xmlChar *doc = getString(cur, "string(documentation)");
 
         if (doc != NULL) {
             printf("Suite %s\n", doc);
             xmlFree(doc);
         }
     }
     cur = getNext(cur, "./testCase[1]");
     while (cur != NULL) {
         xsdTestCase(cur);
         cur = getNext(cur, "following-sibling::testCase[1]");
     }
-        
+
     return(0);
 }
 
-static int 
+static int
 xsdTest(void) {
     xmlDocPtr doc;
     xmlNodePtr cur;
     const char *filename = "test/xsdtest/xsdtestsuite.xml";
     int ret = 0;
 
     doc = xmlReadFile(filename, NULL, XML_PARSE_NOENT);
     if (doc == NULL) {
         fprintf(stderr, "Failed to parse %s\n", filename);
         return(-1);
@@ skipping 17 matching lines @@
         xsdTestSuite(cur);
         cur = getNext(cur, "following-sibling::testSuite[1]");
     }
 
 done:
     if (doc != NULL)
         xmlFreeDoc(doc);
     return(ret);
 }
 
-static int 
+static int
 rngTestSuite(xmlNodePtr cur) {
     if (verbose) {
         xmlChar *doc = getString(cur, "string(documentation)");
 
         if (doc != NULL) {
             printf("Suite %s\n", doc);
             xmlFree(doc);
         } else {
             doc = getString(cur, "string(section)");
             if (doc != NULL) {
                 printf("Section %s\n", doc);
                 xmlFree(doc);
             }
         }
     }
     cur = getNext(cur, "./testSuite[1]");
     while (cur != NULL) {
         xsdTestSuite(cur);
         cur = getNext(cur, "following-sibling::testSuite[1]");
     }
-        
+
     return(0);
 }
 
-static int 
+static int
 rngTest1(void) {
     xmlDocPtr doc;
     xmlNodePtr cur;
     const char *filename = "test/relaxng/OASIS/spectest.xml";
     int ret = 0;
 
     doc = xmlReadFile(filename, NULL, XML_PARSE_NOENT);
     if (doc == NULL) {
         fprintf(stderr, "Failed to parse %s\n", filename);
         return(-1);
@@ skipping 17 matching lines @@
         rngTestSuite(cur);
         cur = getNext(cur, "following-sibling::testSuite[1]");
     }
 
 done:
     if (doc != NULL)
         xmlFreeDoc(doc);
     return(ret);
 }
 
-static int 
+static int
 rngTest2(void) {
     xmlDocPtr doc;
     xmlNodePtr cur;
     const char *filename = "test/relaxng/testsuite.xml";
     int ret = 0;
 
     doc = xmlReadFile(filename, NULL, XML_PARSE_NOENT);
     if (doc == NULL) {
         fprintf(stderr, "Failed to parse %s\n", filename);
         return(-1);
@@ skipping 189 matching lines @@
         if ((ret == 0) && (strstr(testErrors, "nimplemented") != NULL)) {
             test_log("valid schemas %s hit an unimplemented block\n",
                         path);
             ret = 1;
             nb_unimplemented++;
             nb_errors++;
         }
         instance = getNext(cur, "./ts:instanceTest[1]");
         while (instance != NULL) {
             if (schemas != NULL) {
-                xstcTestInstance(instance, schemas, path, base);                
+                xstcTestInstance(instance, schemas, path, base);
             } else {
                 /*
                 * We'll automatically mark the instances as failed
                 * if the schema was broken.
                 */
                 nb_errors++;
             }
             instance = getNext(instance,
                 "following-sibling::ts:instanceTest[1]");
         }
@@ skipping 211 matching lines @@
     if (logfile != NULL)
         fclose(logfile);
     return(ret);
 }
 #else /* !SCHEMAS */
 int
 main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) {
     fprintf(stderr, "runsuite requires support for schemas and xpath in libxml2\n");
 }
 #endif