Changeset 3915 for trunk/lilv/src/world.c

Timestamp:

2012-01-04 11:21:12 (17 months ago)

Author:

drobilla

Message:

Implement proper support for LV2_STATE_BUNDLE.
Test saving state to default bundle path.
Fix memory leaks.

File:

• trunk/lilv/src/world.c (modified) (3 diffs)

trunk/lilv/src/world.c

@@ -15 +15 @@
 */
 
-#define _POSIX_SOURCE 1 /* for wordexp */
+#define _POSIX_SOURCE 1  /* for readdir_r */
 
 #include <assert.h>
@@ -25 +25 @@
 
 #include "lilv_internal.h"
-
-#ifdef HAVE_WORDEXP
-#    include <wordexp.h>
-#endif
 
 LILV_API
@@ -583 +579 @@
 }
 
-/** Expand variables (e.g. POSIX ~ or $FOO, Windows %FOO%) in @a path. */
-static char*
-expand(const char* path)
-{
-#ifdef HAVE_WORDEXP
-    char*     ret = NULL;
-    wordexp_t p;
-    if (wordexp(path, &p, 0)) {
-        LILV_ERRORF("Error expanding path `%s'\n", path);
-        return lilv_strdup(path);
-    }
-    if (p.we_wordc == 0) {
-        /* Literal directory path (e.g. no variables or ~) */
-        ret = lilv_strdup(path);
-    } else if (p.we_wordc == 1) {
-        /* Directory path expands (e.g. contains ~ or $FOO) */
-        ret = lilv_strdup(p.we_wordv[0]);
-    } else {
-        /* Multiple expansions in a single directory path? */
-        LILV_ERRORF("Malformed path `%s' ignored\n", path);
-    }
-    wordfree(&p);
-#elif defined(__WIN32__)
-    static const size_t len = 32767;
-    char*               ret = malloc(len);
-    ExpandEnvironmentStrings(path, ret, len);
-#else
-    char* ret = lilv_strdup(path);
-#endif
-    return ret;
-}
-
 /** Load all bundles in the directory at @a dir_path. */
 static void
 lilv_world_load_directory(LilvWorld* world, const char* dir_path)
 {
-    char* path = expand(dir_path);
+    char* path = lilv_expand(dir_path);
     if (!path) {
         LILV_WARNF("Empty path `%s'\n", path);