Update libxml to 2.7.7.

third_party/libxml/testC14N.c

 /*
  * Canonical XML implementation test program
  * (http://www.w3.org/TR/2001/REC-xml-c14n-20010315)
  *
  * See Copyright for the status of this software.
  * 
  * Author: Aleksey Sanin <aleksey@aleksey.com>
  */
 #include "libxml.h"
 #if defined(LIBXML_C14N_ENABLED) && defined(LIBXML_OUTPUT_ENABLED)
@@ skipping 14 matching lines @@
 
 #include <libxml/c14n.h>
 
 
 static void usage(const char *name) {
     fprintf(stderr,
         "Usage: %s <mode> <xml-file> [<xpath-expr>] [<inclusive-ns-list>]\n",
             name);
     fprintf(stderr, "where <mode> is one of following:\n");
     fprintf(stderr,
-        "--with-comments       \t XML file canonization w comments\n");
+        "--with-comments       \t XML file canonicalization v1.0 w comments \n");
     fprintf(stderr,
-        "--without-comments    \t XML file canonization w/o comments\n");
+        "--without-comments    \t XML file canonicalization v1.0 w/o comments\n");
     fprintf(stderr,
-    "--exc-with-comments   \t Exclusive XML file canonization w comments\n");
+        "--1-1-with-comments       \t XML file canonicalization v1.1 w comments\n");
     fprintf(stderr,
-    "--exc-without-comments\t Exclusive XML file canonization w/o comments\n");
+        "--1-1-without-comments    \t XML file canonicalization v1.1 w/o comments\n");
+    fprintf(stderr,
+    "--exc-with-comments   \t Exclusive XML file canonicalization v1.0 w comments\n");
+    fprintf(stderr,
+    "--exc-without-comments\t Exclusive XML file canonicalization v1.0 w/o comments\n");
 }
 
 static xmlXPathObjectPtr
 load_xpath_expr (xmlDocPtr parent_doc, const char* filename);
 
 static xmlChar **parse_list(xmlChar *str);
 
 /* static void print_xpath_nodes(xmlNodeSetPtr nodes); */
 
 static int 
