X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=parse-xml.c;h=d8726abcceeb23dbc3de7a64ec49da04e389a47e;hb=b867a57a6c282f2ff377c3335ed974bd23aa9d08;hp=70a7a89928617c8a854253f55d39586a6cf8ed16;hpb=d756f0a8abc31ab634f9aff532021e3eb88374ab;p=pspp

diff --git a/parse-xml.c b/parse-xml.c
index 70a7a89928..d8726abcce 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -113,7 +113,11 @@ print_attributes (xmlNode * a_node)
         {
           printf ("%s", node->name);
           for (xmlAttr *attr = node->properties; attr; attr = attr->next)
-            printf (" %s", attr->name);
+            {
+              printf (" %s", attr->name);
+              if (!strcmp ((char *) attr->name, "baseFormat"))
+                printf ("=%s", (char *) xmlGetProp (node, attr->name));
+            }
           putchar ('\n');
         }
 
@@ -163,7 +167,7 @@ static void
 print_xml (xmlDoc *doc, xmlNode *node)
 {
   xmlBuffer *buf = xmlBufferCreate();
-  xmlNodeDump (buf, doc, node, 0, 1);
+  xmlNodeDump (buf, doc, node, 0, 0);
   xmlBufferDump (stdout, buf);
   xmlBufferFree (buf);
   putchar ('\n');
@@ -236,6 +240,21 @@ print_text (xmlNode *node)
     }
 }
 
+static void
+check_version (xmlNode *root, const char *version)
+{
+  const char *s = (char *) xmlGetProp (root, (xmlChar *) "version");
+  if (!s)
+    {
+      fprintf (stderr, "missing version\n");
+      exit (1);
+    }
+  else if (strcmp(version, s))
+    {
+      exit (0);
+    }
+}
+
 static void
 usage (void)
 {
@@ -246,7 +265,7 @@ usage (void)
 int
 main (int argc, char **argv)
 {
-  if (argc != 3)
+  if (argc < 3)
     usage ();
 
   LIBXML_TEST_VERSION;
@@ -268,26 +287,31 @@ main (int argc, char **argv)
   root->next = NULL;
 #endif
 
-  if (!strcmp(argv[2], "parents"))
-    print_parents (root);
-  else if (!strcmp(argv[2], "containment"))
-    print_containment (root);
-  else if (!strcmp(argv[2], "attributes"))
-    print_attributes (root);
-  else if (!strcmp(argv[2], "cdata"))
-    print_cdata (root);
-  else if (!strcmp(argv[2], "text"))
-    print_text (root);
-  else if (!strncmp(argv[2], "element:", 8))
-    print_element (doc, root, argv[2] + 8);
-  else if (!strncmp(argv[2], "attr:", 5))
-    print_attribute (root, argv[2] + 5);
-  else if (!strncmp(argv[2], "id:", 3))
-    print_id (doc, root, argv[2] + 3);
-  else if (!strcmp(argv[2], "labels"))
-    print_labels (root);
-  else
-    usage ();
+  for (int i = 2; i < argc; i++)
+    {
+      if (!strcmp(argv[i], "parents"))
+        print_parents (root);
+      else if (!strcmp(argv[i], "containment"))
+        print_containment (root);
+      else if (!strcmp(argv[i], "attributes"))
+        print_attributes (root);
+      else if (!strcmp(argv[i], "cdata"))
+        print_cdata (root);
+      else if (!strcmp(argv[i], "text"))
+        print_text (root);
+      else if (!strncmp(argv[i], "element:", 8))
+        print_element (doc, root, argv[i] + 8);
+      else if (!strncmp(argv[i], "attr:", 5))
+        print_attribute (root, argv[i] + 5);
+      else if (!strncmp(argv[i], "id:", 3))
+        print_id (doc, root, argv[i] + 3);
+      else if (!strcmp(argv[i], "labels"))
+        print_labels (root);
+      else if (!strncmp(argv[i], "version=", 8))
+        check_version (root, argv[i] + 8);
+      else
+        usage ();
+    }
 
   xmlFreeDoc(doc);
   xmlCleanupParser();