Add --data-path option. Access the src share directory now works from build tree.

[vlc] / modules / misc / lua / intf.c

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index 7139264671e345310708578fe310bf365cfdd86a..424a32d7bf146144acd9ac91eb34d8de55c5060e 100644 (file)
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -57,11 +57,11 @@ static const char * const ppsz_intf_options[] = { "intf", "config", NULL };
 /*****************************************************************************
  *
  *****************************************************************************/
-static char *FindFile( const char *psz_name )
+static char *FindFile( vlc_object_t *p_this, const char *psz_name )
 {
     char  *ppsz_dir_list[] = { NULL, NULL, NULL, NULL };
     char **ppsz_dir;
-    vlclua_dir_list( "intf", ppsz_dir_list );
+    vlclua_dir_list( p_this, "intf", ppsz_dir_list );
     for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
     {
         char *psz_filename;
@@ -151,7 +151,7 @@ int Open_LuaIntf( vlc_object_t *p_this )
 
     config_ChainParse( p_intf, "lua-", ppsz_intf_options, p_intf->p_cfg );
     char *psz_name = GetModuleName( p_intf );
-    const char *psz_config;
+    char *psz_config;
     bool b_config_set = false;
     if( !psz_name ) psz_name = strdup( "dummy" );
 
@@ -162,7 +162,7 @@ int Open_LuaIntf( vlc_object_t *p_this )
         return VLC_ENOMEM;
     }
     p_sys = p_intf->p_sys;
-    p_sys->psz_filename = FindFile( psz_name );
+    p_sys->psz_filename = FindFile( p_this, psz_name );
     if( !p_sys->psz_filename )
     {
         msg_Err( p_intf, "Couldn't find lua interface script \"%s\".",
@@ -177,6 +177,7 @@ int Open_LuaIntf( vlc_object_t *p_this )
     if( !L )
     {
         msg_Err( p_intf, "Could not create new Lua State" );
+        free( p_sys->psz_filename );
         free( psz_name );
         free( p_sys );
         return VLC_EGENERIC;
@@ -224,11 +225,23 @@ int Open_LuaIntf( vlc_object_t *p_this )
     if( asprintf( &psz_command,
                   "package.path = \"%s"DIR_SEP"modules"DIR_SEP"?.lua;\"..package.path",
                   p_sys->psz_filename ) < 0 )
+    {
+        free( p_sys->psz_filename );
+        free( psz_name );
+        free( p_sys );
         return VLC_EGENERIC;
+    }
     *psz_char = DIR_SEP_CHAR;
     if( luaL_dostring( L, psz_command ) )
+    {
+        free( psz_command );
+        free( p_sys->psz_filename );
+        free( psz_name );
+        free( p_sys );
         return VLC_EGENERIC;
     }
+    free( psz_command );
+    }
     /* </gruik> */
 
     psz_config = var_CreateGetString( p_intf, "lua-config" );
@@ -253,6 +266,8 @@ int Open_LuaIntf( vlc_object_t *p_this )
             }
         }
     }
+    free( psz_config );
+
     if( b_config_set == false )
     {
         lua_newtable( L );
@@ -283,6 +298,8 @@ void Close_LuaIntf( vlc_object_t *p_this )
     intf_thread_t *p_intf = (intf_thread_t*)p_this;
     intf_sys_t *p_sys = p_intf->p_sys;
 
+    vlc_cancel( p_sys->thread );
+
     if( !p_sys->exiting ) /* <- Read-only here and in thread: no locking */
     {
         vlc_mutex_lock( &p_sys->lock );
@@ -295,6 +312,8 @@ void Close_LuaIntf( vlc_object_t *p_this )
     vlc_mutex_destroy( &p_sys->lock );
 
     lua_close( p_sys->L );
+
+    free( p_sys->psz_filename );
     free( p_sys );
 }