-test_c14n(const char* xml_filename, int with_comments, int exclusive,
+test_c14n(const char* xml_filename, int with_comments, int mode,
         const char* xpath_filename, xmlChar **inclusive_namespaces) {
     xmlDocPtr doc;
     xmlXPathObjectPtr xpath = NULL; 
     xmlChar *result = NULL;
     int ret;
 
     /*
      * build an XML tree from a the file; we need to add default
      * attributes and resolve all character and entities references
      */
@@ skipping 26 matching lines @@
             return(-1);
         }
     }
 
     /*
      * Canonical form
      */      
     /* fprintf(stderr,"File \"%s\" loaded: start canonization\n", xml_filename); */
     ret = xmlC14NDocDumpMemory(doc, 
             (xpath) ? xpath->nodesetval : NULL, 
-            exclusive, inclusive_namespaces,
+            mode, inclusive_namespaces,
             with_comments, &result);
     if(ret >= 0) {
         if(result != NULL) {
             write(1, result, ret);
             xmlFree(result);          
         }
     } else {
         fprintf(stderr,"Error: failed to canonicalize XML file \"%s\" (ret=%d)\n", xml_filename, ret);
         if(result != NULL) xmlFree(result);
         xmlFreeDoc(doc); 
@@ skipping 18 matching lines @@
     xmlInitParser();
     LIBXML_TEST_VERSION
 
     /*
      * Parse command line and process file
      */
     if( argc < 3 ) {
         fprintf(stderr, "Error: wrong number of arguments.\n");
         usage(argv[0]);
     } else if(strcmp(argv[1], "--with-comments") == 0) {
-        ret = test_c14n(argv[2], 1, 0, (argc > 3) ? argv[3] : NULL, NULL);
+        ret = test_c14n(argv[2], 1, XML_C14N_1_0, (argc > 3) ? argv[3] : NULL, NULL);
     } else if(strcmp(argv[1], "--without-comments") == 0) {
-        ret = test_c14n(argv[2], 0, 0, (argc > 3) ? argv[3] : NULL, NULL);
+        ret = test_c14n(argv[2], 0, XML_C14N_1_0, (argc > 3) ? argv[3] : NULL, NULL);
+    } else if(strcmp(argv[1], "--1-1-with-comments") == 0) {
+        ret = test_c14n(argv[2], 1, XML_C14N_1_1, (argc > 3) ? argv[3] : NULL, NULL);
+    } else if(strcmp(argv[1], "--1-1-without-comments") == 0) {
+        ret = test_c14n(argv[2], 0, XML_C14N_1_1, (argc > 3) ? argv[3] : NULL, NULL);
     } else if(strcmp(argv[1], "--exc-with-comments") == 0) {
         xmlChar **list;
         
         /* load exclusive namespace from command line */
         list = (argc > 4) ? parse_list((xmlChar *)argv[4]) : NULL;
-        ret = test_c14n(argv[2], 1, 1, (argc > 3) ? argv[3] : NULL, list);
+        ret = test_c14n(argv[2], 1, XML_C14N_EXCLUSIVE_1_0, (argc > 3) ? argv[3] : NULL, list);
         if(list != NULL) xmlFree(list);
     } else if(strcmp(argv[1], "--exc-without-comments") == 0) {
         xmlChar **list;
         
         /* load exclusive namespace from command line */
         list = (argc > 4) ? parse_list((xmlChar *)argv[4]) : NULL;
-        ret = test_c14n(argv[2], 0, 1, (argc > 3) ? argv[3] : NULL, list);
+        ret = test_c14n(argv[2], 0, XML_C14N_EXCLUSIVE_1_0, (argc > 3) ? argv[3] : NULL, list);
         if(list != NULL) xmlFree(list);
     } else {
         fprintf(stderr, "Error: bad option.\n");
         usage(argv[0]);
     }
 
     /* 
      * Shutdown libxml
      */
     xmlCleanupParser();
     xmlMemoryDump();
-    
+
     return((ret >= 0) ? 0 : 1);
 }
 
 /*
  * Macro used to grow the current buffer.
  */
 #define growBufferReentrant() {                                         \
     buffer_size *= 2;                                                   \
     buffer = (xmlChar **)                                               \
-                xmlRealloc(buffer, buffer_size * sizeof(xmlChar*));     \
+                xmlRealloc(buffer, buffer_size * sizeof(xmlChar*));     \
     if (buffer == NULL) {                                               \
         perror("realloc failed");                                       \
         return(NULL);                                                   \
     }                                                                   \
 }
 
 static xmlChar **
 parse_list(xmlChar *str) {
     xmlChar **buffer;
     xmlChar **out = NULL;
     int buffer_size = 0;
     int len;
 
     if(str == NULL) {
         return(NULL);
     }
 
     len = xmlStrlen(str);
     if((str[0] == '\'') && (str[len - 1] == '\'')) {
         str[len - 1] = '\0';
         str++;
-        len -= 2;
     }
     /*
      * allocate an translation buffer.
      */
     buffer_size = 1000;
     buffer = (xmlChar **) xmlMalloc(buffer_size * sizeof(xmlChar*));
     if (buffer == NULL) {
         perror("malloc failed");
         return(NULL);
     }
     out = buffer;
-    
+
     while(*str != '\0') {
         if (out - buffer > buffer_size - 10) {
             int indx = out - buffer;
 
             growBufferReentrant();
             out = &buffer[indx];
         }
         (*out++) = str;
         while(*str != ',' && *str != '\0') ++str;
         if(*str == ',') *(str++) = '\0';
@@ skipping 128 matching lines @@
 
 #else
 #include <stdio.h>
 int main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) {
     printf("%s : XPath/Canonicalization and output support not compiled in\n", argv[0]);
     return(0);
 }
 #endif /* LIBXML_C14N_ENABLED */