Quite a few changes here

* added xml_tree_free
* added GLib commandline option stuff to main.c
* some getchar()'s in main for debugging purposes
* commented out attribute stuff in xmlparser.c
* renamed xml_print_tree to xml_tree_print
* renamed check_tag to xml_tag_check
* started changing some stuff regarding escaping
* added lotsa frees when returning from xml_parse because of an error
* added xml_tree_free

	modified:   main.c
	modified:   xmlparser.c
	modified:   xmlparser.h

diff --git a/main.c b/main.c
index 34c88e6..c490fef 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <glib.h>
 #include "xmlparser.h"
 
 int main(int argc, char **argv) {
@@ -7,14 +8,25 @@ int main(int argc, char **argv) {
         printf("I need _one_, exactly _one_ XML file as input!\n");
         exit(EXIT_FAILURE);
     }
+    GOptionContext *goc = g_option_context_new("<XMLFILE>");
+    g_option_context_set_help_enabled(goc, TRUE);
+    g_option_context_set_summary(goc, "This will parse an XML file (XMLFILE) into an in-memory tree.\nRight now, it doesn't do much more than that.");
+    g_option_context_set_description(goc, "Released under the MIT license. Copyright 2008 Stefan 'psYchotic' Zwanenburg\nFor bugs, contact me at [email protected]");
+    g_option_context_parse(goc, &argc, &argv, NULL);
+    g_option_context_free(goc);
 
+    printf("Pause...(right before parsing)\n");
+    getchar();
     XmlTag tag = xml_parse(argv[1]);
     if (tag == NULL) {
         printf("An error occurred during parsing. Exiting now...\n");
         exit(EXIT_FAILURE);
     }
 
-    xml_print_tree(tag);
-    xml_tag_free(tag);
+    printf("Pause...(right after parsing, and right before freeing the tree)\n");
+    getchar();
+    xml_tree_free(tag);
+    printf("Pause...(right after freeing the tree)\n");
+    getchar();
     return 0;
 }

diff --git a/xmlparser.c b/xmlparser.c
index 13088ad..f34f236 100644 (file)
--- a/xmlparser.c
+++ b/xmlparser.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <glib.h>
 #include "xmlparser.h"
 
@@ -19,8 +20,8 @@ XmlTag xml_tag_new(XmlTag parent) {
     tag->children = g_array_new(FALSE, FALSE, sizeof(XmlTag));
     tag->parent = parent;
     tag->value = g_string_new(NULL);
-    tag->attributes = g_malloc(sizeof(GData *));
-    g_datalist_init(tag->attributes);
+    //tag->attributes = g_malloc(sizeof(GData *));
+    //g_datalist_init(tag->attributes);
 
     return tag;
 }
@@ -32,8 +33,22 @@ void xml_tag_free(XmlTag tag) {
     g_string_free(tag->name, TRUE);
     g_array_free(tag->children, TRUE);
     g_string_free(tag->value, TRUE);
-    g_dataset_destroy(tag->attributes);
+    //g_dataset_destroy(tag->attributes);
+    //g_free(tag->attributes);
     g_free(tag);
+    return;
+}
+
+// Frees an entire tree of XmlTags
+// Arguments:
+// * root: the root of the tree you wish to free
+void xml_tree_free(XmlTag root) {
+    int i;
+    for (i = 0; i < root->children->len; i++) {
+        xml_tree_free(g_array_index(root->children, XmlTag, i));
+    }
+    xml_tag_free(root);
+    return;
 }
 
 void xml_print_tree_helper(XmlTag tag) {
@@ -52,16 +67,18 @@ void xml_print_tree_helper(XmlTag tag) {
         xml_print_tree_helper(g_array_index(tag->children, XmlTag, i));
     }
     depth--;
+    return;
 }
 
 // Prints the tag tree
 // Arguments:
 // * tag: This should be the root of the tree, and it won't be printed.
