libupkg: Add signed integer unpacking to fix incorrect signedness issue.

[upkg.git] / src / module.c

diff --git a/src/module.c b/src/module.c
index f97bc65646f946c367ef78b05bd6a96ff0b404c2..bdf0c8bcb676c4506186e800a1183d51c9f5c938 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -1,3 +1,22 @@
+/*
+ *  upkg: tool for manipulating Unreal Tournament packages.
+ *  Copyright (C) 2009 Nick Bowler
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,15 +25,28 @@
 #include <ltdl.h>
 
 #include "module.h"
-
-G_DEFINE_TYPE(UPkgModule, upkg_module, G_TYPE_TYPE_MODULE);
+#include "avl.h"
 
 static unsigned initialized;
+static struct avl_table *package_tree;
+
+static char *str_cpy_lower(char *dst, const char *src)
+{
+       size_t i;
+
+       for (i = 0; src[i]; i++)
+               dst[i] = tolower(src[i]);
+       dst[i] = 0;
+
+       return dst;
+}
+
+G_DEFINE_TYPE(UPkgModule, upkg_module, G_TYPE_TYPE_MODULE);
 
 static void dl_print_errors(const char *prefix)
 {
        const char *err;
-       while (err = lt_dlerror()) {
+       while ((err = lt_dlerror())) {
                if (prefix) fprintf(stderr, "%s: ", prefix);
                puts(err);
        }
@@ -27,7 +59,7 @@ static gboolean module_load(GTypeModule *m)
 
        mod->dl = lt_dlopenext(G_TYPE_MODULE(m)->name);
        if (!mod->dl) {
-               dl_print_errors(__func__);
+               dl_print_errors(G_TYPE_MODULE(m)->name);
                return FALSE;
        }
 
@@ -65,14 +97,12 @@ static void upkg_module_class_init(UPkgModuleClass *class)
 UPkgModule *upkg_module_new(const char *name)
 {
        char *name2;
-       size_t len;
 
        if (!name) {
                return NULL;
        }
 
-       len   = strlen(name);
-       name2 = malloc(len+1);
+       name2 = malloc(strlen(name)+1);
        if (!name2) {
                return NULL;
        }
@@ -83,19 +113,29 @@ UPkgModule *upkg_module_new(const char *name)
                return NULL;
        }
 
-       G_TYPE_MODULE(mod)->name = name2;
-       for (size_t i = 0; i < len; i++) {
-               name2[i] = tolower(name[i]);
-       }
-       name2[len] = 0;
-
+       G_TYPE_MODULE(mod)->name = str_cpy_lower(name2, name);
        return mod;
 }
 
+static int modcmp(const void *a, const void *b, void *_data)
+{
+       const GTypeModule *ma = a;
+       const GTypeModule *mb = b;
+
+       return strcmp(ma->name, mb->name);
+}
+
 int module_init(void)
 {
        if (!initialized) {
+               package_tree = avl_create(modcmp, NULL, NULL);
+               if (!package_tree) {
+                       fprintf(stderr, "%s: failed to create package tree.\n", __func__);
+                       return -1;
+               }
+
                if (lt_dlinit() != 0) {
+                       avl_destroy(package_tree, NULL);
                        dl_print_errors(__func__);
                        return -1;
                }
@@ -116,4 +156,36 @@ int module_exit(void)
                dl_print_errors(__func__);
                return -1;
        }
+
+       return 0;
+}
+
+GType module_get_class(const char *package, const char *class)
+{
+       char buf[strlen(package) + strlen(class) + 1];
+       GTypeModule search = { .name = str_cpy_lower(buf, package) };
+
+       GTypeModule *mod = avl_find(package_tree, &search);
+       if (!mod) {
+               void **p;
+
+               mod = G_TYPE_MODULE(upkg_module_new(package));
+               if (!mod) {
+                       return 0;
+               }
+
+               p = avl_probe(package_tree, mod);
+               if (!p) {
+                       g_object_unref(mod);
+                       return 0;
+               }
+       }
+
+       if (!g_type_module_use(mod))
+               return 0;
+
+       str_cpy_lower(buf+strlen(package), class);
+       buf[0] = toupper(buf[0]);
+       buf[strlen(package)] = toupper(buf[strlen(package)]);
+       return g_type_from_name(buf);
 }