lua: fixed search paths list for scripts, needs more work for Linux

diff --git a/modules/demux/playlist/luaplaylist.c b/modules/demux/playlist/luaplaylist.c
index 228173e3c0aeee0171d9e1b7190bbca72704468f..9df8aba620dab77d4af75847a7497efc72aa1af6 100644 (file)
--- a/modules/demux/playlist/luaplaylist.c
+++ b/modules/demux/playlist/luaplaylist.c
@@ -252,7 +252,7 @@ int E_(Import_LuaPlaylist)( vlc_object_t *p_this )
     char **ppsz_fileend  = NULL;
     char **ppsz_file;
 
-    char  *ppsz_dir_list[] = { NULL, NULL, NULL };
+    char  *ppsz_dir_list[] = { NULL, NULL, NULL, NULL };
     char **ppsz_dir;
 
     p_demux->p_sys = (demux_sys_t*)malloc( sizeof( demux_sys_t ) );
@@ -289,17 +289,17 @@ int E_(Import_LuaPlaylist)( vlc_object_t *p_this )
 
     lua_pop( p_state, 1 );
 
-    ppsz_dir_list[0] = malloc( strlen( p_demux->p_libvlc->psz_homedir )
-                             + strlen( DIR_SEP CONFIG_DIR DIR_SEP "luaplaylist" ) + 1 );
-    sprintf( ppsz_dir_list[0], "%s" DIR_SEP CONFIG_DIR DIR_SEP "luaplaylist",
-             p_demux->p_libvlc->psz_homedir );
+    if( asprintf( &ppsz_dir_list[0], "%s" DIR_SEP CONFIG_DIR DIR_SEP "luaplaylist",
+             p_demux->p_libvlc->psz_homedir ) < -1 )
+        return VLC_ENOMEM;
 
 #   if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
     {
         char *psz_vlcpath = config_GetDataDir( p_demux );
-        ppsz_dir_list[1] = malloc( strlen( psz_vlcpath ) + strlen( "luaplaylist" ) + 1 );
-        if( !ppsz_dir_list[1] ) return VLC_ENOMEM;
-        sprintf( ppsz_dir_list[1], "%s" DIR_SEP "luaplaylist", psz_vlcpath );
+        if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "luaplaylist", psz_vlcpath ) < 0 )
+            return VLC_ENOMEM;
+        if( asprintf( &ppsz_dir_list[2], "%s" DIR_SEP "share" DIR_SEP "luaplaylist", psz_vlcpath ) < 0 )
+            return VLC_ENOMEM;
     }
 #   else
     {
@@ -347,7 +347,7 @@ int E_(Import_LuaPlaylist)( vlc_object_t *p_this )
         for( ppsz_file = ppsz_filelist; ppsz_file < ppsz_fileend; ppsz_file++ )
         {
             free( psz_filename ); psz_filename = NULL;
-            asprintf( &psz_filename, "%s/%s", *ppsz_dir, *ppsz_file );
+            asprintf( &psz_filename, "%s" DIR_SEP "%s", *ppsz_dir, *ppsz_file );
             msg_Dbg( p_demux, "Trying Lua playlist script %s", psz_filename );
             p_demux->p_sys->psz_filename = psz_filename;
 

diff --git a/modules/meta_engine/luameta.c b/modules/meta_engine/luameta.c
index 8e50d661a9ec9e958788b99c81d57b194d05c001..6e642a0db39a50c9fb38b5fe24b06b4ac4a40842 100644 (file)
--- a/modules/meta_engine/luameta.c
+++ b/modules/meta_engine/luameta.c
@@ -292,20 +292,21 @@ static int vlclua_scripts_batch_execute( vlc_object_t *p_this,
     char **ppsz_fileend  = NULL;
     char **ppsz_file;
 
-    char  *ppsz_dir_list[] = { NULL, NULL, NULL };
+    char  *ppsz_dir_list[] = { NULL, NULL, NULL, NULL };
     char **ppsz_dir;
 
-    ppsz_dir_list[0] = malloc( strlen( p_this->p_libvlc->psz_homedir )
-                             + strlen( DIR_SEP CONFIG_DIR DIR_SEP ) + strlen( luadirname ) + 1 );
-    sprintf( ppsz_dir_list[0], "%s" DIR_SEP CONFIG_DIR DIR_SEP "%s",
-             p_this->p_libvlc->psz_homedir, luadirname );
+    if( asprintf( &ppsz_dir_list[0], "%s" DIR_SEP CONFIG_DIR DIR_SEP "%s", p_this->p_libvlc->psz_homedir,
+            luadirname ) < 0 )
+        return VLC_ENOMEM;
 
 #   if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
     {
         const char *psz_vlcpath = config_GetDataDir( p_this );
-        ppsz_dir_list[1] = malloc( strlen( psz_vlcpath ) + strlen( luadirname ) + 1 );
-        if( !ppsz_dir_list[1] ) return VLC_ENOMEM;
-        sprintf( ppsz_dir_list[1], "%s" DIR_SEP "%s", psz_vlcpath, luadirname );
+        if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "%s", psz_vlcpath, luadirname )  < 0 )
+            return VLC_ENOMEM;
+
+        if( asprintf( &ppsz_dir_list[2], "%s" DIR_SEP "share" DIR_SEP "%s", psz_vlcpath, luadirname )  < 0 )
+            return VLC_ENOMEM;
     }
 #   endif