gjs r36 - trunk/util

[tko svn gnome org]

Author: tko
Date: Wed Oct 22 17:46:50 2008
New Revision: 36
URL: http://svn.gnome.org/viewvc/gjs?rev=36&view=rev

Log:
Bug 557451 â Add search paths from environment variables

	* util/dirs.c (add_paths_from_environment,
	ensure_search_path_in_cache): add search paths from GJS_JS_PATH
	and GJS_JS_NATIVE_PATH environment variables

Modified:
   trunk/util/dirs.c

Modified: trunk/util/dirs.c
==============================================================================
--- trunk/util/dirs.c	(original)
+++ trunk/util/dirs.c	Wed Oct 22 17:46:50 2008
@@ -47,6 +47,25 @@
 }
 
 static void
+add_paths_from_environment(GPtrArray *path,
+                           const char *envvar)
+{
+    const char  *envstr;
+    char       **search_path;
+    gsize        i;
+
+    envstr = g_getenv(envvar);
+    if (envstr == NULL)
+        return;
+
+    search_path = g_strsplit(envstr, G_SEARCHPATH_SEPARATOR_S, 0);
+    for (i = 0; search_path[i]; ++i) {
+        g_ptr_array_add(path, g_strdup(search_path[i]));
+    }
+    g_strfreev(search_path);
+}
+
+static void
 ensure_search_path_in_cache(GjsDirectoryType dir_type)
 {
     GPtrArray *path;
@@ -67,6 +86,8 @@
     case GJS_DIRECTORY_SHARED_JAVASCRIPT: {
         int i;
 
+        add_paths_from_environment(path, "GJS_JS_PATH");
+
         if (installed) {
             g_ptr_array_add(path, g_strdup(GJS_JS_DIR));
         } else {
@@ -84,6 +105,8 @@
         break;
 
     case GJS_DIRECTORY_SHARED_JAVASCRIPT_NATIVE: {
+        add_paths_from_environment(path, "GJS_JS_NATIVE_PATH");
+
         if (installed) {
             g_ptr_array_add(path, g_strdup(GJS_NATIVE_DIR));
         } else {