c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding a --format option Daniel

Browse Source 
* xmllint.c: adding a --format option
Daniel
This commit is contained in:
Daniel Veillard 2001-08-14 14:12:47 +00:00
parent fe70332f7f
commit 90493a9171
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Aug 14 16:12:00 CEST 2001 Daniel Veillard <daniel@veillard.com>
* xmllint.c: adding a --format option
Tue Aug 14 14:16:24 CEST 2001 Daniel Veillard <daniel@veillard.com> Tue Aug 14 14:16:24 CEST 2001 Daniel Veillard <daniel@veillard.com>
* xpath.c: count() was broken on Result Value Tree * xpath.c: count() was broken on Result Value Tree

15
xmllint.c
View File

@ -92,6 +92,7 @@ static int push = 0;
static int memory = 0; static int memory = 0;
#endif #endif
static int noblanks = 0; static int noblanks = 0;
static int format = 0;
static int testIO = 0; static int testIO = 0;
static char *encoding = NULL; static char *encoding = NULL;
#ifdef LIBXML_XINCLUDE_ENABLED #ifdef LIBXML_XINCLUDE_ENABLED
@ -630,7 +631,10 @@ static void parseAndPrintFile(char *filename) {
if (encoding != NULL) { if (encoding != NULL) {
xmlDocDumpMemoryEnc(doc, &result, &len, encoding); xmlDocDumpMemoryEnc(doc, &result, &len, encoding);
} else { } else {
xmlDocDumpMemory(doc, &result, &len); if (format)
xmlDocDumpFormatMemory(doc, &result, &len, 1);
else
xmlDocDumpMemory(doc, &result, &len);
} }
if (result == NULL) { if (result == NULL) {
fprintf(stderr, "Failed to save\n"); fprintf(stderr, "Failed to save\n");
@ -644,6 +648,8 @@ static void parseAndPrintFile(char *filename) {
xmlSaveFile("-", doc); xmlSaveFile("-", doc);
else if (encoding != NULL) else if (encoding != NULL)
xmlSaveFileEnc("-", doc, encoding); xmlSaveFileEnc("-", doc, encoding);
else if (format)
xmlSaveFormatFile("-", doc, 1);
else else
xmlDocDump(stdout, doc); xmlDocDump(stdout, doc);
if ((timing) && (!repeat)) { if ((timing) && (!repeat)) {
@ -785,6 +791,7 @@ static void usage(const char *name) {
#endif #endif
printf("\t--nowarning : do not emit warnings from parser/validator\n"); printf("\t--nowarning : do not emit warnings from parser/validator\n");
printf("\t--noblanks : drop (ignorable?) blanks spaces\n"); printf("\t--noblanks : drop (ignorable?) blanks spaces\n");
printf("\t--format : reformat/reindent the input\n");
printf("\t--testIO : test user I/O support\n"); printf("\t--testIO : test user I/O support\n");
printf("\t--encode encoding : output in the given encoding\n"); printf("\t--encode encoding : output in the given encoding\n");
#ifdef LIBXML_CATALOG_ENABLED #ifdef LIBXML_CATALOG_ENABLED
@ -945,6 +952,12 @@ main(int argc, char **argv) {
(!strcmp(argv[i], "--noblanks"))) { (!strcmp(argv[i], "--noblanks"))) {
noblanks++; noblanks++;
xmlKeepBlanksDefault(0); xmlKeepBlanksDefault(0);
}
else if ((!strcmp(argv[i], "-format")) ||
(!strcmp(argv[i], "--format"))) {
noblanks++;
format++;
xmlKeepBlanksDefault(0);
} else { } else {
fprintf(stderr, "Unknown option %s\n", argv[i]); fprintf(stderr, "Unknown option %s\n", argv[i]);
usage(argv[0]); usage(argv[0]);