version 1.1.1.1, 2012/02/21 23:37:57
|
version 1.1.1.2, 2013/07/22 01:22:22
|
Line 130 static int copy = 0;
|
Line 130 static int copy = 0;
|
#endif /* LIBXML_TREE_ENABLED */ |
#endif /* LIBXML_TREE_ENABLED */ |
static int recovery = 0; |
static int recovery = 0; |
static int noent = 0; |
static int noent = 0; |
|
static int noenc = 0; |
static int noblanks = 0; |
static int noblanks = 0; |
static int noout = 0; |
static int noout = 0; |
static int nowrap = 0; |
static int nowrap = 0; |
Line 519 endTimer(char *format, ...)
|
Line 520 endTimer(char *format, ...)
|
* We cannot do anything because we don't have a timing function |
* We cannot do anything because we don't have a timing function |
*/ |
*/ |
#ifdef HAVE_STDARG_H |
#ifdef HAVE_STDARG_H |
|
va_list ap; |
va_start(ap, format); |
va_start(ap, format); |
vfprintf(stderr, format, ap); |
vfprintf(stderr, format, ap); |
va_end(ap); |
va_end(ap); |
fprintf(stderr, " was not timed\n", msec); | fprintf(stderr, " was not timed\n"); |
#else |
#else |
/* We don't have gettimeofday, time or stdarg.h, what crazy world is |
/* We don't have gettimeofday, time or stdarg.h, what crazy world is |
* this ?! |
* this ?! |
Line 2072 static void doXPathDump(xmlXPathObjectPtr cur) {
|
Line 2074 static void doXPathDump(xmlXPathObjectPtr cur) {
|
#ifdef LIBXML_OUTPUT_ENABLED |
#ifdef LIBXML_OUTPUT_ENABLED |
xmlSaveCtxtPtr ctxt; |
xmlSaveCtxtPtr ctxt; |
|
|
if (cur->nodesetval->nodeNr <= 0) { | if ((cur->nodesetval == NULL) || (cur->nodesetval->nodeNr <= 0)) { |
fprintf(stderr, "XPath set is empty\n"); |
fprintf(stderr, "XPath set is empty\n"); |
progresult = XMLLINT_ERR_XPATH; |
progresult = XMLLINT_ERR_XPATH; |
break; |
break; |
Line 2550 static void parseAndPrintFile(char *filename, xmlParse
|
Line 2552 static void parseAndPrintFile(char *filename, xmlParse
|
|
|
size = xmlC14NDocDumpMemory(doc, NULL, XML_C14N_1_0, NULL, 1, &result); |
size = xmlC14NDocDumpMemory(doc, NULL, XML_C14N_1_0, NULL, 1, &result); |
if (size >= 0) { |
if (size >= 0) { |
write(1, result, size); | if (write(1, result, size) == -1) { |
| fprintf(stderr, "Can't write data\n"); |
| } |
xmlFree(result); |
xmlFree(result); |
} else { |
} else { |
fprintf(stderr, "Failed to canonicalize\n"); |
fprintf(stderr, "Failed to canonicalize\n"); |
Line 2562 static void parseAndPrintFile(char *filename, xmlParse
|
Line 2566 static void parseAndPrintFile(char *filename, xmlParse
|
|
|
size = xmlC14NDocDumpMemory(doc, NULL, XML_C14N_1_1, NULL, 1, &result); |
size = xmlC14NDocDumpMemory(doc, NULL, XML_C14N_1_1, NULL, 1, &result); |
if (size >= 0) { |
if (size >= 0) { |
write(1, result, size); | if (write(1, result, size) == -1) { |
| fprintf(stderr, "Can't write data\n"); |
| } |
xmlFree(result); |
xmlFree(result); |
} else { |
} else { |
fprintf(stderr, "Failed to canonicalize\n"); |
fprintf(stderr, "Failed to canonicalize\n"); |
Line 2575 static void parseAndPrintFile(char *filename, xmlParse
|
Line 2581 static void parseAndPrintFile(char *filename, xmlParse
|
|
|
size = xmlC14NDocDumpMemory(doc, NULL, XML_C14N_EXCLUSIVE_1_0, NULL, 1, &result); |
size = xmlC14NDocDumpMemory(doc, NULL, XML_C14N_EXCLUSIVE_1_0, NULL, 1, &result); |
if (size >= 0) { |
if (size >= 0) { |
write(1, result, size); | if (write(1, result, size) == -1) { |
| fprintf(stderr, "Can't write data\n"); |
| } |
xmlFree(result); |
xmlFree(result); |
} else { |
} else { |
fprintf(stderr, "Failed to canonicalize\n"); |
fprintf(stderr, "Failed to canonicalize\n"); |
Line 2604 static void parseAndPrintFile(char *filename, xmlParse
|
Line 2612 static void parseAndPrintFile(char *filename, xmlParse
|
fprintf(stderr, "Failed to save\n"); |
fprintf(stderr, "Failed to save\n"); |
progresult = XMLLINT_ERR_OUT; |
progresult = XMLLINT_ERR_OUT; |
} else { |
} else { |
write(1, result, len); | if (write(1, result, len) == -1) { |
| fprintf(stderr, "Can't write data\n"); |
| } |
xmlFree(result); |
xmlFree(result); |
} |
} |
|
|
Line 2949 static void showVersion(const char *name) {
|
Line 2959 static void showVersion(const char *name) {
|
if (xmlHasFeature(XML_WITH_DEBUG_MEM)) fprintf(stderr, "MemDebug "); |
if (xmlHasFeature(XML_WITH_DEBUG_MEM)) fprintf(stderr, "MemDebug "); |
if (xmlHasFeature(XML_WITH_DEBUG_RUN)) fprintf(stderr, "RunDebug "); |
if (xmlHasFeature(XML_WITH_DEBUG_RUN)) fprintf(stderr, "RunDebug "); |
if (xmlHasFeature(XML_WITH_ZLIB)) fprintf(stderr, "Zlib "); |
if (xmlHasFeature(XML_WITH_ZLIB)) fprintf(stderr, "Zlib "); |
|
if (xmlHasFeature(XML_WITH_LZMA)) fprintf(stderr, "Lzma "); |
fprintf(stderr, "\n"); |
fprintf(stderr, "\n"); |
} |
} |
|
|
Line 2975 static void usage(const char *name) {
|
Line 2986 static void usage(const char *name) {
|
printf("\t--recover : output what was parsable on broken XML documents\n"); |
printf("\t--recover : output what was parsable on broken XML documents\n"); |
printf("\t--huge : remove any internal arbitrary parser limits\n"); |
printf("\t--huge : remove any internal arbitrary parser limits\n"); |
printf("\t--noent : substitute entity references by their value\n"); |
printf("\t--noent : substitute entity references by their value\n"); |
|
printf("\t--noenc : ignore any encoding specified inside the document\n"); |
printf("\t--noout : don't output the result tree\n"); |
printf("\t--noout : don't output the result tree\n"); |
printf("\t--path 'paths': provide a set of paths for resources\n"); |
printf("\t--path 'paths': provide a set of paths for resources\n"); |
printf("\t--load-trace : print trace of all external entites loaded\n"); |
printf("\t--load-trace : print trace of all external entites loaded\n"); |
Line 3129 main(int argc, char **argv) {
|
Line 3141 main(int argc, char **argv) {
|
(!strcmp(argv[i], "--noent"))) { |
(!strcmp(argv[i], "--noent"))) { |
noent++; |
noent++; |
options |= XML_PARSE_NOENT; |
options |= XML_PARSE_NOENT; |
|
} else if ((!strcmp(argv[i], "-noenc")) || |
|
(!strcmp(argv[i], "--noenc"))) { |
|
noenc++; |
|
options |= XML_PARSE_IGNORE_ENC; |
} else if ((!strcmp(argv[i], "-nsclean")) || |
} else if ((!strcmp(argv[i], "-nsclean")) || |
(!strcmp(argv[i], "--nsclean"))) { |
(!strcmp(argv[i], "--nsclean"))) { |
options |= XML_PARSE_NSCLEAN; |
options |= XML_PARSE_NSCLEAN; |
Line 3349 main(int argc, char **argv) {
|
Line 3365 main(int argc, char **argv) {
|
i++; |
i++; |
#ifdef LIBXML_OUTPUT_ENABLED |
#ifdef LIBXML_OUTPUT_ENABLED |
format = atoi(argv[i]); |
format = atoi(argv[i]); |
#endif /* LIBXML_OUTPUT_ENABLED */ |
|
if (format == 1) { |
if (format == 1) { |
noblanks++; |
noblanks++; |
xmlKeepBlanksDefault(0); |
xmlKeepBlanksDefault(0); |
} |
} |
|
#endif /* LIBXML_OUTPUT_ENABLED */ |
} |
} |
#ifdef LIBXML_READER_ENABLED |
#ifdef LIBXML_READER_ENABLED |
else if ((!strcmp(argv[i], "-stream")) || |
else if ((!strcmp(argv[i], "-stream")) || |