-void xml_print_tree(XmlTag tag) {
+void xml_tree_print(XmlTag tag) {
     int i;
     for (i = 0; i < tag->children->len; i++) {
         xml_print_tree_helper(g_array_index(tag->children, XmlTag, i));
     }
+    return;
 }
 
 // Strips whitespace from a GString
@@ -72,7 +89,7 @@ void xml_print_tree(XmlTag tag) {
 //  or if string was NULL, the amount of whitespace stripped off the
 //  beginning of the last stripped string.
 int g_string_strip(GString *string) {
-    static int i;
+    static int i = 0;
     if (string == NULL) {
         return i;
     }
@@ -100,8 +117,9 @@ int g_string_strip(GString *string) {
 // * message: the error message to print
 // * line: the line at which the error occurred
 // * col: the column at which the error occurred
-void xml_error(const char *message, int line, int col) {
-    printf("ERROR (%d,%d): %s\n", line, col + g_string_strip(NULL) + 1, message);
+void xml_error(const char *message, unsigned int line, int col) {
+    printf("ERROR (%u,%d): %s\n", line, col + g_string_strip(NULL) + 1, message);
+    return;
 }
 
 // Checks a tag for validity
@@ -112,7 +130,7 @@ void xml_error(const char *message, int line, int col) {
 // Returns:
 // TRUE if the tag has a nonzero length name
 // FALSE if the tag has a zero length name
-gboolean check_tag(XmlTag tag, int line, int col) {
+gboolean xml_tag_check(XmlTag tag, int line, int col) {
     if (tag->name->len == 0) {
         XML_STATUS = XML_UNNAMED_TAG;
         xml_error(XML_E_UNNAMED_TAG, line, col);
@@ -123,6 +141,7 @@ gboolean check_tag(XmlTag tag, int line, int col) {
 
 // This will parse the tagname to extract attributes from it
 void xml_tag_parse_attributes(XmlTag tag) {
+    return;
 }
 
 // Parses an XML file
@@ -150,7 +169,7 @@ XmlTag xml_parse(char *path_to_file) {
     gboolean escape = FALSE;
     
     int i;
-    int line = 1;
+    unsigned int line = 1;
     char c;
     while (g_io_channel_read_line_string(input, buffer, NULL, NULL) == G_IO_STATUS_NORMAL) {
         g_string_strip(buffer);
@@ -164,26 +183,40 @@ XmlTag xml_parse(char *path_to_file) {
                         break;
                     }
                 case '<':
-                    if (opentag) {
-                        XML_STATUS = XML_INVALID_CHAR;
-                        xml_error(XML_E_INVALID_CHAR, line, i);
-                        return NULL;
+                    if (!escape) {
+                        if (opentag) {
+                            XML_STATUS = XML_INVALID_CHAR;
+                            xml_error(XML_E_INVALID_CHAR, line, i);
+                            g_string_free(buffer, TRUE);
+                            g_io_channel_shutdown(input, TRUE, NULL);
+                            g_io_channel_unref(input);
+                            xml_tree_free(head);
+                            return NULL;
+                        }
+                        opentag = TRUE;
+                        currenttag = xml_tag_new(currenttag);
+                        g_array_append_val(currenttag->parent->children, currenttag);
+                        break;
                     }
-                    opentag = TRUE;
-                    currenttag = xml_tag_new(currenttag);
-                    g_array_append_val(currenttag->parent->children, currenttag);
-                    break;
                 case '>':
                     if (opentag) opentag = FALSE;
                     else {
                         XML_STATUS = XML_INVALID_CLOSING;
                         xml_error(XML_E_INVALID_CLOSING, line, i);
+                        g_string_free(buffer, TRUE);
+                        g_io_channel_shutdown(input, TRUE, NULL);
+                        g_io_channel_unref(input);
+                        xml_tree_free(head);
                         return NULL;
                     }
                     if (g_str_has_prefix(currenttag->name->str, "/")) {
                         if (g_strcmp0(currenttag->name->str + 1, currenttag->parent->name->str)) {
                             XML_STATUS = XML_INVALID_CLOSING;
                             xml_error(XML_E_INVALID_CLOSING, line, i-currenttag->name->len - 1);
+                            g_string_free(buffer, TRUE);
+                            g_io_channel_shutdown(input, TRUE, NULL);
+                            g_io_channel_unref(input);
+                            xml_tree_free(head);
                             return NULL;
                         }
                         g_array_remove_index(currenttag->parent->children, currenttag->parent->children->len-1);
@@ -192,12 +225,20 @@ XmlTag xml_parse(char *path_to_file) {
                         xml_tag_free(temp);
                     } else if (g_str_has_suffix(currenttag->name->str, " /")) {
                         g_string_truncate(currenttag->name, currenttag->name->len - 2);
-                        if (!check_tag(currenttag, line, i)) {
+                        if (!xml_tag_check(currenttag, line, i)) {
+                            g_string_free(buffer, TRUE);
+                            g_io_channel_shutdown(input, TRUE, NULL);
+                            g_io_channel_unref(input);
+                            xml_tree_free(head);
                             return NULL;
                         }
                         currenttag = currenttag->parent;
                     } else {
-                        if (!check_tag(currenttag, line, i)) {
+                        if (!xml_tag_check(currenttag, line, i)) {
+                            g_string_free(buffer, TRUE);
+                            g_io_channel_shutdown(input, TRUE, NULL);
+                            g_io_channel_unref(input);
+                            xml_tree_free(head);
                             return NULL;
                         }
                     }
@@ -206,6 +247,10 @@ XmlTag xml_parse(char *path_to_file) {
                     if (currenttag == head) {
                         XML_STATUS = XML_VALUE_NO_PARENT;
                         xml_error(XML_E_VALUE_NO_PARENT, line, i);
+                        g_string_free(buffer, TRUE);
+                        g_io_channel_shutdown(input, TRUE, NULL);
+                        g_io_channel_unref(input);
+                        xml_tree_free(head);
                         return NULL;
                     }
                     if (opentag) {
@@ -221,8 +266,15 @@ XmlTag xml_parse(char *path_to_file) {
     if (currenttag != head) {
         XML_STATUS = XML_UNCLOSED_TAGS;
         xml_error(XML_E_UNCLOSED_TAGS, 0, 0);
+        g_string_free(buffer, TRUE);
+        g_io_channel_shutdown(input, TRUE, NULL);
+        g_io_channel_unref(input);
+        xml_tree_free(head);
         return NULL;
     }
 
+    g_string_free(buffer, TRUE);
+    g_io_channel_shutdown(input, TRUE, NULL);
+    g_io_channel_unref(input);
     return head;
 }

diff --git a/xmlparser.h b/xmlparser.h
index f4eda1f..39f5e7f 100644 (file)
--- a/xmlparser.h
+++ b/xmlparser.h
@@ -14,11 +14,13 @@ XmlTag xml_tag_new(XmlTag parent);
 
 void xml_tag_free(XmlTag tag);
 
-void xml_print_tree(XmlTag tag);
+void xml_tree_print(XmlTag tag);
 
 int g_string_strip(GString *string);
 
-void xml_error(const char *message, int line, int col);
+void xml_error(const char *message, unsigned int line, int col);
+
+void xml_tree_free(XmlTag root);
 
 XmlTag xml_parse(char *path_to_file);