From: Damien Fouilleul <damienf@videolan.org>
Date: Wed, 15 Aug 2007 15:23:12 +0000 (+0000)
Subject: lua modules: enforce DIR_SEP instead of /
X-Git-Tag: 0.9.0-test0~6525
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=515deca348834e006f5f7587f25dd568df740454;p=vlc

lua modules: enforce DIR_SEP instead of /
---

diff --git a/modules/demux/playlist/luaplaylist.c b/modules/demux/playlist/luaplaylist.c
index 13705b787f..228173e3c0 100644
--- a/modules/demux/playlist/luaplaylist.c
+++ b/modules/demux/playlist/luaplaylist.c
@@ -290,8 +290,8 @@ 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( "/"CONFIG_DIR"/luaplaylist" ) + 1 );
-    sprintf( ppsz_dir_list[0], "%s/"CONFIG_DIR"/luaplaylist",
+                             + 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 defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
@@ -299,7 +299,7 @@ int E_(Import_LuaPlaylist)( vlc_object_t *p_this )
         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/luaplaylist", psz_vlcpath );
+        sprintf( ppsz_dir_list[1], "%s" DIR_SEP "luaplaylist", psz_vlcpath );
     }
 #   else
     {
diff --git a/modules/meta_engine/luameta.c b/modules/meta_engine/luameta.c
index 96c36614fb..8e50d661a9 100644
--- a/modules/meta_engine/luameta.c
+++ b/modules/meta_engine/luameta.c
@@ -296,8 +296,8 @@ static int vlclua_scripts_batch_execute( vlc_object_t *p_this,
     char **ppsz_dir;
 
     ppsz_dir_list[0] = malloc( strlen( p_this->p_libvlc->psz_homedir )
-                             + strlen( "/"CONFIG_DIR"/" ) + strlen( luadirname ) + 1 );
-    sprintf( ppsz_dir_list[0], "%s/"CONFIG_DIR"/%s",
+                             + 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 defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
@@ -305,7 +305,7 @@ static int vlclua_scripts_batch_execute( vlc_object_t *p_this,
         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/%s", psz_vlcpath, luadirname );
+        sprintf( ppsz_dir_list[1], "%s" DIR_SEP "%s", psz_vlcpath, luadirname );
     }
 #   endif
 
@@ -338,7 +338,7 @@ static int vlclua_scripts_batch_execute( vlc_object_t *p_this,
         for( ppsz_file = ppsz_filelist; ppsz_file < ppsz_fileend; ppsz_file++ )
         {
             char  *psz_filename;
-            asprintf( &psz_filename, "%s/%s", *ppsz_dir, *ppsz_file );
+            asprintf( &psz_filename, "%s" DIR_SEP "%s", *ppsz_dir, *ppsz_file );
             msg_Dbg( p_this, "Trying Lua playlist script %s", psz_filename );
             
             i_ret = func( p_this, psz_filename, p_state, user_data );