package: Move package search code to the VFS.

[upkg.git] / src / uobject / package.c

diff --git a/src/uobject/package.c b/src/uobject/package.c
index 2da23b3fc63383e781523cc1e8604e10c4890553..397d2638df34c2e59e024ef7e309c9c9891f2a23 100644 (file)
--- a/src/uobject/package.c
+++ b/src/uobject/package.c
@@ -37,13 +37,6 @@ struct upkg_priv {
 
 G_DEFINE_TYPE(UPkg, u_pkg, G_TYPE_TYPE_MODULE);
 
-/* Package search path. */
-static char  *search_path;
-static size_t search_path_sz;
-
-/* List of package file extensions, in descending order of precedence. */
-static const char u_pkg_exts[][5] = { ".u", ".utx", ".umx", ".uax", ".unr" };
-
 static char *str_cpy_lower(char *dst, const char *src)
 {
        size_t i;
@@ -55,25 +48,6 @@ static char *str_cpy_lower(char *dst, const char *src)
        return dst;
 }
 
-static int str_cmp_lower(const char *s1, const char *s2)
-{
-       size_t i;
-
-       for (i = 0; s1[i] && s2[i]; i++) {
-               int c1 = tolower(s1[i]), c2 = tolower(s2[i]);
-               if (c1 < c2)
-                       return -1;
-               if (c1 > c2)
-                       return 1;
-       }
-
-       if (s1[i])
-               return 1;
-       if (s2[i])
-               return -1;
-       return 0;
-}
-
 static void dl_print_errors(const char *prefix)
 {
        const char *err;
@@ -165,55 +139,6 @@ static void u_pkg_class_init(UPkgClass *class)
        objclass->finalize = u_pkg_finalize;
 }
 
-static int expand_search_path(size_t need)
-{
-       size_t want = search_path_sz;
-       if (want == 0) want = 1;
-
-       while (want < need)
-               want *= 2;
-
-       if (want > search_path_sz) {
-               char *new = realloc(search_path, want);
-               if (!new) {
-                       return -1;
-               }
-
-               search_path    = new;
-               search_path_sz = want;
-       }
-
-       return 0;
-}
-
-const char *u_pkg_get_search_path(void)
-{
-       return search_path ? search_path : "";
-}
-
-int u_pkg_set_search_path(const char *path)
-{
-       if (expand_search_path(strlen(path)+1) != 0)
-               return -1;
-       strcpy(search_path, path);
-       return 0;
-}
-
-int u_pkg_add_search_dir(const char *path)
-{
-       size_t end = search_path ? strlen(search_path) : 0;
-
-       if (end == 0) {
-               return u_pkg_set_search_path(path);
-       }
-
-       if (expand_search_path(end + strlen(path) + 2) != 0)
-               return -1;
-       search_path[end] = LT_PATHSEP_CHAR;
-       strcpy(search_path+end+1, path);
-       return 0;
-}
-
 GTypeModule *u_pkg_open(const char *name)
 {
        g_return_val_if_fail(name != NULL, NULL);