Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
515deca3
Commit
515deca3
authored
Aug 15, 2007
by
Damien Fouilleul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lua modules: enforce DIR_SEP instead of /
parent
e7779161
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
modules/demux/playlist/luaplaylist.c
modules/demux/playlist/luaplaylist.c
+3
-3
modules/meta_engine/luameta.c
modules/meta_engine/luameta.c
+4
-4
No files found.
modules/demux/playlist/luaplaylist.c
View file @
515deca3
...
...
@@ -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
{
...
...
modules/meta_engine/luameta.c
View file @
515deca3
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment